[dotnet] Updating NUnit dependency to 3.13.2

jimevans · jimevans · commit 2afb56c5ed4d · 2021-11-22T16:03:09.000-05:00
Also moves test assemblies to .NET Core 3.1 instead of .NET Core 2.1,
which is deprecated.
diff --git a/dotnet/test/chrome/WebDriver.Chrome.Tests.csproj b/dotnet/test/chrome/WebDriver.Chrome.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.Chrome.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/dotnet/test/common/BUILD.bazel b/dotnet/test/common/BUILD.bazel
@@ -60,8 +60,8 @@ config_setting(
     ],
     target_frameworks = select({
         ":netframework": ["net471"],
-        ":netcore": ["netcoreapp2.1"],
-        "//conditions:default": ["netcoreapp2.1"],
+        ":netcore": ["netcoreapp3.1"],
+        "//conditions:default": ["netcoreapp3.1"],
     }),
     visibility = ["//visibility:public"],
     deps = select({
@@ -72,13 +72,13 @@ config_setting(
             "@moq//:Moq",
         ],
         ":netcore": [
-            "//dotnet/src/webdriver:netstandard2.0",
+            "//dotnet/src/webdriver:netstandard2.1",
             "@json.net//:Newtonsoft.Json",
             "@benderproxy//:BenderProxy",
             "@moq//:Moq",
         ],
         "//conditions:default": [
-            "//dotnet/src/webdriver:netstandard2.0",
+            "//dotnet/src/webdriver:netstandard2.1",
             "@json.net//:Newtonsoft.Json",
             "@benderproxy//:BenderProxy",
             "@moq//:Moq",
diff --git a/dotnet/test/common/TakesScreenshotTest.cs b/dotnet/test/common/TakesScreenshotTest.cs
@@ -445,7 +445,7 @@ private HashSet<string> ScanActualColors(Screenshot screenshot, int stepX, int s
         {
             HashSet<string> colors = new HashSet<string>();
 
-#if !NETCOREAPP2_1 && !NETSTANDARD2_1 && !NET5_0
+#if !NETCOREAPP3_1 && !NETSTANDARD2_1 && !NET5_0
             try
             {
                 Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
@@ -479,7 +479,7 @@ private Color GetPixelColor(Screenshot screenshot, int x, int y)
         {
             Color pixelColor = Color.Black;
 
-#if !NETCOREAPP2_1 && !NETSTANDARD2_1 && !NET5_0
+#if !NETCOREAPP3_1 && !NETSTANDARD2_1 && !NET5_0
             Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
             Bitmap bitmap = new Bitmap(image);
             pixelColor = bitmap.GetPixel(1, 1);
diff --git a/dotnet/test/common/WebDriver.Common.Tests.csproj b/dotnet/test/common/WebDriver.Common.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.Common.Tests</AssemblyName>
     <RootNamespace>OpenQA.Selenium</RootNamespace>
   </PropertyGroup>
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="Moq" Version="4.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/dotnet/test/edge/WebDriver.Edge.Tests.csproj b/dotnet/test/edge/WebDriver.Edge.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.Edge.Tests</AssemblyName>
   </PropertyGroup>
   
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/dotnet/test/firefox/WebDriver.Firefox.Tests.csproj b/dotnet/test/firefox/WebDriver.Firefox.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.Firefox.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -44,7 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/dotnet/test/ie/WebDriver.IE.Tests.csproj b/dotnet/test/ie/WebDriver.IE.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.IE.Tests</AssemblyName>
     <RootNamespace>OpenQA.Selenium.IE</RootNamespace>
   </PropertyGroup>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/dotnet/test/opera/WebDriver.Opera.Tests.csproj b/dotnet/test/opera/WebDriver.Opera.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.Opera.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/dotnet/test/remote/WebDriver.Remote.Tests.csproj b/dotnet/test/remote/WebDriver.Remote.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.Remote.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/dotnet/test/safari/WebDriver.Safari.Tests.csproj b/dotnet/test/safari/WebDriver.Safari.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.Safari.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/dotnet/test/support/BUILD.bazel b/dotnet/test/support/BUILD.bazel
@@ -29,11 +29,11 @@ nunit_test(
         "no-sandbox",
         "requires-network",
     ],
-    target_frameworks = ["netcoreapp2.1"],
+    target_frameworks = ["netcoreapp3.1"],
     visibility = ["//visibility:public"],
     deps = [
-        "//dotnet/src/support:netstandard2.0",
-        "//dotnet/src/webdriver:netstandard2.0",
+        "//dotnet/src/support:netstandard2.1",
+        "//dotnet/src/webdriver:netstandard2.1",
         "//dotnet/test/common:firefox",
         "@json.net//:Newtonsoft.Json",
         "@moq//:Moq",
diff --git a/dotnet/test/support/WebDriver.Support.Tests.csproj b/dotnet/test/support/WebDriver.Support.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>WebDriver.Support.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -30,7 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.13.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/dotnet/test/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.Tests.csproj b/dotnet/test/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Selenium.WebDriverBackedSelenium.Tests</AssemblyName>
   </PropertyGroup>
 
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
diff --git a/third_party/dotnet/nuget/packages/nunit.3.12.0.nupkg b/third_party/dotnet/nuget/packages/nunit.3.12.0.nupkg
diff --git a/third_party/dotnet/nuget/packages/nunit.3.13.2.nupkg b/third_party/dotnet/nuget/packages/nunit.3.13.2.nupkg

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ private HashSet<string> ScanActualColors(Screenshot screenshot, int stepX, int s`
`445`	`445`	`{`
`446`	`446`	`HashSet<string> colors = new HashSet<string>();`
`447`	`447`
`448`		`-#if !NETCOREAPP2_1 && !NETSTANDARD2_1 && !NET5_0`
	`448`	`+#if !NETCOREAPP3_1 && !NETSTANDARD2_1 && !NET5_0`
`449`	`449`	`try`
`450`	`450`	`{`
`451`	`451`	`Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));`
`@@ -479,7 +479,7 @@ private Color GetPixelColor(Screenshot screenshot, int x, int y)`
`479`	`479`	`{`
`480`	`480`	`Color pixelColor = Color.Black;`
`481`	`481`
`482`		`-#if !NETCOREAPP2_1 && !NETSTANDARD2_1 && !NET5_0`
	`482`	`+#if !NETCOREAPP3_1 && !NETSTANDARD2_1 && !NET5_0`
`483`	`483`	`Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));`
`484`	`484`	`Bitmap bitmap = new Bitmap(image);`
`485`	`485`	`pixelColor = bitmap.GetPixel(1, 1);`