Skip to content

Commit d2838e1

Browse files
titusfortnertitusfortner
committed
[dotnet] update everything required for .NET 6
1 parent 471e245 commit d2838e1

17 files changed

+33
-24
lines changed

‎dotnet/src/support/WebDriver.Support.StrongNamed.nuspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<group targetFramework="net5.0">
4848
<dependency id="Selenium.WebDriver.StrongNamed" version="$version$" exclude="Build,Analyzers" />
4949
</group>
50+
<group targetFramework="net6.0">
51+
<dependency id="Selenium.WebDriver.StrongNamed" version="$version$" exclude="Build,Analyzers" />
52+
</group>
5053
</dependencies>
5154
<frameworkAssemblies>
5255
<frameworkAssembly assemblyName="System.Drawing" />

‎dotnet/src/support/WebDriver.Support.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
55
<AssemblyName>WebDriver.Support</AssemblyName>
66
<RootNamespace>OpenQA.Selenium.Support</RootNamespace>
77
<BuildSystem>visual-studio</BuildSystem>

‎dotnet/src/webdriver/Screenshot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public override void SaveAsFile(string fileName)
8989
/// to save the image to.</param>
9090
public void SaveAsFile(string fileName, ScreenshotImageFormat format)
9191
{
92-
#if NETCOREAPP2_0 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETSTANDARD2_1
92+
#if NETCOREAPP2_0 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETSTANDARD2_1 || NET5_0 || NET6_0
9393
if (format != ScreenshotImageFormat.Png)
9494
{
9595
throw new WebDriverException(".NET Core does not support image manipulation, so only Portable Network Graphics (PNG) format is supported");

‎dotnet/src/webdriver/WebDriver.StrongNamed.nuspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
<group targetFramework="net5.0">
4040
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
4141
</group>
42+
<group targetFramework="net6.0">
43+
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
44+
</group>
4245
</dependencies>
4346
<frameworkAssemblies>
4447
<frameworkAssembly assemblyName="System.Drawing" />

‎dotnet/src/webdriver/WebDriver.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
55
<AssemblyName>WebDriver</AssemblyName>
66
<RootNamespace>OpenQA.Selenium</RootNamespace>
77
</PropertyGroup>
@@ -158,7 +158,7 @@
158158
</EmbeddedResource>
159159
</ItemGroup>
160160

161-
<ItemGroup Condition="'$(TargetFramework)'!='net5.0' And '$(TargetFramework)'!='netstandard2.0' And '$(TargetFramework)'!='netstandard2.1'">
161+
<ItemGroup Condition="'$(TargetFramework)'!='net6.0' And '$(TargetFramework)'!='net5.0' And '$(TargetFramework)'!='netstandard2.0' And '$(TargetFramework)'!='netstandard2.1'">
162162
<Reference Include="System.Net.Http" />
163163
<Reference Include="System.IO.Compression" />
164164
</ItemGroup>

‎dotnet/src/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.StrongNamed.nuspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<group targetFramework="net5.0">
5252
<dependency id="Selenium.WebDriver.StrongNamed" version="$version$" exclude="Build,Analyzers" />
5353
</group>
54+
<group targetFramework="net6.0">
55+
<dependency id="Selenium.WebDriver.StrongNamed" version="$version$" exclude="Build,Analyzers" />
56+
</group>
5457
</dependencies>
5558
<frameworkAssemblies>
5659
<frameworkAssembly assemblyName="System.Drawing" />

‎dotnet/src/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
55
<AssemblyName>Selenium.WebDriverBackedSelenium</AssemblyName>
66
<RootNamespace>Selenium</RootNamespace>
77
<BuildSystem>visual-studio</BuildSystem>

‎dotnet/test/chrome/WebDriver.Chrome.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>WebDriver.Chrome.Tests</AssemblyName>
66
</PropertyGroup>
77

‎dotnet/test/common/TakesScreenshotTest.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void GetScreenshotAsBinary()
6868
[Test]
6969
public void ShouldCaptureScreenshotOfCurrentViewport()
7070
{
71-
#if NETCOREAPP3_1 || NETSTANDARD2_1 || NET5_0
71+
#if NETCOREAPP3_1 || NET6_0
7272
Assert.Ignore("Skipping test: this framework can not process colors.");
7373
#endif
7474

@@ -96,7 +96,7 @@ public void ShouldCaptureScreenshotOfCurrentViewport()
9696
[Test]
9797
public void ShouldTakeScreenshotsOfAnElement()
9898
{
99-
#if NETCOREAPP3_1 || NETSTANDARD2_1 || NET5_0
99+
#if NETCOREAPP3_1 || NET6_0
100100
Assert.Ignore("Skipping test: this framework can not process colors.");
101101
#endif
102102

@@ -122,7 +122,7 @@ public void ShouldTakeScreenshotsOfAnElement()
122122
[Test]
123123
public void ShouldCaptureScreenshotAtFramePage()
124124
{
125-
#if NETCOREAPP3_1 || NETSTANDARD2_1 || NET5_0
125+
#if NETCOREAPP3_1 || NET6_0
126126
Assert.Ignore("Skipping test: this framework can not process colors.");
127127
#endif
128128

@@ -164,7 +164,7 @@ public void ShouldCaptureScreenshotAtFramePage()
164164
[Test]
165165
public void ShouldCaptureScreenshotAtIFramePage()
166166
{
167-
#if NETCOREAPP3_1 || NETSTANDARD2_1 || NET5_0
167+
#if NETCOREAPP3_1 || NET6_0
168168
Assert.Ignore("Skipping test: this framework can not process colors.");
169169
#endif
170170

@@ -204,7 +204,7 @@ public void ShouldCaptureScreenshotAtIFramePage()
204204
[IgnoreBrowser(Browser.Firefox, "Color comparisons fail on Firefox")]
205205
public void ShouldCaptureScreenshotAtFramePageAfterSwitching()
206206
{
207-
#if NETCOREAPP3_1 || NETSTANDARD2_1 || NET5_0
207+
#if NETCOREAPP3_1 || NET6_0
208208
Assert.Ignore("Skipping test: this framework can not process colors.");
209209
#endif
210210

@@ -242,7 +242,7 @@ public void ShouldCaptureScreenshotAtFramePageAfterSwitching()
242242
[IgnoreBrowser(Browser.Firefox, "Color comparisons fail on Firefox")]
243243
public void ShouldCaptureScreenshotAtIFramePageAfterSwitching()
244244
{
245-
#if NETCOREAPP3_1 || NETSTANDARD2_1 || NET5_0
245+
#if NETCOREAPP3_1 || NET6_0
246246
Assert.Ignore("Skipping test: this framework can not process colors.");
247247
#endif
248248

@@ -318,7 +318,7 @@ private HashSet<string> ScanActualColors(Screenshot screenshot, int stepX, int s
318318
{
319319
HashSet<string> colors = new HashSet<string>();
320320

321-
#if !NETCOREAPP3_1 && !NETSTANDARD2_1 && !NET5_0
321+
#if !NETCOREAPP3_1 && !NET6_0
322322
try
323323
{
324324
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
@@ -352,7 +352,7 @@ private Color GetPixelColor(Screenshot screenshot, int x, int y)
352352
{
353353
Color pixelColor = Color.Black;
354354

355-
#if !NETCOREAPP3_1 && !NETSTANDARD2_1 && !NET5_0
355+
#if !NETCOREAPP3_1 && !NET6_0
356356
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
357357
Bitmap bitmap = new Bitmap(image);
358358
pixelColor = bitmap.GetPixel(1, 1);

‎dotnet/test/common/WebDriver.Common.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>WebDriver.Common.Tests</AssemblyName>
66
<RootNamespace>OpenQA.Selenium</RootNamespace>
77
</PropertyGroup>

‎dotnet/test/edge/WebDriver.Edge.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>WebDriver.Edge.Tests</AssemblyName>
66
</PropertyGroup>
7-
7+
88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
99
<OutputPath>..\..\..\build\cli\Debug\</OutputPath>
1010
</PropertyGroup>

‎dotnet/test/firefox/WebDriver.Firefox.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>WebDriver.Firefox.Tests</AssemblyName>
66
</PropertyGroup>
77

‎dotnet/test/ie/WebDriver.IE.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>WebDriver.IE.Tests</AssemblyName>
66
<RootNamespace>OpenQA.Selenium.IE</RootNamespace>
77
</PropertyGroup>

‎dotnet/test/remote/WebDriver.Remote.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>WebDriver.Remote.Tests</AssemblyName>
66
</PropertyGroup>
77

‎dotnet/test/safari/WebDriver.Safari.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>WebDriver.Safari.Tests</AssemblyName>
66
</PropertyGroup>
77

‎dotnet/test/support/WebDriver.Support.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>WebDriver.Support.Tests</AssemblyName>
66
</PropertyGroup>
77

@@ -12,7 +12,7 @@
1212
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1313
<OutputPath>..\..\..\build\cli\Release\</OutputPath>
1414
</PropertyGroup>
15-
15+
1616
<ItemGroup>
1717
<Compile Remove="obj\**" />
1818
<EmbeddedResource Remove="obj\**" />

‎dotnet/test/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net48;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;netcoreapp3.1</TargetFrameworks>
55
<AssemblyName>Selenium.WebDriverBackedSelenium.Tests</AssemblyName>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)