Skip to content

Commit

Permalink
Upgrading to NUnit3 Test Adapter 3.16.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jimevans committed Jan 23, 2020
1 parent 52b6789 commit c3de3ab
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 28 deletions.
6 changes: 3 additions & 3 deletions dotnet/test/chrome/WebDriver.Chrome.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.Chrome.Tests</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -32,7 +32,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions dotnet/test/common/TakesScreenshotTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ private HashSet<string> ScanActualColors(Screenshot screenshot, int stepX, int s
{
HashSet<string> colors = new HashSet<string>();

#if !NETCOREAPP2_0 && !NETSTANDARD2_0
#if !NETCOREAPP2_1 && !NETSTANDARD2_1
try
{
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
Expand Down Expand Up @@ -479,7 +479,7 @@ private Color GetPixelColor(Screenshot screenshot, int x, int y)
{
Color pixelColor = Color.Black;

#if !NETCOREAPP2_0 && !NETSTANDARD2_0
#if !NETCOREAPP2_1 && !NETSTANDARD2_1
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
Bitmap bitmap = new Bitmap(image);
pixelColor = bitmap.GetPixel(1, 1);
Expand Down
7 changes: 5 additions & 2 deletions dotnet/test/common/WebDriver.Common.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.Common.Tests</AssemblyName>
<RootNamespace>OpenQA.Selenium</RootNamespace>
</PropertyGroup>
Expand Down Expand Up @@ -36,7 +36,10 @@
<PackageReference Include="Moq" Version="4.12.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions dotnet/test/edge/WebDriver.Edge.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.Edge.Tests</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -34,7 +34,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions dotnet/test/firefox/WebDriver.Firefox.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.Firefox.Tests</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -45,7 +45,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions dotnet/test/ie/WebDriver.IE.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.IE.Tests</AssemblyName>
<RootNamespace>OpenQA.Selenium.IE</RootNamespace>
</PropertyGroup>
Expand Down Expand Up @@ -33,7 +33,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions dotnet/test/opera/WebDriver.Opera.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.Opera.Tests</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions dotnet/test/remote/WebDriver.Remote.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.Remote.Tests</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions dotnet/test/safari/WebDriver.Safari.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.Safari.Tests</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -31,7 +31,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions dotnet/test/support/WebDriver.Support.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>WebDriver.Support.Tests</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -31,7 +31,7 @@
<ItemGroup>
<PackageReference Include="Moq" Version="4.13.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
<AssemblyName>Selenium.WebDriverBackedSelenium.Tests</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -31,7 +31,7 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Binary file not shown.
Binary file not shown.

0 comments on commit c3de3ab

Please sign in to comment.