Update NUnit to 2.6.1. Also, its binaries are the same for .Net 3.5 and 4.0, so no need to use a split directory structure. Teach our build script how to tell nunit what .Net framework to run the tests on.

Author: oskarb

Tools/nunit/NUnitTests.config

@@ -2,55 +2,16 @@
 <configuration>
 <!--
 	 This is the configuration file for the NUnitTests.nunit test project. You may
-	 need to create a similar configuration file for your own test project. 
+	 need to create a similar configuration file for your own test project if your
+   application and tests require it.
  -->	 
 
-<!--
-	 The <NUnit> section is only needed if you want to use a non-default value
-	 for any of the settings. It is commented out below. If you are going to use
-   it, you must deifne the NUnit section group and the sections you need.
- 
-   The syntax shown here works for most runtimes. If NUnit fails at startup, you
-   can try specifying the name of the assembly containing the NameValueSectionHandler:
-   
-      <section name="TestCaseBuilder" type="System.Configuration.NameValueSectionHandler, System" />
-      
-   If that fails, try the fully qualified name of the assembly:
-   
-      <section name="TestCaseBuilder" type="System.Configuration.NameValueSectionHandler, System, 
-             Version=2.0.50727.832, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-             
-   Unfortunately, this last approach makes your config file non-portable across runtimes.
-   -->
-
-<!--
-  <configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestCaseBuilder" type="System.Configuration.NameValueSectionHandler"/>
-			<section name="TestRunner" type="System.Configuration.NameValueSectionHandler"/>
-		</sectionGroup>
-	</configSections>
- -->
-
   <appSettings>
 		<!--   User application and configured property settings go here.-->
 		<!--   Example: <add key="settingName" value="settingValue"/> -->
 		<add key="test.setting" value="54321" />
 	</appSettings>
 
-<!-- Sample NUnit section group showing all default values -->
-<!--
-	<NUnit>
-		<TestCaseBuilder>
-			<add key="OldStyleTestCases" value="false" />
-		</TestCaseBuilder>
-		<TestRunner>
-			<add key="ApartmentState" value="MTA" />
-			<add key="ThreadPriority" value="Normal" />
-		</TestRunner>
-	</NUnit>
--->
-  
    <!--
     The following <runtime> section allows running nunit tests under 
     .NET 1.0 by redirecting assemblies. The appliesTo attribute

Tools/nunit/NUnitTests.nunit

@@ -1,6 +1,6 @@
 <NUnitProject>
   <Settings appbase="."/>
-  <Config name="Default" binpath="lib;tests;framework" runtimeFramework="v2.0">
+  <Config name="Default" binpath="lib;tests;framework" runtimeFramework="v3.5">
     <assembly path="tests/nunit.framework.tests.dll" />
     <assembly path="tests/nunit.core.tests.dll" />
     <assembly path="tests/nunit.util.tests.dll" />
@@ -9,6 +9,6 @@
     <assembly path="tests/nunit.uiexception.tests.dll" />
     <assembly path="tests/nunit.uikit.tests.dll" />
     <assembly path="tests/nunit-gui.tests.dll" />
-    <assembly path="tests/nunit.fixtures.tests.dll" />
+    <assembly path="tests/nunit-editor.tests.dll" />
   </Config>
 </NUnitProject>

Tools/nunit/agent.log.conf

@@ -11,7 +11,7 @@
 
 	<!-- Set root logger level to DEBUG and its only appender to A1 -->
 	<root>
-		<level value="DEBUG" />
+		<level value="Info" />
 		<appender-ref ref="A1" />
 	</root>
 

Tools/nunit/framework/nunit.framework.dll

@@ -11,7 +11,7 @@
 
 	<!-- Set root logger level to DEBUG and its only appender to A1 -->
 	<root>
-		<level value="DEBUG" />
+		<level value="Info" />
 		<appender-ref ref="A1" />
 	</root>