Merged issue-34

build/Build20.bat

@@ -5,4 +5,4 @@ SET BUILD_CONFIG=%~2
 IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild
 IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug
 
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=2"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=2"

build/BuildAll.bat

 @echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /t:FullBuild /toolsversion:4.0 %1 %2 %3 %4 %5 %6
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /t:FullBuild /toolsversion:4.0 %1 %2 %3 %4 %5 %6

build/BuildSilverlight2.bat

 @echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 /t:Rebuild %1 %2 %3 %4 "/p:BuildConfiguration=Debug_Silverlight;TargetVersion=2"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Rebuild %1 %2 %3 %4 "/p:BuildConfiguration=Debug_Silverlight;TargetVersion=2"

build/CleanAll.bat

+@echo off
+PUSHD %~dp0
+IF EXIST ..\build_output RMDIR /S /Q ..\build_output
+IF EXIST ..\build_temp RMDIR /S /Q ..\build_temp
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Clean /v:m "/p:BuildConfiguration=Release;TargetVersion=2"
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Clean /v:m "/p:BuildConfiguration=Debug;TargetVersion=2"
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Clean /v:m "/p:BuildConfiguration=Release_Silverlight;TargetVersion=2"
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Clean /v:m "/p:BuildConfiguration=Debug_Silverlight;TargetVersion=2"
+POPD
\ No newline at end of file

build/Common.targets

@@ -66,7 +66,7 @@ Targets For GenerateSource
 *********************************************************************************************** -->
 
   <Target Name="_BuildProtoGen">
-    <MSBuild Targets="Build" ToolsVersion="3.5"
+    <MSBuild Targets="Rebuild" ToolsVersion="3.5"
              Projects="$(ProjectDirectory)\src\ProtocolBuffers\ProtocolBuffers.csproj;$(ProjectDirectory)\src\ProtoGen\ProtoGen.csproj" 
              Properties="Step=_BuildProtoGen;Configuration=Release;Platform=AnyCPU;TargetFrameworkVersion=v2.0;DebugType=none;DocumentationFile=;TreatWarningsAsErrors=true;OutputPath=$(BuildOutputDirectory)\ProtoGen;" />
   </Target>
@@ -93,13 +93,18 @@ Targets For GenerateSource
 Targets For Test
 *********************************************************************************************** -->
   
-  <Target Name="_Test" Condition="$(BuildConfiguration)=='Debug' or $(BuildConfiguration)=='Release'">
+  <Target Name="_Test">
     <CallTarget Targets="_RunTests" />
   </Target>
 
   <Target Name="_RunTests">
+    <!-- NUnit -->
     <Copy SourceFiles="$(NUnitExeConfig)" DestinationFiles="$(NUnitExePath).config" />
-    <Exec Command="&quot;$(NUnitExePath)&quot; /nologo /noshadow %(TestContainer.Identity) /xml:$(BuildTempDirectory)\%(TestContainer.Filename).$(BuildConfiguration).xml" />
+    <Exec Condition="$(BuildConfiguration)=='Debug' or $(BuildConfiguration)=='Release'"
+      Command="&quot;$(NUnitExePath)&quot; /nologo /noshadow %(TestContainer.Identity) /xml:$(BuildTempDirectory)\%(TestContainer.Filename).xml" />
+    <!-- StatLight -->
+    <Exec Condition="$(BuildConfiguration)=='Debug_Silverlight' or $(BuildConfiguration)=='Release_Silverlight'"
+      Command="&quot;$(StatLightExePath)&quot; -x %(StatLightTestContainer.Identity) --ReportOutputFileType=NUnit --ReportOutputFile=$(BuildTempDirectory)\%(StatLightTestContainer.Filename).xml" />
   </Target>
 
 <!-- **********************************************************************************************
@@ -121,7 +126,6 @@ Targets For Package
     <Exec Command="&quot;$(ZipExePath)&quot; a -tzip ..\$(PackageName).zip * -r" WorkingDirectory="$(BuildOutputPackage)" />
   </Target>
 
-
 <!-- **********************************************************************************************
 Targets For Benchmark
 *********************************************************************************************** -->

build/RunBenchmarks.bat

 @echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 /t:RunBenchmarks %1 %2 %3 %4 "/p:BuildConfiguration=Release;TargetVersion=2"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:RunBenchmarks %1 %2 %3 %4 "/p:BuildConfiguration=Release;TargetVersion=2"

