update to latest NUnit

smitcham · Apr 5, 2012 · bad73ce · bad73ce
1 parent 68982d1
commit bad73ce
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,8 +42,7 @@
 /tools/xunit-1.8
 /main/OpenCover.sln.docstates.suo
 /main/CodeAnalyst/OpenCover.caw
-/tools/NUnit-2.5.10.11092
 /tools/log4net-1.2.11
 /samples/OpenCover.Samples.6.0.ReSharper.user
-
 /main/OpenCover.sln.DotSettings.user
+/tools/NUnit-2.6.0.12051
diff --git a/build/Version/Version.cs b/build/Version/Version.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
-[assembly: AssemblyVersion("4.0.303.1")]
-[assembly: AssemblyFileVersion("4.0.303.1")]
+[assembly: AssemblyVersion("4.0.306.1")]
+[assembly: AssemblyFileVersion("4.0.306.1")]
diff --git a/build/Version/Version.h b/build/Version/Version.h
@@ -1,4 +1,4 @@
-#define FILEVER        4,0,303,1
-#define PRODUCTVER        4,0,303,1
-#define STRFILEVER        "4.0.303.1"
-#define STRPRODUCTVER        "4.0.303.1"
+#define FILEVER        4,0,306,1
+#define PRODUCTVER        4,0,306,1
+#define STRFILEVER        "4.0.306.1"
+#define STRPRODUCTVER        "4.0.306.1"
diff --git a/build/Version/Version.wxi b/build/Version/Version.wxi
@@ -1,2 +1,2 @@
-<?define Version = "4.0.303.1" ?>
+<?define Version = "4.0.306.1" ?>
 <Include />
diff --git a/build/Version/build.number b/build/Version/build.number
@@ -1 +1 @@
-4.0.303.1
+4.0.306.1
diff --git a/build/environment.build b/build/environment.build
@@ -19,7 +19,7 @@
 		<call target="extract" />
 		<property name="target.folder" value="${tools.folder}/Moq.4.0.10531.7" />
 		<call target="extract" />
-		<property name="target.folder" value="${tools.folder}/NUnit-2.5.10.11092" />
+		<property name="target.folder" value="${tools.folder}/NUnit-2.6.0.12051" />
 		<call target="extract" />
 		<property name="target.folder" value="${tools.folder}/atlsvr.9.0.70425" />
 		<call target="extract" />

diff --git a/build/opencover.build b/build/opencover.build
@@ -3,7 +3,7 @@
 
     <property name="configuration" value="debug" unless="${property::exists('configuration')}" />
     <property name="platform" value="x86" unless="${property::exists('platform')}" />
-    <property name="nunit.path" value="${tools.folder}/NUnit-2.5.10.11092/bin/net-2.0"/>
+    <property name="nunit.path" value="${tools.folder}/NUnit-2.6.0.12051/bin"/>
     <property name="windows-path" value="${string::to-lower(environment::get-variable('PATH'))}"/>
     <property name="nunit-in-path" value="${string::contains(windows-path, 'nunit')}"/>
     <property name="open-cover-test-console" value="${solution.folder}/bin/${configuration}/OpenCover.Test.Profiler.exe"/>
@@ -77,7 +77,8 @@
 	<target name="copy-teamcity-nunit-plugin" >
 	    <!-- from http://legeronline.blogspot.com/2009/05/team-city-addin-for-nunit.html -->
 	    <mkdir dir="${nunit.path}\addins" />
-		<copy file="${teamcity.dotnet.nunitaddin}-2.5.10.dll" todir="${nunit.path}\addins" />
+        <property name="teamcity-nunit-add-in" value="{teamcity.dotnet.nunitaddin}-2.6.0.dll" />
+        <copy file="${teamcity-nunit-add-in}" todir="${nunit.path}\addins" if="${file::exists(teamcity-nunit-add-in)}" />
 	</target>
 
     <target name="test" description="Run unit tests" depends="build" >

diff --git a/main/OpenCover.Integration.Test/OpenCover.Integration.Test.csproj b/main/OpenCover.Integration.Test/OpenCover.Integration.Test.csproj
@@ -39,9 +39,8 @@
     <Reference Include="Moq">
       <HintPath>..\..\tools\Moq.4.0.10531.7\NET40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\tools\NUnit-2.6.0.12051\bin\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/main/OpenCover.Test/Framework/Manager/ProfilerManagerTests.cs b/main/OpenCover.Test/Framework/Manager/ProfilerManagerTests.cs
@@ -57,7 +57,7 @@ public void Manager_Adds_Cor_Enable_Profiling_EnvironmentVariable()
             Assert.AreEqual("1", dict[@"Cor_Enable_Profiling"]);
         }
 
