Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/nunit24/ClientUtilities/util/Makefile

@@ -21,23 +21,9 @@ EXTRA_DISTFILES = \
 
 CLEAN_FILES = $(RESX_RES)
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 include ../../../build/library.make
 
 $(the_lib): $(RESX_RES)
 
 $(RESX_RES): %.resources: %.resx
 	$(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-	$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-	cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-	rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)

mcs/nunit24/ConsoleRunner/nunit-console/ConsoleUi.cs

@@ -123,34 +123,36 @@ namespace NUnit.ConsoleRunner
 
 				Console.WriteLine();
 
-				string xmlOutput = CreateXmlOutput( result );
-			
-				if (options.xmlConsole)
-				{
-					Console.WriteLine(xmlOutput);
-				}
-				else
-				{
-					try
-					{
-						//CreateSummaryDocument(xmlOutput, transformReader );
-						XmlResultTransform xform = new XmlResultTransform( transformReader );
-						xform.Transform( new StringReader( xmlOutput ), Console.Out );
-					}
-					catch( Exception ex )
-					{
-						Console.WriteLine( "Error: {0}", ex.Message );
-						return TRANSFORM_ERROR;
-					}
-				}
+				if (result != null) {
+					string xmlOutput = CreateXmlOutput( result );
 
-				// Write xml output here
-				string xmlResultFile = options.xml == null || options.xml == string.Empty
-					? "TestResult.xml" : options.xml;
+					if (options.xmlConsole)
+					{
+						Console.WriteLine(xmlOutput);
+					}
+					else
+					{
+						try
+						{
+							//CreateSummaryDocument(xmlOutput, transformReader );
+							XmlResultTransform xform = new XmlResultTransform( transformReader );
+							xform.Transform( new StringReader( xmlOutput ), Console.Out );
+						}
+						catch( Exception ex )
+						{
+							Console.WriteLine( "Error: {0}", ex.Message );
+							return TRANSFORM_ERROR;
+						}
+					}
 
-				using ( StreamWriter writer = new StreamWriter( xmlResultFile ) ) 
-				{
-					writer.Write(xmlOutput);
+					// Write xml output here
+					string xmlResultFile = options.xml == null || options.xml == string.Empty
+						? "TestResult.xml" : options.xml;
+
+					using ( StreamWriter writer = new StreamWriter( xmlResultFile ) )
+					{
+						writer.Write(xmlOutput);
+					}
 				}
 
 				//if ( testRunner != null )

mcs/nunit24/ConsoleRunner/nunit-console/Makefile

@@ -13,18 +13,4 @@ NO_TEST = yo
 
 EXTRA_DISTFILES = nunit-console.csproj nunit-console_VS2005.csproj
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-	$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-	cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-	rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)

mcs/nunit24/NUnitCore/core/Makefile

@@ -8,20 +8,6 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LOCAL_MCS_FLAGS= -r:nunit.framework.dll -r:nunit.core.interfaces.dll -r:System.dll /d:StronglyNamedAssembly -warn:1
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = nunit.core.dll.csproj nunit.core.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-	$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-	cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-	rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)

mcs/nunit24/NUnitCore/interfaces/Makefile

@@ -8,20 +8,6 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = nunit.core.interfaces.dll.csproj nunit.core.interfaces.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-	$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-	cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-	rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)

mcs/nunit24/NUnitExtensions/core/Makefile

@@ -11,22 +11,8 @@ LIB_MCS_FLAGS = \
 	/r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = \
 	nunit.core.extensions.dll.csproj \
 	nunit.core.extensions.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-	$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-	cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-	rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)

mcs/nunit24/NUnitExtensions/framework/Makefile

@@ -8,22 +8,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LIB_MCS_FLAGS = -debug /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = \
 	nunit.framework.extensions.dll.csproj \
 	nunit.framework.extensions.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-	$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-	cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-	rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)

mcs/nunit24/NUnitFramework/framework/Makefile

@@ -9,22 +9,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LIB_MCS_FLAGS = /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly -warn:1
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = \
 	nunit.framework.dll.csproj \
 	nunit.framework.dll_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-	$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-	cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-	rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)

mcs/nunit24/NUnitMocks/mocks/Makefile

@@ -8,22 +8,8 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
 LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
 NO_TEST = yo
 
-ifneq (net_2_0, $(PROFILE))
-NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
-
 EXTRA_DISTFILES = \
 	nunit.mocks.csproj \
 	nunit.mocks_VS2005.csproj
 
 include ../../../build/library.make
-
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
-	$(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
-	cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../2.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
-	rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)