Add support for .NET 5 in IDE projects

SeleniumHQ · Nov 11, 2020 · 7b8bd72 · 7b8bd72
1 parent ad329ee
commit 7b8bd72
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/dotnet/src/support/WebDriver.Support.csproj b/dotnet/src/support/WebDriver.Support.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Support</AssemblyName>
     <RootNamespace>OpenQA.Selenium.Support</RootNamespace>
     <BuildSystem>visual-studio</BuildSystem>

diff --git a/dotnet/src/webdriver/Screenshot.cs b/dotnet/src/webdriver/Screenshot.cs
@@ -17,7 +17,7 @@
 // </copyright>
 
 using System;
-#if NETCOREAPP2_0 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETSTANDARD2_1
+#if NETCOREAPP2_0 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETSTANDARD2_1 || NET5_0
 #else
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -121,7 +121,7 @@ public void SaveAsFile(string fileName, ScreenshotImageFormat format)
             {
                 using (FileStream fileStream = new FileStream(fileName, FileMode.Create))
                 {
-#if NETCOREAPP2_0 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETSTANDARD2_1
+#if NETCOREAPP2_0 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETSTANDARD2_1 || NET5_0
                     imageStream.WriteTo(fileStream);
 #else
                     using (Image screenshotImage = Image.FromStream(imageStream))
@@ -142,7 +142,7 @@ public override string ToString()
             return this.base64Encoded;
         }
 
-#if NETCOREAPP2_0 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETSTANDARD2_1
+#if NETCOREAPP2_0 || NETSTANDARD2_0 || NETCOREAPP2_1 || NETSTANDARD2_1 || NET5_0
 #else
         private static ImageFormat ConvertScreenshotImageFormat(ScreenshotImageFormat format)
         {

diff --git a/dotnet/src/webdriver/WebDriver.csproj b/dotnet/src/webdriver/WebDriver.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
     <AssemblyName>WebDriver</AssemblyName>
     <RootNamespace>OpenQA.Selenium</RootNamespace>
   </PropertyGroup>
@@ -143,7 +143,7 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0' And '$(TargetFramework)'!='netstandard2.1'">
+  <ItemGroup Condition="'$(TargetFramework)'!='net5.0' And '$(TargetFramework)'!='netstandard2.0' And '$(TargetFramework)'!='netstandard2.1'">
     <Reference Include="System.Net.Http" />
     <Reference Include="System.IO.Compression" />
   </ItemGroup>

diff --git a/dotnet/src/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.csproj b/dotnet/src/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net48;net47;net46;net45;netstandard2.1;netstandard2.0</TargetFrameworks>
     <AssemblyName>Selenium.WebDriverBackedSelenium</AssemblyName>
     <RootNamespace>Selenium</RootNamespace>
     <BuildSystem>visual-studio</BuildSystem>

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.Chrome.Tests</AssemblyName>
   </PropertyGroup>
 

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
+#if !NETCOREAPP2_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
+#if !NETCOREAPP2_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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.Common.Tests</AssemblyName>
     <RootNamespace>OpenQA.Selenium</RootNamespace>
   </PropertyGroup>

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.Edge.Tests</AssemblyName>
   </PropertyGroup>
 

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.Firefox.Tests</AssemblyName>
   </PropertyGroup>
 

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.IE.Tests</AssemblyName>
     <RootNamespace>OpenQA.Selenium.IE</RootNamespace>
   </PropertyGroup>

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.Opera.Tests</AssemblyName>
   </PropertyGroup>
 

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.Remote.Tests</AssemblyName>
   </PropertyGroup>
 

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.Safari.Tests</AssemblyName>
   </PropertyGroup>
 

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>WebDriver.Support.Tests</AssemblyName>
   </PropertyGroup>
 

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>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;net471;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>Selenium.WebDriverBackedSelenium.Tests</AssemblyName>
   </PropertyGroup>