Updating for compilation with .NET Standard 2.0

odedniv · Sep 19, 2017 · a4a6246 · a4a6246
1 parent d05f1f8
commit a4a6246
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/dotnet/src/webdriver/Firefox/Internal/Executable.cs b/dotnet/src/webdriver/Firefox/Internal/Executable.cs
@@ -135,7 +135,7 @@ private static string LocateFirefoxBinaryFromPlatform()
             string binary = string.Empty;
             if (Platform.CurrentPlatform.IsPlatformType(PlatformType.Windows))
             {
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0
                 // NOTE: This code is legacy, and will be removed. It will not be
                 // fixed for the .NET Core case.
                 // Look first in HKEY_LOCAL_MACHINE, then in HKEY_CURRENT_USER
@@ -164,7 +164,7 @@ private static string LocateFirefoxBinaryFromPlatform()
                     };
 
                     binary = GetExecutablePathUsingDefaultInstallLocations(windowsDefaultInstallLocations, "Firefox.exe");
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0
                 }
 #endif
             }
@@ -206,7 +206,7 @@ private static string LocateFirefoxBinaryFromPlatform()
             return FindBinary(new string[] { "firefox3", "firefox" });
         }
 
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_0 && !NETSTANDARD2_0
         private static string GetExecutablePathUsingRegistry(RegistryKey mozillaKey)
         {
             // NOTE: This code is legacy, and will be removed. It will not be

diff --git a/dotnet/src/webdriver/Screenshot.cs b/dotnet/src/webdriver/Screenshot.cs
@@ -17,7 +17,7 @@
 // </copyright>
 
 using System;
-#if NETCOREAPP2_0
+#if NETCOREAPP2_0 || NETSTANDARD2_0
 using ImageSharp;
 using ImageSharp.Formats;
 #else
@@ -104,7 +104,7 @@ public void SaveAsFile(string fileName, ScreenshotImageFormat format)
         {
             using (MemoryStream imageStream = new MemoryStream(this.byteArray))
             {
-#if NETCOREAPP2_0
+#if NETCOREAPP2_0 || NETSTANDARD2_0
                 Image<Rgba32> image = Image.Load(imageStream);
                 using (FileStream fileStream = new FileStream(fileName, FileMode.Create))
                 {
@@ -126,7 +126,7 @@ public override string ToString()
             return this.base64Encoded;
         }
 
-#if NETCOREAPP2_0
+#if NETCOREAPP2_0 || NETSTANDARD2_0
         private static IImageFormat ConvertScreenshotImageFormat(ScreenshotImageFormat format)
         {
             IImageFormat returnedFormat = ImageFormats.Png;