Downgrading to NUnit 2.5.2

Tyring to see if this is this upgrade which broke the specflow tests on teamcity

--HG--
branch : 1.x

Orchard.proj

@@ -133,7 +133,7 @@
   <Target Name ="Test">
     <!-- TeamCity support -->
     <ItemGroup>
-      <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.6.0.*" />
+      <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.5.2.*" />
     </ItemGroup>
     <Copy SourceFiles="@(NUnitAddinFiles)" DestinationFolder="$(LibFolder)\nunit\addins" />
 
@@ -148,7 +148,7 @@
   <Target Name ="Spec" DependsOnTargets="Package-Stage">
     <!-- TeamCity support -->
     <ItemGroup>
-      <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.6.0.*" />
+      <NUnitAddinFiles Include="$(teamcity_dotnet_nunitaddin)-2.5.2.*" />
     </ItemGroup>
     <Copy SourceFiles="@(NUnitAddinFiles)" DestinationFolder="$(LibFolder)\nunit\addins" />
 

lib/nunit/NUnitTests.VisualState.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualState xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ShowCheckBoxes="false">
-  <TopNode>[0-1000]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\NUnitTests.nunit</TopNode>
-  <SelectedNode>[0-1000]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\NUnitTests.nunit</SelectedNode>
-  <ExcludeCategories>false</ExcludeCategories>
-  <Nodes>
-    <Node UniqueName="[0-1000]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\NUnitTests.nunit" Expanded="true" />
-    <Node UniqueName="[0-2888]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit.framework.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-2889]NUnit" Expanded="true" />
-    <Node UniqueName="[0-2890]NUnit.Framework" Expanded="true" />
-    <Node UniqueName="[0-2891]NUnit.Framework.Constraints" Expanded="true" />
-    <Node UniqueName="[0-2892]NUnit.Framework.Syntax" Expanded="true" />
-    <Node UniqueName="[0-2893]NUnit.Framework.Tests" Expanded="true" />
-    <Node UniqueName="[0-3987]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit.core.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-3988]NUnit" Expanded="true" />
-    <Node UniqueName="[0-3989]NUnit.Core" Expanded="true" />
-    <Node UniqueName="[0-3990]NUnit.Core.Tests" Expanded="true" />
-    <Node UniqueName="[0-3991]NUnit.Core.Tests.Generic" Expanded="true" />
-    <Node UniqueName="[0-2894]NUnit.Core.Tests.Generic.DeduceTypeArgsFromArgs&lt;T1,T2&gt;" Expanded="true" />
-    <Node UniqueName="[0-2901]NUnit.Core.Tests.Generic.SimpleGenericFixture&lt;TList&gt;" Expanded="true" />
-    <Node UniqueName="[0-2922]NUnit.Core.Tests.Generic.TypeParameterUsedWithTestMethod&lt;T&gt;" Expanded="true" />
-    <Node UniqueName="[0-3262]NUnit.Core.Tests.ParameterizedTestFixture" Expanded="true" />
-    <Node UniqueName="[0-3279]NUnit.Core.Tests.ParameterizedTestFixtureWithDataSources" Expanded="true" />
-    <Node UniqueName="[0-3272]NUnit.Core.Tests.ParameterizedTestFixtureWithNullArguments" Expanded="true" />
-    <Node UniqueName="[0-4363]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit.util.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-4364]NUnit" Expanded="true" />
-    <Node UniqueName="[0-4365]NUnit.Util" Expanded="true" />
-    <Node UniqueName="[0-4248]NUnit.Util.Tests.ServiceManagerSetUpFixture" Expanded="true" />
-    <Node UniqueName="[0-4415]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit.mocks.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-4416]NUnit" Expanded="true" />
-    <Node UniqueName="[0-4417]NUnit.Mocks" Expanded="true" />
-    <Node UniqueName="[0-4418]NUnit.Mocks.Tests" Expanded="true" />
-    <Node UniqueName="[0-4497]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit-console.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-4498]NUnit" Expanded="true" />
-    <Node UniqueName="[0-4499]NUnit.ConsoleRunner" Expanded="true" />
-    <Node UniqueName="[0-4500]NUnit.ConsoleRunner.Tests" Expanded="true" />
-    <Node UniqueName="[0-4740]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit.uiexception.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-4741]NUnit" Expanded="true" />
-    <Node UniqueName="[0-4742]NUnit.UiException" Expanded="true" />
-    <Node UniqueName="[0-4743]NUnit.UiException.Tests" Expanded="true" />
-    <Node UniqueName="[0-4744]NUnit.UiException.Tests.CodeFormatters" Expanded="true" />
-    <Node UniqueName="[0-4745]NUnit.UiException.Tests.Controls" Expanded="true" />
-    <Node UniqueName="[0-4746]NUnit.UiException.Tests.StackTraceAnalyzers" Expanded="true" />
-    <Node UniqueName="[0-4797]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit.uikit.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-4798]NUnit" Expanded="true" />
-    <Node UniqueName="[0-4799]NUnit.UiKit" Expanded="true" />
-    <Node UniqueName="[0-4800]NUnit.UiKit.Tests" Expanded="true" />
-    <Node UniqueName="[0-4819]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit-gui.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-4820]NUnit" Expanded="true" />
-    <Node UniqueName="[0-4821]NUnit.Gui" Expanded="true" />
-    <Node UniqueName="[0-4822]NUnit.Gui.Tests" Expanded="true" />
-    <Node UniqueName="[0-4969]D:\Dev\NUnit\nunit-2.6\work\builds\net\3.5\release\tests/nunit-editor.tests.dll" Expanded="true" />
-    <Node UniqueName="[0-4970]NUnit" Expanded="true" />
-    <Node UniqueName="[0-4971]NUnit.ProjectEditor" Expanded="true" />
-    <Node UniqueName="[0-4972]NUnit.ProjectEditor.Tests" Expanded="true" />
-    <Node UniqueName="[0-4973]NUnit.ProjectEditor.Tests.Model" Expanded="true" />
-    <Node UniqueName="[0-4974]NUnit.ProjectEditor.Tests.Presenters" Expanded="true" />
-    <Node UniqueName="[0-4975]NUnit.ProjectEditor.Tests.Views" Expanded="true" />
-  </Nodes>
-</VisualState>