build/build.csproj

@@ -41,8 +41,9 @@
     <ProtocExePath>$(LibDirectory)\protoc.exe</ProtocExePath>
     <ProtogenExePath>$(BuildOutputDirectory)\ProtoGen\protogen.exe</ProtogenExePath>
     <ProtoBenchExePath>$(BuildTempDirectory)\ProtoBench.exe</ProtoBenchExePath>
-    <NUnitExePath>$(LibDirectory)\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath>
-    <NUnitExeConfig>$(LibDirectory)\NUnit 2.2.8.0\nunit-console.$(ForcedFrameworkVersion).config</NUnitExeConfig>
+    <NUnitExePath>$(LibDirectory)\NUnit\tools\nunit-console.exe</NUnitExePath>
+    <NUnitExeConfig>$(LibDirectory)\NUnit-config\nunit-console.$(ForcedFrameworkVersion).config</NUnitExeConfig>
+    <StatLightExePath>$(LibDirectory)\StatLight\tools\StatLight.exe</StatLightExePath>
     <ZipExePath>$(LibDirectory)\7-Zip 9.20\7za.exe</ZipExePath>
   </PropertyGroup>
 
@@ -171,6 +172,10 @@
     <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersMixedLite.Test.dll" />
     <TestContainer Include="$(SourceDirectory)\ProtoGen.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.ProtoGen.Test.dll" />
 
+    <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffers.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Test.xap" />
+    <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.Test.xap" />
+    <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersLiteMixed.Test.xap" />
+
     <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.*" />
     <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.*" />
     <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Serialization.*" />
@@ -200,7 +205,7 @@
   <!-- targets -->
   <Target Name="Clean" DependsOnTargets="_Clean" />
   <Target Name="Build" DependsOnTargets="GenerateSource;_Compile;_Test" />
-  <Target Name="Test" DependsOnTargets="_RunTests" />
+  <Target Name="Test" DependsOnTargets="_Test" />
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
   <Target Name="GenerateSource" DependsOnTargets="_BuildProtoGen;_GenerateSource;_CopyGeneratedSource" />
   <Target Name="BuildPackage" DependsOnTargets="PrepareOutputDirectory;PreparePackageComponent;GeneratePackage" />

build/build35.bat

@@ -5,4 +5,4 @@ SET BUILD_CONFIG=%~2
 IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild
 IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug
 
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=3"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=3"

build/build40.bat

@@ -5,4 +5,4 @@ SET BUILD_CONFIG=%~2
 IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild
 IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug
 
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=4"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=4"

lib/Microsoft.Silverlight.Testing/April2010/Microsoft.Silverlight.Testing.extmap.xml

+<?xml version="1.0"?>
+<manifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+          xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <assembly>
+    <name>Microsoft.Silverlight.Testing</name>
+    <version>2.0.5.0</version>
+    <publickeytoken>31bf3856ad364e35</publickeytoken>
+    <relpath>Microsoft.Silverlight.Testing.dll</relpath>
+    <extension downloadUri="Microsoft.Silverlight.Testing.zip" />
+  </assembly>
+
+</manifest>
\ No newline at end of file

lib/Microsoft.Silverlight.Testing/April2010/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.extmap.xml

+<?xml version="1.0"?>
+<manifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+          xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <assembly>
+    <name>Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight</name>
+    <version>2.0.5.0</version>
+    <publickeytoken>31bf3856ad364e35</publickeytoken>
+    <relpath>Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</relpath>
+    <extension downloadUri="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.zip" />
+  </assembly>
+
+</manifest>
\ No newline at end of file

lib/NUnit 2.2.8.0/NUnitTests.nunit

-<NUnitProject>
-  <Config name="Default" binpathtype="Auto">
-    <assembly path="nunit.framework.tests.dll" />
-    <assembly path="nunit.util.tests.dll" />
-    <assembly path="nunit.mocks.tests.dll" />
-    <assembly path="nunit.uikit.tests.dll" />
-    <assembly path="nunit-console.tests.dll" />
-    <assembly path="nunit-gui.tests.dll" />
-    <assembly path="nunit.extensions.tests.dll" />
-  </Config>
-</NUnitProject>

