Hi!
Currently nunit distributed with mono is rather unusable with 2.0
assemblies. I attach a patch, which makes it fully usable:
- nunit-console.exe.config is removed, because it enforces choosing
1.1 corlib assemblies in preference over 2.0 ones (and the contents of
this config are mostly related to making nunit work on 1.0 .NET, which
is not an issue with mono)
- nunit-console2 is added, I'm copying the design of monop2 and wsdl2
- the nunit dlls from 2.0 are now installed
Optionally we could leave the
<appSettings>
<!-- Specify the location to be used by .NET for the cache -->
<add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
</appSettings>
section in nunit-console.exe.config and remove any other contents.
Should I commit?
--
Kamil Skalski
http://nazgul.omega.pl
Index: mono/scripts/Makefile.am
===================================================================
--- mono/scripts/Makefile.am (wersja 49725)
+++ mono/scripts/Makefile.am (kopia robocza)
@@ -35,7 +35,8 @@
scripts_2_0 = \
monop2 \
- wsdl2
+ wsdl2 \
+ nunit-console2
scripts_rpmhelpers = mono-find-provides mono-find-requires
Index: mcs/nunit20/core/Makefile
===================================================================
--- mcs/nunit20/core/Makefile (wersja 49739)
+++ mcs/nunit20/core/Makefile (kopia robocza)
@@ -8,11 +8,7 @@
LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
-ifeq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-endif
-
EXTRA_DISTFILES = nunit.core.dll.csproj
include ../../build/library.make
Index: mcs/nunit20/framework/Makefile
===================================================================
--- mcs/nunit20/framework/Makefile (wersja 49739)
+++ mcs/nunit20/framework/Makefile (kopia robocza)
@@ -9,11 +9,7 @@
LIB_MCS_FLAGS = -debug /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
-ifeq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-endif
-
EXTRA_DISTFILES = \
nunit.framework.dll.csproj
Index: mcs/nunit20/nunit-console/nunit-console.exe.config
===================================================================
--- mcs/nunit20/nunit-console/nunit-console.exe.config (wersja 49739)
+++ mcs/nunit20/nunit-console/nunit-console.exe.config (kopia robocza)
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<configuration>
- <!--
- Application settings for NUnit-console.exe. Do NOT put settings
- for use by your tests here.
- -->
- <appSettings>
-
- <!-- Specify the location to be used by .NET for the cache -->
- <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
-
- </appSettings>
-
- <!--
- These statements specify the runtime versions supported
- in the order that they will be used if more than one
- is present. You can change the order of these if you like
- or remove any that do not apply.
-
- Since .NET 1.0 does not recognize the <supportedRuntime> elements,
- a <requiredRuntime> element is used in case it is the only version
- of the framework that is installed.
- -->
- <startup>
-
- <supportedRuntime version="v1.1.4322" />
- <supportedRuntime version="v2.0.50215" />
- <supportedRuntime version="v1.0.3705" />
-
- <requiredRuntime version="v1.0.3705" />
-
- </startup>
-
- <!--
- The following <runtime> section allows running nunit under
- .NET 1.0 by redirecting assemblies. The appliesTo attribute
- causes the section to be ignored except under .NET 1.0version 1
- on a machine with only the .NET version 1.0 runtime installed.
- If application and its tests were built for .NET 1.1 you will
- also need to redirect system assemblies in the test config file.
- -->
-
- <runtime>
-
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
- appliesTo="v1.0.3705">
-
- <dependentAssembly>
- <assemblyIdentity name="System"
- publicKeyToken="b77a5c561934e089"
- culture=""/>
- <bindingRedirect oldVersion="1.0.5000.0"
- newVersion="1.0.3300.0"/>
- </dependentAssembly>
-
- <dependentAssembly>
- <assemblyIdentity name="System.Data"
- publicKeyToken="b77a5c561934e089"
- culture=""/>
- <bindingRedirect oldVersion="1.0.5000.0"
- newVersion="1.0.3300.0"/>
- </dependentAssembly>
-
- <dependentAssembly>
- <assemblyIdentity name="System.Drawing"
- publicKeyToken="b03f5f7f11d50a3a"
- culture=""/>
- <bindingRedirect oldVersion="1.0.5000.0"
- newVersion="1.0.3300.0"/>
- </dependentAssembly>
-
- <dependentAssembly>
- <assemblyIdentity name="System.Windows.Forms"
- publicKeyToken="b77a5c561934e089"
- culture=""/>
- <bindingRedirect oldVersion="1.0.5000.0"
- newVersion="1.0.3300.0"/>
- </dependentAssembly>
-
- <dependentAssembly>
- <assemblyIdentity name="System.Xml"
- publicKeyToken="b77a5c561934e089"
- culture=""/>
- <bindingRedirect oldVersion="1.0.5000.0"
- newVersion="1.0.3300.0"/>
- </dependentAssembly>
-
- </assemblyBinding>
-
- </runtime>
-
-</configuration>
\ No newline at end of file
Index: mcs/nunit20/util/Makefile
===================================================================
--- mcs/nunit20/util/Makefile (wersja 49739)
+++ mcs/nunit20/util/Makefile (kopia robocza)
@@ -20,11 +20,7 @@
CLEAN_FILES = $(RESX_RES)
-ifeq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-endif
-
include ../../build/library.make
$(the_lib): $(RESX_RES)
_______________________________________________
Mono-devel-list mailing list
Mono-devel-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-devel-list