lib/nunit/NUnitTests.config

@@ -2,8 +2,34 @@
 <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 if your
+	 need to create a similar configuration file for your own test project. 
-   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>
@@ -12,6 +38,19 @@
 		<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

lib/nunit/NUnitTests.nunit

@@ -1,6 +1,6 @@
 <NUnitProject>
   <Settings appbase="."/>
-  <Config name="Default" binpath="lib;tests;framework" runtimeFramework="v3.5">
+  <Config name="Default" binpath="lib;tests;framework" runtimeFramework="v2.0">
     <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-editor.tests.dll" />
+    <assembly path="tests/nunit.fixtures.tests.dll" />
   </Config>
 </NUnitProject>

lib/nunit/agent.log.conf

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

lib/nunit/launcher.log.conf

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

lib/nunit/lib/NSubstitute.xml

@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>NSubstitute</name>
-    </assembly>
-    <members>
-        <member name="M:NSubstitute.Raise.EventWith``1(System.Object,``0)">
-            <summary>
-            Raise an event for an <c>EventHandler&lt;TEventArgs&gt;</c> event with the provided <paramref name="sender"/> and <paramref name="eventArgs"/>.
-            </summary>
-        </member>
-        <member name="M:NSubstitute.Raise.EventWith``1(``0)">
-            <summary>
-            Raise an event for an <c>EventHandler&lt;TEventArgs&gt;</c> event with the substitute as the sender and the provided <paramref name="eventArgs" />.
-            </summary>
-        </member>
-        <member name="M:NSubstitute.Raise.EventWith``1">
-            <summary>
-            Raise an event for an <c>EventHandler&lt;EventArgsT&gt;</c> event with the substitute as the sender
-            and with a default instance of <typeparamref name="TEventArgs" />.
-            </summary>
-        </member>
-        <member name="M:NSubstitute.Raise.Event">
-            <summary>
-            Raise an event for an <c>EventHandler</c> or <c>EventHandler&lt;EventArgs&gt;</c> event with the substitute
-            as the sender and with empty <c>EventArgs</c>.
-            </summary>
-        </member>
-        <member name="M:NSubstitute.Raise.Event``1(System.Object[])">
-            <summary>
-            Raise an event of type <typeparamref name="THandler" /> with the provided arguments. If no arguments are provided
-            NSubstitute will try and provide reasonble defaults.
-            </summary>
-        </member>
-        <member name="T:NSubstitute.Substitute">
-            <summary>
-            Create a substitute for one or more types. For example: <c>Substitute.For&lt;ISomeType&gt;()</c> 
-            </summary>
-        </member>
-        <member name="M:NSubstitute.Substitute.For``1(System.Object[])">
-            <summary>
-            Substitute for an interface or class.
-            <para>Be careful when specifying a class, as all non-virtual members will actually be executed. Only virtual members 
-            can be recorded or have return values specified.</para>
-            </summary>
-            <typeparam name="T">The type of interface or class to substitute.</typeparam>
-            <param name="constructorArguments">Arguments required to construct a class being substituted. Not required for interfaces or classes with default constructors.</param>
-            <returns>A substitute for the interface or class.</returns>
-        </member>
-        <member name="M:NSubstitute.Substitute.For``2(System.Object[])">
-            <summary>
-            <para>Substitute for multiple interfaces or a class that implements an interface. At most one class can be specified.</para>
-            <para>Be careful when specifying a class, as all non-virtual members will actually be executed. Only virtual members 
-            can be recorded or have return values specified.</para>
-            </summary>
-            <typeparam name="T1">The type of interface or class to substitute.</typeparam>
-            <typeparam name="T2">An additional interface or class (maximum of one class) the substitute should implement.</typeparam>
-            <param name="constructorArguments">Arguments required to construct a class being substituted. Not required for interfaces or classes with default constructors.</param>
-            <returns>A substitute of type T1, that also implements T2.</returns>
-        </member>
-        <member name="M:NSubstitute.Substitute.For``3(System.Object[])">
-            <summary>
-            <para>Substitute for multiple interfaces or a class that implements multiple interfaces. At most one class can be specified.</para>
-            If additional interfaces are required use the <see cref="M:NSubstitute.Substitute.For(System.Type[],System.Object[])"/> overload.
-            <para>Be careful when specifying a class, as all non-virtual members will actually be executed. Only virtual members 
-            can be recorded or have return values specified.</para>
-            </summary>
-            <typeparam name="T1">The type of interface or class to substitute.</typeparam>
-            <typeparam name="T2">An additional interface or class (maximum of one class) the substitute should implement.</typeparam>
-            <typeparam name="T3">An additional interface or class (maximum of one class) the substitute should implement.</typeparam>
-            <param name="constructorArguments">Arguments required to construct a class being substituted. Not required for interfaces or classes with default constructors.</param>
-            <returns>A substitute of type T1, that also implements T2 and T3.</returns>
-        </member>
-        <member name="M:NSubstitute.Substitute.For(System.Type[],System.Object[])">
-            <summary>
-            <para>Substitute for multiple interfaces or a class that implements multiple interfaces. At most one class can be specified.</para>
-            <para>Be careful when specifying a class, as all non-virtual members will actually be executed. Only virtual members 
-            can be recorded or have return values specified.</para>
-            </summary>
-            <param name="typesToProxy">The types of interfaces or a type of class and multiple interfaces the substitute should implement.</param>
-            <param name="constructorArguments">Arguments required to construct a class being substituted. Not required for interfaces or classes with default constructors.</param>
-            <returns>A substitute implementing the specified types.</returns>
-        </member>
-    </members>
-</doc>