lib/NUnit 2.2.8.0/clr.bat

-@echo off
-rem Run a program under a particular version of the .Net framework
-rem by setting the COMPLUS_Version environment variable.
-rem
-rem This command was written by Charlie Poole for the NUnit project.
-rem You may use it separately from NUnit at your own risk.
-
-if "%1"=="/?" goto help
-if "%1"=="?" goto help
-if "%1"=="" goto GetVersion
-if /I "%1"=="off" goto RemoveVersion
-if "%2"=="" goto SetVersion
-goto main
-
-:help
-echo Control the version of the .Net framework that is used. The
-echo command has several forms:
-echo.
-echo CLR
-echo   Reports the version of the CLR that has been set
-echo.
-echo CLR version
-echo   Sets the local shell environment to use a specific
-echo   version of the CLR for subsequent commands.
-echo.
-echo CLR version command [arguments]
-echo   Executes a single command using the specified CLR version.
-echo.
-echo CLR off
-echo   Turns off specific version selection for commands
-echo.
-echo The CLR version may be specified as vn.n.n or n.n.n. In addition,
-echo the following shortcuts are recognized:
-echo   net-1.0, 1.0           For version 1.0.3705
-echo   net-1.1, 1.1           For version 1.1.4322
-echo   beta2                  For version 2.0.50215
-echo   net-2.0, 2.0           For version 2.0.50727
-echo.
-echo NOTE:
-echo   Any specific settings for required or supported runtime in 
-echo   the ^<startup^> section of a program's config file will 
-echo   override the version specified by this command, and the
-echo   command will have no effect.
-echo.
-goto done
-
-:main
-
-setlocal
-set CMD=
-call :SetVersion %1
-shift /1
-
-:loop 'Copy remaining arguments to form the command
-if "%1"=="" goto run
-set CMD=%CMD% %1
-shift /1
-goto :loop
-
-:run 'Execute the command
-%CMD%
-endlocal
-goto done
-
-:SetVersion
-set COMPLUS_Version=%1
-
-rem Substitute proper format for certain names
-if /I "%COMPLUS_Version:~0,1%"=="v"    goto useit
-if /I "%COMPLUS_Version%"=="net-1.0"   set COMPLUS_Version=v1.0.3705&goto report
-if /I "%COMPLUS_Version%"=="1.0"       set COMPLUS_Version=v1.0.3705&goto report
-if /I "%COMPLUS_Version%"=="net-1.1"   set COMPLUS_Version=v1.1.4322&goto report
-if /I "%COMPLUS_Version%"=="1.1"       set COMPLUS_Version=v1.1.4322&goto report
-if /I "%COMPLUS_Version%"=="beta2"     set COMPLUS_Version=v2.0.50215&goto report
-if /I "%COMPLUS_Version%"=="net-2.0"   set COMPLUS_Version=v2.0.50727&goto report
-if /I "%COMPLUS_Version%"=="2.0"       set COMPLUS_Version=v2.0.50727&goto report
-
-rem Add additional substitutions here, branching to report
-
-rem assume it's a version number without 'v'
-set COMPLUS_Version=v%COMPLUS_Version% 
-
-:report
-echo Setting CLR version to %COMPLUS_Version%
-goto done
-
-:GetVersion
-if "%COMPLUS_Version%"=="" echo CLR version is not set
-if NOT "%COMPLUS_Version%"=="" echo CLR version is set to %COMPLUS_Version%
-goto done
-
-:RemoveVersion
-set COMPLUS_Version=
-echo CLR version is no longer set
-
-:done
\ No newline at end of file

lib/NUnit-config/Microsoft.VisualStudio.TestTools.cs

