JimEvans: Updating NUnit version to 2.6.2.

r18448
craigfowler · Jan 10, 2013 · 88d1e1c · 88d1e1c
1 parent 2511e5c
commit 88d1e1c
Show file tree

Hide file tree

Showing 116 changed files with 458 additions and 6,718 deletions.
diff --git a/cpp/webdriver-firefox/webdriver-firefox-previous.vcxproj b/cpp/webdriver-firefox/webdriver-firefox-previous.vcxproj
@@ -91,7 +91,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-16\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-17\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -112,7 +112,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-16\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-17\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,7 +131,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-16\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-17\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -155,7 +155,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-16\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\gecko-17\win32\include;$(ProjectDir)..\webdriver-interactions;$(ProjectDir)..\imehandler\common</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>XP_WIN;XP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>

diff --git a/dotnet/test/Selenium.Core.Tests/Selenium.Core.Tests.csproj b/dotnet/test/Selenium.Core.Tests/Selenium.Core.Tests.csproj
@@ -89,7 +89,7 @@
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>

diff --git a/...test/Selenium.WebDriverBackedSelenium.Tests/Selenium.WebDriverBackedSelenium.Tests.csproj b/...test/Selenium.WebDriverBackedSelenium.Tests/Selenium.WebDriverBackedSelenium.Tests.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

diff --git a/dotnet/test/WebDriver.Android.Tests/WebDriver.Android.Tests.csproj b/dotnet/test/WebDriver.Android.Tests/WebDriver.Android.Tests.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/dotnet/test/WebDriver.Chrome.Tests/WebDriver.Chrome.Tests.csproj b/dotnet/test/WebDriver.Chrome.Tests/WebDriver.Chrome.Tests.csproj
@@ -53,9 +53,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/dotnet/test/WebDriver.Common.Tests/WebDriver.Common.Tests.csproj b/dotnet/test/WebDriver.Common.Tests/WebDriver.Common.Tests.csproj
@@ -58,17 +58,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\third_party\nmock\NMock2.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.core, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.core, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\lib\nunit.core.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\lib\nunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.core.interfaces, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.core.interfaces, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\lib\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

diff --git a/dotnet/test/WebDriver.Firefox.Tests/WebDriver.Firefox.Tests.csproj b/dotnet/test/WebDriver.Firefox.Tests/WebDriver.Firefox.Tests.csproj
@@ -53,9 +53,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/dotnet/test/WebDriver.IE.Tests/WebDriver.IE.Tests.csproj b/dotnet/test/WebDriver.IE.Tests/WebDriver.IE.Tests.csproj
@@ -55,9 +55,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/dotnet/test/WebDriver.Remote.Tests/WebDriver.Remote.Tests.csproj b/dotnet/test/WebDriver.Remote.Tests/WebDriver.Remote.Tests.csproj
@@ -53,9 +53,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/dotnet/test/WebDriver.Support.Tests/WebDriver.Support.Tests.csproj b/dotnet/test/WebDriver.Support.Tests/WebDriver.Support.Tests.csproj
@@ -65,9 +65,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\third_party\nmock\NMock2.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.0\framework\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\nunit-2.6.2\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/dotnet/test/build.desc b/dotnet/test/build.desc
@@ -11,9 +11,9 @@ dotnet_library(name = "common",
     "System.Drawing.dll",
     "System.Xml.dll",
     "//dotnet:dotnet",
-    "third_party/dotnet/nunit-2.6.0/lib/nunit.core.dll",
-    "third_party/dotnet/nunit-2.6.0/lib/nunit.core.interfaces.dll",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll",
+    "third_party/dotnet/nunit-2.6.2/lib/nunit.core.dll",
+    "third_party/dotnet/nunit-2.6.2/lib/nunit.core.interfaces.dll",
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll",
     "third_party/nmock/NMock2.dll"
   ],
   out = "WebDriver.Common.Tests.dll",
@@ -33,7 +33,7 @@ dotnet_test(name = "remote",
     "System.Xml.dll",
     "//dotnet:dotnet",
     ":common",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll"
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll"
   ],
   out = "WebDriver.Remote.Tests.dll",
   files = [
@@ -54,7 +54,7 @@ dotnet_test(name = "ie",
     "System.Xml.dll",
     "//dotnet:dotnet",
     ":common",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll"
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll"
   ],
   out = "WebDriver.IE.Tests.dll",
   files = [
@@ -75,7 +75,7 @@ dotnet_test(name = "firefox",
     "System.Xml.dll",
     "//dotnet:dotnet",
     ":common",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll"
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll"
   ],
   out = "WebDriver.Firefox.Tests.dll",
   files = [
@@ -96,7 +96,7 @@ dotnet_test(name = "chrome",
     "System.Xml.dll",
     "//dotnet:dotnet",
     ":common",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll"
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll"
   ],
   out = "WebDriver.Chrome.Tests.dll",
   files = [
@@ -116,7 +116,7 @@ dotnet_test(name = "android",
     "System.Xml.dll",
     "//dotnet:dotnet",
     ":common",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll"
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll"
   ],
   out = "WebDriver.Android.Tests.dll",
   files = [
@@ -136,7 +136,7 @@ dotnet_test(name = "safari",
     "System.Xml.dll",
     "//dotnet:dotnet",
     ":common",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll"
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll"
   ],
   out = "WebDriver.Safari.Tests.dll",
   files = [
@@ -158,7 +158,7 @@ dotnet_test(name = "support",
     "//dotnet:support",
     "//dotnet:dotnet",
     ":common",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll",
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll",
     "third_party/nmock/NMock2.dll"
   ],
   out = "WebDriver.Support.Tests.dll",
@@ -179,7 +179,7 @@ dotnet_test(name = "core",
     "System.Xml.dll",
     "System.Web.dll",
     "//dotnet:core",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll",
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll",
     "third_party/nmock/nmock.dll"
   ],
   out = "Selenium.Core.Tests.dll",
@@ -203,7 +203,7 @@ dotnet_test(name = "webdriverbackedselenium",
     "//dotnet:dotnet",
     "//dotnet:core",
     "//dotnet:webdriverbackedselenium",
-    "third_party/dotnet/nunit-2.6.0/framework/nunit.framework.dll",
+    "third_party/dotnet/nunit-2.6.2/framework/nunit.framework.dll",
   ],
   out = "Selenium.WebDriverBackedSelenium.Tests.dll",
   files = [

diff --git a/rake-tasks/crazy_fun/mappings/visualstudio.rb b/rake-tasks/crazy_fun/mappings/visualstudio.rb
@@ -346,7 +346,7 @@ def handle(fun, dir, args)
       target = nunit "#{task_name}:run" do |nunit_task|
         mkdir_p test_log_dir
         puts "Testing: #{task_name}"
-        nunit_task.command = "third_party/dotnet/nunit-2.6.0/nunit-console.exe"
+        nunit_task.command = "third_party/dotnet/nunit-2.6.2/nunit-console.exe"
         nunit_task.assemblies << [output_dir, args[:project]].join(File::SEPARATOR)
         nunit_task.options << "/nologo"
         nunit_task.options << "/nodots"

diff --git a/third_party/dotnet/nunit-2.6.0/NUnitTests.VisualState.xml b/third_party/dotnet/nunit-2.6.0/NUnitTests.VisualState.xml