lib/nunit/nunit-agent-x86.exe.config

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <!--
-   The .NET 2.0 build of nunit-agent only 
-   runs under .NET 2.0 or higher. The setting
-   useLegacyV2RuntimeActivationPolicy only applies 
-   under .NET 4.0 and permits use of mixed mode 
-   assemblies, which would otherwise not load 
-   correctly. 
-  -->
-  <startup useLegacyV2RuntimeActivationPolicy="true">
-    <!--
-     Nunit-agent is normally run by the console or gui
-     runners and not independently. In normal usage, 
-     the runner specifies which runtime should be used.
-     
-     Do NOT add any supportedRuntime elements here, 
-     since they may prevent the runner from controlling 
-     the runtime that is used!
-    -->
-  </startup>
-
-  <runtime>
-    <!-- Ensure that test exceptions don't crash NUnit -->
-    <legacyUnhandledExceptionPolicy enabled="1" />
-
-    <!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
-    <loadFromRemoteSources enabled="true" />
-
-    <!-- Look for addins in the addins directory for now -->
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="lib;addins"/>
-   </assemblyBinding>
-
-  </runtime>
-  
-</configuration>

lib/nunit/nunit-agent.exe.config

@@ -1,37 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
     <!--
-   The .NET 2.0 build of nunit-agent only 
+     Application settings for nunit-agent.exe. Do NOT put settings
-   runs under .NET 2.0 or higher. The setting
+	 for use by your tests here.
-   useLegacyV2RuntimeActivationPolicy only applies 
-   under .NET 4.0 and permits use of mixed mode 
-   assemblies, which would otherwise not load 
-   correctly. 
 	-->