+
+using System;
+
+namespace Microsoft.VisualStudio.TestTools.UnitTesting
+{
+    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+    public sealed class TestClassAttribute : NUnit.Framework.TestFixtureAttribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+    public sealed class TestMethodAttribute : NUnit.Framework.TestAttribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+    public sealed class TestInitializeAttribute : NUnit.Framework.SetUpAttribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+    public sealed class IgnoreAttribute : NUnit.Framework.IgnoreAttribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+    public sealed class ExpectedExceptionAttribute : NUnit.Framework.ExpectedExceptionAttribute
+    {
+        public ExpectedExceptionAttribute(Type type) : base(type)
+        { }
+    }
+
+    public class Assert : NUnit.Framework.Assert
+    {
+        [Obsolete("Do not use AreEqual on Byte[], use TestUtil.AssertBytesEqual(,)")]
+        public static void AreEqual(byte[] b1, byte[] b2)
+        {
+            NUnit.Framework.Assert.AreEqual(b1, b2);
+        }
+
+        [Obsolete("No not use assert with miss-matched types.")]
+        public static new void AreEqual(object b1, object b2)
+        {
+            NUnit.Framework.Assert.AreEqual(b1, b2);
+        }
+
+        //Allowed if the types match
+        public static void AreEqual<T>(T b1, T b2)
+        {
+            NUnit.Framework.Assert.AreEqual(b1, b2);
+        }
+    }
+}
\ No newline at end of file

lib/NUnit-config/nunit-console.v2.0.config

+<?xml version="1.0" encoding="Windows-1252"?>
+<configuration>
+
+  <startup>
+    <requiredRuntime version="v2.0.50727" />
+  </startup>
+
+  <runtime>
+    <!-- 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>
+  </runtime>
+  
+</configuration>
\ No newline at end of file

lib/NUnit-config/nunit-console.v3.5.config

+<?xml version="1.0" encoding="Windows-1252"?>
+<configuration>
+
+  <startup>
+    <requiredRuntime version="v2.0.50727" />
+  </startup>
+
+  <runtime>
+    <!-- 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>
+  </runtime>
+  
+</configuration>
\ No newline at end of file

lib/NUnit-config/nunit-console.v4.0.config

+<?xml version="1.0" encoding="Windows-1252"?>
+<configuration>
+
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <requiredRuntime version="v4.0.30319" safemode="true"/>
+  </startup>
+
+  <runtime>
+    <!-- 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>
+  </runtime>
+  
+</configuration>
\ No newline at end of file