-        [Test]
+        [Test, RequiresMTA]
         public void Manager_Handles_StandardMessageEvent()
         {
             // arrange

diff --git a/main/OpenCover.Test/OpenCover.Test.csproj b/main/OpenCover.Test/OpenCover.Test.csproj
@@ -70,9 +70,8 @@
     <Reference Include="Moq">
       <HintPath>..\..\tools\Moq.4.0.10531.7\NET40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\tools\NUnit-2.6.0.12051\bin\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="OpenCover.Samples.CS">
       <HintPath>..\..\samples\bin\OpenCover.Samples.CS.dll</HintPath>

diff --git a/main/cmdline/DogFood.proj b/main/cmdline/DogFood.proj
@@ -12,8 +12,8 @@
   -->
 
   <ItemGroup>
-    <NUnitConsole Include="..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console-x86.exe" />
-    <NUnitConsole Include="..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console.exe" />
+    <NUnitConsole Include="..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console-x86.exe" />
+    <NUnitConsole Include="..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console.exe" />
   </ItemGroup>
 
   <Target Name="All"

diff --git a/main/cmdline/dogfood.cmd b/main/cmdline/dogfood.cmd
@@ -1 +1 @@
-OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll /noshadow" -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests.xml
+OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll /noshadow" -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests.xml
diff --git a/main/cmdline/dogfood64.cmd b/main/cmdline/dogfood64.cmd
@@ -1 +1 @@
-OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console.exe -targetargs:"OpenCover.Test.dll /noshadow" -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests.xml
+OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console.exe -targetargs:"OpenCover.Test.dll /noshadow" -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests.xml
diff --git a/main/cmdline/dogfood_coverbytest.cmd b/main/cmdline/dogfood_coverbytest.cmd
@@ -1 +1 @@
-OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll /noshadow" -filter:"+[Open*]* -[OpenCover.T*]*" -coverbytest:*.Test.dll -output:opencovertests.xml
+OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.6.0.12051\bin\net-2.0\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll /noshadow" -filter:"+[Open*]* -[OpenCover.T*]*" -coverbytest:*.Test.dll -output:opencovertests.xml
diff --git a/main/cmdline/dogfood_exattr.cmd b/main/cmdline/dogfood_exattr.cmd
@@ -1 +1 @@
-OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll /noshadow" -excludebyattribute:*.ExcludeFromCoverageAttribute -filter:"+[Open*]* -[Open*]*Boot* -[OpenCover.T*]*" -output:opencovertests.xml
+OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.6.0.12051\bin\net-2.0\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll /noshadow" -excludebyattribute:*.ExcludeFromCoverageAttribute -filter:"+[Open*]* -[Open*]*Boot* -[OpenCover.T*]*" -output:opencovertests.xml
diff --git a/main/cmdline/dogfood_exfile.cmd b/main/cmdline/dogfood_exfile.cmd
@@ -1 +1 @@
-OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll /noshadow" -excludebyfile:*\ProfilerRegistration.* -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests.xml
+OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll /noshadow" -excludebyfile:*\ProfilerRegistration.* -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests.xml
diff --git a/main/cmdline/dogfood_nunit.cmd b/main/cmdline/dogfood_nunit.cmd
@@ -1 +1 @@
-OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console-x86.exe -targetargs:"OpenCover.Test.nunit /noshadow" -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests_nunit.xml
+OpenCover.Console.exe -register:user -target:..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console-x86.exe -targetargs:"OpenCover.Test.nunit /noshadow" -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests_nunit.xml
diff --git a/main/cmdline/dogfood_shadow.cmd b/main/cmdline/dogfood_shadow.cmd
@@ -1,2 +1,2 @@
 rem run dogfood tests with shadow
-OpenCover.Console.exe -register:user -targetdir:"%cd%" -target:..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll" -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests.xml
+OpenCover.Console.exe -register:user -targetdir:"%cd%" -target:..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console-x86.exe -targetargs:"OpenCover.Test.dll" -filter:"+[Open*]* -[OpenCover.T*]*" -output:opencovertests.xml
diff --git a/main/cmdline/opencovertests.cmd b/main/cmdline/opencovertests.cmd
@@ -1 +1 @@
-..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console-x86.exe OpenCover.Test.dll /noshadow
+..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console-x86.exe OpenCover.Test.dll /noshadow
diff --git a/main/cmdline/opencovertests64.cmd b/main/cmdline/opencovertests64.cmd
@@ -1 +1 @@
-..\..\..\tools\NUnit-2.5.10.11092\bin\net-2.0\nunit-console.exe OpenCover.Test.dll /noshadow
+..\..\..\tools\NUnit-2.6.0.12051\bin\nunit-console.exe OpenCover.Test.dll /noshadow
diff --git a/tools/NUnit-2.5.10.11092.zip b/tools/NUnit-2.5.10.11092.zip
diff --git a/tools/NUnit-2.6.0.12051.zip b/tools/NUnit-2.6.0.12051.zip