-  <startup useLegacyV2RuntimeActivationPolicy="true">
+ <appSettings>
 	<!--	
-     Nunit-agent is normally run by the console or gui
+	 Specify the location to be used by .NET for the cache 
-     runners and not independently. In normal usage, 
-     the runner specifies which runtime should be used.
-     
-     Do NOT add any supportedRuntime elements here, 
-     since they may prevent the runner from controlling 
-     the runtime that is used!
 	-->
-  </startup>
+    <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
+  </appSettings>
+
+  <!-- Set the level for tracing NUnit itself -->
+  <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
+  <system.diagnostics>
+	  <switches>
+      <add name="NTrace" value="0" />
+	  </switches>
+  </system.diagnostics>
   
   <runtime>
-    <!-- Ensure that test exceptions don't crash NUnit -->
+    <!-- We need this so test exceptions don't crash NUnit -->
     <legacyUnhandledExceptionPolicy enabled="1" />
 
-    <!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
-    <loadFromRemoteSources enabled="true" />
-
     <!-- Look for addins in the addins directory for now -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib;addins"/>
    </assemblyBinding>
 
+    <!--
+    The following <assemblyBinding> section allows running nunit under 
+    .NET 1.0 by redirecting assemblies. The appliesTo attribute
+    causes the section to be ignored except under .NET 1.0
+    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,
+    which controls loading of the tests.
+   -->
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+			appliesTo="v1.0.3705">
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Data" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Drawing" 
+                          publicKeyToken="b03f5f7f11d50a3a" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Windows.Forms" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Xml" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+  
   </runtime>
   
 </configuration>

lib/nunit/nunit-console-x86.exe.config

@@ -1,31 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
-  <!--
+  <!-- Needed for .NET 4.0 support and SQLite
-   The .NET 2.0 build of the console runner only 
+       see http://www.meadow.se/wordpress/?p=393 -->
-   runs under .NET 2.0 or higher. The setting
-   useLegacyV2RuntimeActivationPolicy only applies 
-   under .NET 4.0 and permits use of mixed mode 
-   assemblies, which would otherwise not load 
-   correctly.
-  -->
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <!-- Comment out the next line to force use of .NET 4.0 -->
+    <supportedRuntime version="v4.0"/>
-    <supportedRuntime version="v2.0.50727" />
+    <requiredRuntime version="v4.0.30319" />
-    <supportedRuntime version="v4.0.30319" />
   </startup>
 
-  <runtime>
+	<!--
-    <!-- Ensure that test exceptions don't crash NUnit -->
+     Application settings for NUnit-console.exe. Do NOT put settings
-    <legacyUnhandledExceptionPolicy enabled="1" />
+	 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>
 
-    <!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
+  <!-- Set the level for tracing NUnit itself -->
+  <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
+  <system.diagnostics>
+	  <switches>
+      <add name="NTrace" value="0" />
+	  </switches>
+	</system.diagnostics>
+
+  <runtime>
     <loadFromRemoteSources enabled="true" />