lib/NUnit/NUnitFitTests.html

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<body>
+		<h1>NUnit Acceptance Tests</h1>
+		<p>
+		Developers love self-referential programs! Hence, NUnit has always run all it's 
+		own tests, even those that are not really unit tests.
+		<p>Now, beginning with NUnit 2.4, NUnit has top-level tests using Ward Cunningham's 
+			FIT framework. At this time, the tests are pretty rudimentary, but it's a start 
+			and it's a framework for doing more.
+			<h2>Running the Tests</h2>
+		<p>Open a console or shell window and navigate to the NUnit bin directory, which 
+			contains this file. To run the test under Microsoft .Net, enter the command
+			<pre>    runFile NUnitFitTests.html TestResults.html .</pre>
+			To run it under Mono, enter
+			<pre>    mono runFile.exe NUnitFitTests.html TestResults.html .</pre>
+			Note the space and dot at the end of each command. The results of your test 
+			will be in TestResults.html in the same directory.
+			<h2>Platform and CLR Version</h2>
+			<table BORDER cellSpacing="0" cellPadding="5">
+				<tr>
+					<td colspan="2">NUnit.Fixtures.PlatformInfo</td>
+				</tr>
+			</table>
+			<h2>Verify Unit Tests</h2>
+		<p>
+		Load and run the NUnit unit tests, verifying that the results are as expected. 
+		When these tests are run on different platforms, different numbers of tests may 
+		be skipped, so the values for Skipped and Run tests are informational only.
+		<p>
+		The number of tests in each assembly should be constant across all platforms - 
+		any discrepancy usually means that one of the test source files was not 
+		compiled on the platform. There should be no failures and no tests ignored.
+		<p><b>Note:</b>
+		At the moment, the nunit.extensions.tests assembly is failing because the 
+		fixture doesn't initialize addins in the test domain.
+		<p>
+			<table BORDER cellSpacing="0" cellPadding="5">
+				<tr>
+					<td colspan="6">NUnit.Fixtures.AssemblyRunner</td>
+				</tr>
+				<tr>
+					<td>Assembly</td>
+					<td>Tests()</td>
+					<td>Run()</td>
+					<td>Skipped()</td>
+					<td>Ignored()</td>
+					<td>Failures()</td>
+				</tr>
+				<tr>
+					<td>nunit.framework.tests.dll</td>
+					<td>397</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td>nunit.core.tests.dll</td>
+					<td>355</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td>nunit.util.tests.dll</td>
+					<td>238</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td>nunit.mocks.tests.dll</td>
+					<td>43</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td>nunit.extensions.tests.dll</td>
+					<td>5</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td>nunit-console.tests.dll</td>
+					<td>40</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td>nunit.uikit.tests.dll</td>
+					<td>34</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td>nunit-gui.tests.dll</td>
+					<td>15</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td>nunit.fixtures.tests.dll</td>
+					<td>6</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+			</table>
+			<h2>Code Snippet Tests</h2>
+		<p>
+		These tests create a test assembly from a snippet of code and then load and run 
+		the tests that it contains, verifying that the structure of the loaded tests is 
+		as expected and that the number of tests run, skipped, ignored or failed is 
+		correct.
+		<p>
+			<table BORDER cellSpacing="0" cellPadding="5">
+				<tr>
+					<td colspan="6">NUnit.Fixtures.SnippetRunner</td>
+				</tr>
+				<tr>
+					<td>Code</td>
+					<td>Tree()</td>
+					<td>Run()</td>
+					<td>Skipped()</td>
+					<td>Ignored()</td>
+					<td>Failures()</td>
+				</tr>
+				<tr>
+					<td><pre>public class TestClass
+{
+}</pre>
+					</td>
+					<td>EMPTY</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td><pre>using NUnit.Framework;
+
+[TestFixture]
+public class TestClass
+{
+}</pre>
+					</td>
+					<td>TestClass</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td><pre>using NUnit.Framework;
+
+[TestFixture]
+public class TestClass
+{
+    [Test]
+    public void T1() { }
+    [Test]
+    public void T2() { }
+    [Test]
+    public void T3() { }
+}</pre>
+					</td>
+					<td><pre>TestClass
+&gt;T1
+&gt;T2
+&gt;T3</pre>
+					</td>
+					<td>3</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td><pre>using NUnit.Framework;
+
+[TestFixture]
+public class TestClass1
+{
+    [Test]
+    public void T1() { }
+}
+
+[TestFixture]
+public class TestClass2
+{
+    [Test]
+    public void T2() { }
+    [Test]
+    public void T3() { }
+}</pre>
+					</td>
+					<td><pre>TestClass1
+&gt;T1
+TestClass2
+&gt;T2
+&gt;T3</pre>
+					</td>
+					<td>3</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td><pre>using NUnit.Framework;
+
+[TestFixture]
+public class TestClass
+{
+    [Test]
+    public void T1() { }
+    [Test, Ignore]
+    public void T2() { }
+    [Test]
+    public void T3() { }
+}</pre>
+					</td>
+					<td><pre>TestClass
+&gt;T1
+&gt;T2
+&gt;T3</pre>
+					</td>
+					<td>2</td>
+					<td>0</td>
+					<td>1</td>
+					<td>0</td>
+				</tr>
+				<tr>
+					<td><pre>using NUnit.Framework;
+
+[TestFixture]
+public class TestClass
+{
+    [Test]
+    public void T1() { }
+    [Test, Explicit]
+    public void T2() { }
+    [Test]
+    public void T3() { }
+}</pre>
+					</td>
+					<td><pre>TestClass
+&gt;T1
+&gt;T2
+&gt;T3</pre>
+					</td>
+					<td>2</td>
+					<td>1</td>
+					<td>0</td>
+					<td>0</td>
+				</tr>
+			</table>
+			<h2>Summary Information</h2>
+			<table BORDER cellSpacing="0" cellPadding="5">
+				<tr>
+					<td colspan="2">fit.Summary</td>
+				</tr>
+			</table>
+	</body>
+</html>

lib/nunit-license.txt → lib/NUnit/license.txt

-Copyright © 2002-2007 Charlie Poole
+Copyright © 2002-2008 Charlie Poole
 Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
 Copyright © 2000-2002 Philip A. Craig
 
@@ -8,7 +8,7 @@ Permission is granted to anyone to use this software for any purpose, including
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.
 
-Portions Copyright © 2002-2007 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
+Portions Copyright © 2002-2008 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
 
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 

lib/NUnit 2.2.8.0/NUnitTests.config → lib/NUnit/tools/NUnitTests.config

 <?xml version="1.0" encoding="utf-8" ?>
 <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. 
+ -->	 
 
