2003-04-15 Nick Drochak <ndrochak@gol.com>

	* Use nunit version 2.

svn path=/trunk/mcs/; revision=13640

6 files changed, 19 insertions, 21 deletions

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index 7b3f36925db..e9e50f861ef 100644
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2003/04/15 Nick Drochak <ndrochak@gol.com>
+
+	* makefile: Remove nunit version 1 from build
+
 2002-03-14  Daniel Morgan <danmorg@sc.rr.com>
 
 	* class/makefile.gnu
diff --git a/mcs/class/Microsoft.VisualBasic/Test/ChangeLog b/mcs/class/Microsoft.VisualBasic/Test/ChangeLog
index c2eaaade122..ed16fe97654 100644
--- a/mcs/class/Microsoft.VisualBasic/Test/ChangeLog
+++ b/mcs/class/Microsoft.VisualBasic/Test/ChangeLog
@@ -1,3 +1,7 @@
+2003/04/15  Nick Drochak <ndrochak@gol.com>

+

+	* Microsoft.VisualBasic_test.build: use nunit version 2

+

 2003-03-13  Martin Willemoes Hansen <mwh@sysrq.dk>

 	* Credited myself in CollectionTest.cs, 

 	  ConversionTest.cs and DateAndTimeTest.cs

diff --git a/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic_test.build b/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic_test.build
index 3e205b08b8f..c0675299748 100644
--- a/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic_test.build
+++ b/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic_test.build
@@ -6,7 +6,6 @@
 

 <project name="System.Data_test" default="build">

 	<property name="debug" value="false"/>

-	<property name="nunit_home" value="..\..\..\nunit"/>

 

 	<target name="build">

 	</target>

@@ -18,9 +17,6 @@
 				<includes name="**/*.cs"/>

 				<excludes name="TheTests.cs"/>

 			</sources>

-			<references basedir="..\..\..\nunit">

-				<includes name="NUnitCore.dll"/>

-			</references>

 			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->

 			<!--<arg value="/lib:../../lib/"/>-->

 			

@@ -29,6 +25,7 @@
 			<!--<arg value="/r:corlib.dll"/>-->

 			<arg value="/r:System.dll"/>

 			<arg value="/r:.\Microsoft.VisualBasic.dll"/>

+		    	<arg value="/r:..\..\..\nunit20\NUnit.Framework.dll"/>

 		</csc>

 

 <!--

@@ -37,21 +34,19 @@
 				<includes name="**/*.cs"/>

 				<excludes name="AllTests.cs"/>

 			</sources>

-			<references basedir="..\..\..\nunit">

-				<includes name="NUnitBase.dll"/>

-			</references>

 			<arg value="/nowarn:1595"/>

 			<arg value="/noconfig"/>

 			<arg value="/r:..\..\lib\corlib.dll"/>

 			<arg value="/r:..\..\lib\System.dll"/>

 			<arg value="/r:..\..\lib\Microsoft.VisualBasic.dll"/>

+		    	<arg value="/r:..\..\..\nunit20\NUnit.Framework.dll"/>

 		</csc>

 

 -->

 	</target>

 

 	<target name="test" depends="assemblies">

-		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.AllTests,Microsoft.VisualBasic_test.dll" failonerror="false"/>

+		<exec program="..\..\..\nunit20\nunit-console.exe" commandline="Microsoft.VisualBasic_test.dll" failonerror="false"/>

 	</target>

 

 	<target name="clean">

diff --git a/mcs/class/System.Configuration.Install/Test/ChangeLog b/mcs/class/System.Configuration.Install/Test/ChangeLog
index 01556b000a0..69d40d85359 100644
--- a/mcs/class/System.Configuration.Install/Test/ChangeLog
+++ b/mcs/class/System.Configuration.Install/Test/ChangeLog
@@ -1,3 +1,7 @@
+2003/04/15  Nick Drochak <ndrochak@gol.com>
+
+	* System.Configuration.Install_test.build: use nunit version 2.
+
 2002-03-29  Nick Drochak  <ndrochak@gol.com>
 
 	* makefile.gnu: change 8 spaces to tabs
diff --git a/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build
index d92e5e78fb4..960594ca0a9 100644
--- a/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build
+++ b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build
@@ -6,7 +6,6 @@
 
 <project name="System_test" default="build">
 	<property name="debug" value="true"/>
-	<property name="nunit_home" value="..\..\..\nunit"/>
 
 	<target name="build">
 	</target>
@@ -16,17 +15,15 @@
 			<sources>
 				<includes name="**/*.cs"/>
 			</sources>
-			<references basedir="..\..\..\nunit">
-				<includes name="NUnitCore.dll"/>
-			</references>
 
 			<arg value="/noconfig"/>
+		    	<arg value="/r:..\..\..\nunit20\NUnit.Framework.dll"/>
 		</csc>
 
 	</target>
 
 	<target name="test" depends="assemblies">
-		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.AllTests,System.Configuration.Install_test.dll" failonerror="false"/>
+		<exec program="..\..\..\nunit20\nunit-console.exe" commandline="System.Configuration.Install_test.dll" failonerror="false"/>
 	</target>
 
 	<target name="clean">
diff --git a/mcs/makefile b/mcs/makefile
index 84dfe40e49a..984e5c1e3eb 100755
--- a/mcs/makefile
+++ b/mcs/makefile
@@ -1,6 +1,6 @@
 VERSION=0.13.99
 
-DIRS=jay nant mcs class nunit nunit20 monoresgen tools mbas ilasm
+DIRS=jay nant mcs class nunit20 monoresgen tools mbas ilasm
 INSTALL= /usr/bin/install
 
 all: 
@@ -26,7 +26,6 @@ testcorlib:
 	if test x$(OS) = xWindows_NT; then make testcorlibwindows; else make -f makefile.gnu testcorlib; fi
 
 testwindows:
-	$(MAKE) -C nunit
 	$(MAKE) -C nunit20
 	$(MAKE) -C class test
 
@@ -113,17 +112,12 @@ MONO_WIN_INSTALL_LIB=	\
 	class/lib/System.Windows.Forms.dll	\
 	class/lib/System.Xml.dll	\
 	class/lib/System.dll	\
-	class/lib/corlib.dll	\
-	nunit/NUnitBase.dll	\
-	nunit/NUnitCore.dll	\
-	nunit/NUnitCore_mono.dll
+	class/lib/corlib.dll
 
 MONO_WIN_INSTALL_BIN=	\
 	mcs/mcs.exe	\
 	mbas/mbas.exe	\
 	nant/NAnt.exe	\
-	nunit/NUnitConsole.exe	\
-	nunit/NUnitConsole_mono.exe	\
 	ilasm/ilasm.exe	\
 	monoresgen/monoresgen.exe	\
 	tools/EnumCheck.exe	\