+    <!-- We need this so test exceptions don't crash NUnit -->
+    <legacyUnhandledExceptionPolicy enabled="1" />
 
     <!-- Look for addins in the addins directory for now -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib;addins"/>
    </assemblyBinding>
 
+   <!--
+    The following <assemblyBinding> section allows running nunit under 
+    .NET 1.0 by redirecting assemblies. The appliesTo attribute
+    causes the section to be ignored except under .NET 1.0
+    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,
+    which controls loading of the tests.
+   -->
+   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+			appliesTo="v1.0.3705">
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Data" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Drawing" 
+                          publicKeyToken="b03f5f7f11d50a3a" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Windows.Forms" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Xml" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
   </runtime>
   
 </configuration>

lib/nunit/nunit-console.exe.config

@@ -1,13 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
-  <!--
-   The .NET 2.0 build of the console runner only 
-   runs under .NET 2.0 or higher. The setting
-   useLegacyV2RuntimeActivationPolicy only applies 
-   under .NET 4.0 and permits use of mixed mode 
-   assemblies, which would otherwise not load 
-   correctly.
-  -->
   <!-- Needed for .NET 4.0 support and SQLite
        see http://www.meadow.se/wordpress/?p=393 -->
   <startup useLegacyV2RuntimeActivationPolicy="true">
@@ -15,18 +7,89 @@
     <requiredRuntime version="v4.0.30319" />
   </startup>
 
-  <runtime>
+	<!--
-    <!-- Ensure that test exceptions don't crash NUnit -->
+     Application settings for NUnit-console.exe. Do NOT put settings
-    <legacyUnhandledExceptionPolicy enabled="0" />
+	 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>
 
-    <!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
+  <!-- Set the level for tracing NUnit itself -->
+  <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
+  <system.diagnostics>
+	  <switches>
+      <add name="NTrace" value="0" />
+	  </switches>
+	</system.diagnostics>
+
+  <runtime>
     <loadFromRemoteSources enabled="true" />
+    <!-- We need this so test exceptions don't crash NUnit -->
+    <legacyUnhandledExceptionPolicy enabled="0" />
 
     <!-- Look for addins in the addins directory for now -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib;addins"/>
    </assemblyBinding>
 
+   <!--
+    The following <assemblyBinding> section allows running nunit under 
+    .NET 1.0 by redirecting assemblies. The appliesTo attribute
+    causes the section to be ignored except under .NET 1.0
+    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,
+    which controls loading of the tests.
+   -->
+   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+			appliesTo="v1.0.3705">
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Data" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Drawing" 
+                          publicKeyToken="b03f5f7f11d50a3a" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Windows.Forms" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Xml" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
   </runtime>
   
 </configuration>

lib/nunit/nunit-x86.exe.config

@@ -1,30 +1,103 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
-  <!--
+  <!-- Needed for .NET 4.0 support and SQLite
-   The GUI only runs under .NET 2.0 or higher. The
+       see http://www.meadow.se/wordpress/?p=393 -->
-   useLegacyV2RuntimeActivationPolicy setting only
-   applies under .NET 4.0 and permits use of mixed 
-   mode assemblies, which would otherwise not load 
-   correctly.
-  -->
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <!-- Comment out the next line to force use of .NET 4.0 -->
+    <supportedRuntime version="v4.0"/>
-    <supportedRuntime version="v2.0.50727" />
+    <requiredRuntime version="v4.0.30319" />
-    <supportedRuntime version="v4.0.30319" />
   </startup>
 
-  <runtime>
+  <!--
-    <!-- Ensure that test exceptions don't crash NUnit -->
+     Application settings for NUnit-gui.exe. Do NOT put settings
-    <legacyUnhandledExceptionPolicy enabled="1" />
+	 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" />
+    <!--
+     Uncomment to specify the url to be used for help. If not used, the
+     default value is something like
+		file://localhost/C:/Program Files/NUnit 2.2/doc/index.html
+	 This setting is provided in case your default browser doesn't
+	 support this format.
+	-->
+    <!-- <add key="helpUrl" value="http://www.nunit.org" /> -->
+  </appSettings>
 