-	 In your own configuration file, the include any appSettings that you require.
+<!--
 	 The <NUnit> section is only needed if you want to use a non-default value
-	 for any of the settings.
+	 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" />
              
-	 NOTE: A bug in .NET 2.0 Beta 2.0 requires that you make changes below
-	 when running in that environment. This is supposed to be fixed in a
-	 later release.
+   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"/>
-<!--	For .NET 2.0 Beta 2 replace the lines with the following -->
-<!--
-			<section name="TestCaseBuilder" type="System.Configuration.NameValueSectionHandler, System, Version=2.0.50215.44, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-			<section name="TestRunner" type="System.Configuration.NameValueSectionHandler, System, Version=2.0.50215.44, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
--->
 		</sectionGroup>
 	</configSections>
+ -->
 
   <appSettings>
 		<!--   User application and configured property settings go here.-->
@@ -30,18 +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>
-			<!-- Valid values are STA,MTA. Others ignored. -->
 			<add key="ApartmentState" value="MTA" />
-
-			<!-- See ThreadPriority enum for other valid values -->
 			<add key="ThreadPriority" value="Normal" />
+      <add key="DefaultLogThreshold" value="Info" />
 		</TestRunner>
 	</NUnit>
+-->
   
    <!--
     The following <runtime> section allows running nunit tests under 

lib/NUnit/tools/NUnitTests.nunit

+<NUnitProject>
+  <Settings appbase="."/>
+  <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" />
+    <assembly path="tests/nunit.mocks.tests.dll" />
+    <assembly path="tests/nunit-console.tests.dll" />
+    <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" />
+  </Config>
+</NUnitProject>

lib/NUnit/tools/agent.conf

+<AgentConfig>
+  <Port>8080</Port>
+  <PathToAssemblies>.</PathToAssemblies>
+</AgentConfig>
\ No newline at end of file

lib/NUnit/tools/agent.log.conf

+<log4net>
+	<!-- A1 is set to be a ConsoleAppender -->
+	<appender name="A1" type="log4net.Appender.ConsoleAppender">
+
+		<!-- A1 uses PatternLayout -->
+		<layout type="log4net.Layout.PatternLayout">
+			<!-- Print the date in ISO 8601 format -->
+			<conversionPattern value="%-5level %logger - %message%newline" />
+		</layout>
+	</appender>
+	
+	<!-- Set root logger level to DEBUG and its only appender to A1 -->
+	<root>
+		<level value="DEBUG" />
+		<appender-ref ref="A1" />
+	</root>
+
+</log4net>

lib/NUnit/tools/launcher.log.conf

+<log4net>
+	<!-- A1 is set to be a ConsoleAppender -->
+	<appender name="A1" type="log4net.Appender.ConsoleAppender">
+
+		<!-- A1 uses PatternLayout -->
+		<layout type="log4net.Layout.PatternLayout">
+			<!-- Print the date in ISO 8601 format -->
+			<conversionPattern value="%-5level %logger - %message%newline" />
+		</layout>
+	</appender>
+	
+	<!-- Set root logger level to DEBUG and its only appender to A1 -->
+	<root>
+		<level value="DEBUG" />
+		<appender-ref ref="A1" />
+	</root>
+
+</log4net>

lib/NUnit 2.2.8.0/nunit-console.v4.0.config → lib/NUnit/tools/nunit-agent-x86.exe.config

-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   
-  <startup useLegacyV2RuntimeActivationPolicy="true">
-    <requiredRuntime version="v4.0.30319" safemode="true"/>
-  </startup>
-
-    <!--
-     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>
-  
-    <!-- 
-     The startup section may be used to specify the runtime versions 
-     supported in the order that they will be used if more than one
-     is present. As supplied, this section is commented out, which
-     causes nunit-console to use the version of the framework with
-     which it was built.
-  	 
-	 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="v2.0.50727" />
-	  <supportedRuntime version="v2.0.50215" />
-	  <supportedRuntime version="v2.0.40607" />
-	  <supportedRuntime version="v1.1.4322" />
-	  <supportedRuntime version="v1.0.3705" />
+  <runtime>
+    <!-- We need this so test exceptions don't crash NUnit -->
+    <legacyUnhandledExceptionPolicy enabled="1" />
 
-	  <requiredRuntime version="v1.0.3705" />
-  </startup>
-  -->
+    <!-- Look for addins in the addins directory for now -->
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="lib;addins"/>
+   </assemblyBinding>
 
     <!--
-    The following <runtime> section allows running nunit under 
+    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.0version 1
+    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.
+    also need to redirect system assemblies in the test config file,
+    which controls loading of the tests.
    -->
-  
- <runtime>
-    
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
 			appliesTo="v1.0.3705">
 

lib/NUnit 2.2.8.0/mock-assembly.dll.config → lib/NUnit/tools/nunit-agent.exe.config

-<?xml version="1.0" encoding="utf-8" ?> 
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   
-   <!--
-    The following <runtime> section allows running the mock-assembyly tests
-    under .NET 1.0 by redirecting assemblies. The appliesTo attribute
-    causes the section to be ignored except under .NET 1.0.
-    
-    This section is
-   --> 
   <runtime>
+    <!-- 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=""/>
+                          culture="neutral"/>
         <bindingRedirect  oldVersion="1.0.5000.0" 
                           newVersion="1.0.3300.0"/>
       </dependentAssembly>
@@ -24,7 +33,7 @@
       <dependentAssembly> 
         <assemblyIdentity name="System.Data" 
                           publicKeyToken="b77a5c561934e089" 
-                          culture=""/>
+                          culture="neutral"/>
         <bindingRedirect  oldVersion="1.0.5000.0" 
                           newVersion="1.0.3300.0"/>
       </dependentAssembly>
@@ -32,7 +41,7 @@
       <dependentAssembly> 
         <assemblyIdentity name="System.Drawing" 
                           publicKeyToken="b03f5f7f11d50a3a" 
-                          culture=""/>
+                          culture="neutral"/>
         <bindingRedirect  oldVersion="1.0.5000.0" 
                           newVersion="1.0.3300.0"/>
       </dependentAssembly>
@@ -40,7 +49,7 @@
       <dependentAssembly> 
         <assemblyIdentity name="System.Windows.Forms" 
                           publicKeyToken="b77a5c561934e089" 
-                          culture=""/>
+                          culture="neutral"/>
         <bindingRedirect  oldVersion="1.0.5000.0" 
                           newVersion="1.0.3300.0"/>
       </dependentAssembly>
@@ -48,7 +57,7 @@
       <dependentAssembly> 
         <assemblyIdentity name="System.Xml" 
                           publicKeyToken="b77a5c561934e089" 
-                          culture=""/>
+                          culture="neutral"/>
         <bindingRedirect  oldVersion="1.0.5000.0" 
                           newVersion="1.0.3300.0"/>
       </dependentAssembly>

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

+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+
+  <runtime>
+    <!-- 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>
\ No newline at end of file

lib/NUnit/tools/nunit-console.exe.config

+<?xml version="1.0" encoding="Windows-1252"?>
+<configuration>
+
+  <startup>
+    <requiredRuntime version="v2.0.50727" />
+  </startup>
+
+  <runtime>
+    <!-- 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>
+  </runtime>
+  
+</configuration>
\ No newline at end of file

lib/NUnit 2.2.8.0/nunit-gui.exe.config → lib/NUnit/tools/nunit-x86.exe.config

-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-
   <!--
      Application settings for NUnit-gui.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" />
-    
     <!--
      Uncomment to specify the url to be used for help. If not used, the
      default value is something like
@@ -20,45 +13,26 @@
 	 support this format.
 	-->
     <!-- <add key="helpUrl" value="http://www.nunit.org" /> -->
-
   </appSettings>
 
+  <runtime>
+    <!-- We need this so test exceptions don't crash NUnit -->
+    <legacyUnhandledExceptionPolicy enabled="1" />
 
-    <!-- 
-     The startup section may be used to specify the runtime versions 
-     supported in the order that they will be used if more than one
-     is present. As supplied, this section is commented out, which
-     causes nunit-console to use the version of the framework with
-     which it was built.
-	 
-	 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="v2.0.50727" />
-	  <supportedRuntime version="v2.0.50215" />
-	  <supportedRuntime version="v2.0.40607" />
-	  <supportedRuntime version="v1.1.4322" />
-	  <supportedRuntime version="v1.0.3705" />
-	
-	  <requiredRuntime version="v1.0.3705" />
+    <!-- Look for addins in the addins directory for now -->
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="lib;addins" />
+    </assemblyBinding>
 