-    <!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
+  <!-- Set the level for tracing NUnit itself -->
+  <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
+  <system.diagnostics>
+	  <switches>
+      <add name="NTrace" value="0" />
+	  </switches>
+	</system.diagnostics>
+
+  <runtime>
     <loadFromRemoteSources enabled="true" />
+    <!-- We need this so test exceptions don't crash NUnit -->
+    <legacyUnhandledExceptionPolicy enabled="1" />
 
     <!-- Look for addins in the addins directory for now -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib;addins" />
     </assemblyBinding>
 
+    <!--
+    The following <assemblyBinding> section allows running nunit under 
+    .NET 1.0 by redirecting assemblies. The appliesTo attribute
+    causes the section to be ignored except under .NET 1.0
+    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,
+    which controls loading of the tests.
+   -->
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+       appliesTo="v1.0.3705">
+
+      <dependentAssembly>
+        <assemblyIdentity name="System"
+                          publicKeyToken="b77a5c561934e089"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Data"
+                          publicKeyToken="b77a5c561934e089"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Drawing"
+                          publicKeyToken="b03f5f7f11d50a3a"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Windows.Forms"
+                          publicKeyToken="b77a5c561934e089"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml"
+                          publicKeyToken="b77a5c561934e089"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
   </runtime>
 
 </configuration>

lib/nunit/nunit.exe.config

@@ -1,30 +1,103 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
-  <!--
+  <!-- Needed for .NET 4.0 support and SQLite
-   The GUI only runs under .NET 2.0 or higher. The
+       see http://www.meadow.se/wordpress/?p=393 -->
-   useLegacyV2RuntimeActivationPolicy setting only
-   applies under .NET 4.0 and permits use of mixed 
-   mode assemblies, which would otherwise not load 
-   correctly.
-  -->
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <!-- Comment out the next line to force use of .NET 4.0 -->
+    <supportedRuntime version="v4.0"/>
-    <supportedRuntime version="v2.0.50727" />
+    <requiredRuntime version="v4.0.30319" />
-    <supportedRuntime version="v4.0.30319" />
   </startup>
 
-  <runtime>
+  <!--
-    <!-- Ensure that test exceptions don't crash NUnit -->
+     Application settings for NUnit-gui.exe. Do NOT put settings
-    <legacyUnhandledExceptionPolicy enabled="1" />
+	 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" />
+    <!--
+     Uncomment to specify the url to be used for help. If not used, the
+     default value is something like
+		file://localhost/C:/Program Files/NUnit 2.2/doc/index.html
+	 This setting is provided in case your default browser doesn't
+	 support this format.
+	-->
+    <!-- <add key="helpUrl" value="http://www.nunit.org" /> -->
+  </appSettings>
 
-    <!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
+  <!-- Set the level for tracing NUnit itself -->
+  <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
+  <system.diagnostics>
+	  <switches>
+      <add name="NTrace" value="0" />
+	  </switches>
+	</system.diagnostics>
+
+  <runtime>
     <loadFromRemoteSources enabled="true" />
+    <!-- We need this so test exceptions don't crash NUnit -->
+    <legacyUnhandledExceptionPolicy enabled="1" />
 
     <!-- Look for addins in the addins directory for now -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib;addins" />
     </assemblyBinding>
 
+    <!--
+    The following <assemblyBinding> section allows running nunit under 
+    .NET 1.0 by redirecting assemblies. The appliesTo attribute
+    causes the section to be ignored except under .NET 1.0
+    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,
+    which controls loading of the tests.
+   -->
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+       appliesTo="v1.0.3705">
+
+      <dependentAssembly>
+        <assemblyIdentity name="System"
+                          publicKeyToken="b77a5c561934e089"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Data"
+                          publicKeyToken="b77a5c561934e089"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Drawing"
+                          publicKeyToken="b03f5f7f11d50a3a"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Windows.Forms"
+                          publicKeyToken="b77a5c561934e089"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml"
+                          publicKeyToken="b77a5c561934e089"
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0"
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
   </runtime>
 
 </configuration>