-  </startup>
-	-->
     <!--
-    The following <runtime> section allows running nunit under 
+    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
-    just as we do for nunit.tests.dll.
+    also need to redirect system assemblies in the test config file,
+    which controls loading of the tests.
    -->
-  
- <runtime>
- 
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
        appliesTo="v1.0.3705">
 

lib/NUnit/tools/nunit.exe.config

+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!--
+     Application settings for NUnit-gui.exe. Do NOT put settings
+	 for use by your tests here.
+	-->
+  <appSettings>
+    <!--
+     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>
+
+  <runtime>
+    <!-- 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>
\ No newline at end of file

lib/NUnit 2.2.8.0/nunit-console.v2.0.config → lib/NUnit/tools/pnunit-agent.exe.config

 <?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
 
-  <startup>
-    <requiredRuntime version="v2.0.50727" />
-  </startup>
+  <!-- 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>
   
-    <!--
-     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>
-  
-    <!-- 
-     The startup section may be used to specify the runtime versions 
-     supported in the order that they will be used if more than one
-     is present. As supplied, this section is commented out, which
-     causes nunit-console to use the version of the framework with
-     which it was built.
-  	 
-	 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="v2.0.50727" />
-	  <supportedRuntime version="v2.0.50215" />
-	  <supportedRuntime version="v2.0.40607" />
-	  <supportedRuntime version="v1.1.4322" />
-	  <supportedRuntime version="v1.0.3705" />
+  <runtime>
+    <!-- We need this so test exceptions don't crash NUnit -->
+    <legacyUnhandledExceptionPolicy enabled="1" />
 
-	  <requiredRuntime version="v1.0.3705" />
-  </startup>
-  -->
+    <!-- Look for addins in the addins directory for now -->
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="framework;lib;addins"/>
+   </assemblyBinding>
 
     <!--
-    The following <runtime> section allows running nunit under 
+    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.0version 1
+    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.
+    also need to redirect system assemblies in the test config file,
+    which controls loading of the tests.
    -->
-  
- <runtime>
-    
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
 			appliesTo="v1.0.3705">
 

lib/NUnit 2.2.8.0/nunit-console.v3.5.config → lib/NUnit/tools/pnunit-launcher.exe.config

 <?xml version="1.0" encoding="Windows-1252"?>
 <configuration>
 
-  <startup>
-    <requiredRuntime version="v2.0.50727" />
-  </startup>
+  <!-- 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>
   
-    <!--
-     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>
-  
-    <!-- 
-     The startup section may be used to specify the runtime versions 
-     supported in the order that they will be used if more than one
-     is present. As supplied, this section is commented out, which
-     causes nunit-console to use the version of the framework with
-     which it was built.
-  	 
-	 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="v2.0.50727" />
-	  <supportedRuntime version="v2.0.50215" />
-	  <supportedRuntime version="v2.0.40607" />
-	  <supportedRuntime version="v1.1.4322" />
-	  <supportedRuntime version="v1.0.3705" />
+  <runtime>
+    <!-- We need this so test exceptions don't crash NUnit -->
+    <legacyUnhandledExceptionPolicy enabled="1" />
 
-	  <requiredRuntime version="v1.0.3705" />
-  </startup>
-  -->
+    <!-- Look for addins in the addins directory for now -->
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="framework;lib;addins"/>
+   </assemblyBinding>
 
     <!--
-    The following <runtime> section allows running nunit under 
+    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.0version 1
+    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.
+    also need to redirect system assemblies in the test config file,
+    which controls loading of the tests.
    -->
-  
- <runtime>
-    
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
 			appliesTo="v1.0.3705">
 

lib/NUnit/tools/runFile.exe.config

+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <startup>
+	  <supportedRuntime version="v2.0.50727" />
+	  <supportedRuntime version="v2.0.50215" />
+	  <supportedRuntime version="v2.0.40607" />
+	  <supportedRuntime version="v1.1.4322" />
+	  <supportedRuntime version="v1.0.3705" />
+	
+	  <requiredRuntime version="v1.0.3705" />
+  </startup>
+
+<!--
+     The following <runtime> section allows running nunit tests under 
+     .NET 1.0 by redirecting assemblies. The appliesTo attribute
+     causes the section to be ignored except under .NET 1.0.
+	-->
+	<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>