lib/nunit/pnunit-agent.exe.config

@@ -1,5 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
+  <!--
+     Application settings for pnunit-agent.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>
 
   <!-- Set the level for tracing NUnit itself -->
   <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->

lib/nunit/pnunit-launcher.exe.config

@@ -1,5 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
+  <!--
+     Application settings for pnunit-launch.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>
 
   <!-- Set the level for tracing NUnit itself -->
   <!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->

lib/nunit/runpnunit.bat

@@ -1,3 +1,2 @@
-start pnunit-agent 8080 .
+start pnunit-agent agent.conf
-start pnunit-agent 8081 .
 pnunit-launcher test.conf

lib/nunit/test.conf

@@ -1,12 +1,6 @@
 <TestGroup>
-
-  <Variables>
-    <Variable name="$agent_host" value="localhost" />
-  </Variables>
-
     <ParallelTests>
 
-      <!-- This is really just one test -->
         <ParallelTest>
             <Name>Testing</Name>
             <Tests>
@@ -14,69 +8,17 @@
                     <Name>Testing</Name>
                     <Assembly>pnunit.tests.dll</Assembly>
                     <TestToRun>TestLibraries.Testing.EqualTo19</TestToRun>
-            <Machine>$agent_host:8080</Machine>
+                    <Machine>localhost:8080</Machine>
+                    <TestParams>
+                        <string>..\server</string> <!-- server dir -->
+			<string></string> <!-- database server -->
+			<string></string><!-- conn string -->
+                    </TestParams>                                                                                
                 </TestConf>
+
             </Tests>
         </ParallelTest>
 
-      <!-- Parallel Test on a single agent - no barriers -->
-      <ParallelTest>
-        <Name>Parallel_Tests</Name>
-        <Tests>
-          <TestConf>
-            <Name>ParallelTest_A_Test</Name>
-            <Assembly>pnunit.tests.dll</Assembly>
-            <TestToRun>TestLibraries.ParallelExample.ParallelTest_A</TestToRun>
-            <Machine>$agent_host:8080</Machine>
-            <TestParams>
-              <!-- sleep time in seconds -->
-              <string>2</string>
-            </TestParams>
-          </TestConf>
-          <TestConf>
-            <Name>ParallelTest_B_Test</Name>
-            <Assembly>pnunit.tests.dll</Assembly>
-            <TestToRun>TestLibraries.ParallelExample.ParallelTest_B</TestToRun>
-            <Machine>$agent_host:8080</Machine>
-            <TestParams>
-              <string>1</string>
-              <!-- sleep time in seconds -->
-            </TestParams>
-          </TestConf>
-        </Tests>
-      </ParallelTest>
-
-      <!-- Parallel Test using two agents - with wait barriers -->
-      <ParallelTest>
-        <Name>Parallel_Barriers</Name>
-        <Tests>
-          <TestConf>
-            <Name>Parallel_Barriers_TestA</Name>
-            <Assembly>pnunit.tests.dll</Assembly>
-            <TestToRun>TestLibraries.ParallelExampleWithBarriers.ParallelTestWithBarriersA</TestToRun>
-            <Machine>$agent_host:8080</Machine>
-            <TestParams>
-            </TestParams>
-            <WaitBarriers>
-              <string>START_BARRIER</string>
-              <string>WAIT_BARRIER</string>
-            </WaitBarriers>
-          </TestConf>
-          <TestConf>
-            <Name>Parallel_Barriers_TestB</Name>
-            <Assembly>pnunit.tests.dll</Assembly>
-            <TestToRun>TestLibraries.ParallelExampleWithBarriers.ParallelTestWithBarriersB</TestToRun>
-            <Machine>$agent_host:8081</Machine>
-            <TestParams>
-            </TestParams>
-            <WaitBarriers>
-              <string>START_BARRIER</string>
-              <string>WAIT_BARRIER</string>
-            </WaitBarriers>
-          </TestConf>
-        </Tests>
-      </ParallelTest>
 
     </ParallelTests>
-  
 </TestGroup>