[dotnet] Be more friendly for single file publishing and native compilation (#12045)

* Use GetExecutingAssembly instead of GetCallingAssembly

* Make determination of selenium manager easier

* Invert conditional statement for net45

* Even remove normalizing of base selenium maager directory

seems no cases to entrace into this if statement

* Remove unnecessary local variable assigment

---------

Co-authored-by: Diego Molina <[email protected]>

Author: nvborisenko

dotnet/src/webdriver/Internal/ResourceUtilities.cs

@@ -29,7 +29,7 @@ namespace OpenQA.Selenium.Internal
     /// <summary>
     /// Encapsulates methods for finding and extracting WebDriver resources.
     /// </summary>
-    public static class ResourceUtilities
+    internal static class ResourceUtilities
     {
         private static string assemblyVersion;
         private static string platformFamily;
@@ -43,7 +43,7 @@ public static string AssemblyVersion
             {
                 if (string.IsNullOrEmpty(assemblyVersion))
                 {
-                    Assembly executingAssembly = Assembly.GetCallingAssembly();
+                    Assembly executingAssembly = Assembly.GetExecutingAssembly();
                     Version versionResource = executingAssembly.GetName().Version;
                     assemblyVersion = string.Format(CultureInfo.InvariantCulture, "{0}.{1}.{2}", versionResource.Major, versionResource.Minor, versionResource.Revision);
                 }
@@ -106,7 +106,7 @@ public static Stream GetResourceStream(string fileName, string resourceId)
                     throw new WebDriverException("The file specified does not exist, and you have specified no internal resource ID");
                 }
 
-                Assembly executingAssembly = Assembly.GetCallingAssembly();
+                Assembly executingAssembly = Assembly.GetExecutingAssembly();
                 resourceStream = executingAssembly.GetManifestResourceStream(resourceId);
             }
 
@@ -118,18 +118,6 @@ public static Stream GetResourceStream(string fileName, string resourceId)
             return resourceStream;
         }
 
-        /// <summary>
-        /// Returns a value indicating whether a resource exists with the specified ID.
-        /// </summary>
-        /// <param name="resourceId">ID of the embedded resource to check for.</param>
-        /// <returns><see langword="true"/> if the resource exists in the calling assembly; otherwise <see langword="false"/>.</returns>
-        public static bool IsValidResourceName(string resourceId)
-        {
-            Assembly executingAssembly = Assembly.GetCallingAssembly();
-            List<string> resourceNames = new List<string>(executingAssembly.GetManifestResourceNames());
-            return resourceNames.Contains(resourceId);
-        }
-
         private static string GetPlatformString()
         {
             string platformName = "unknown";

dotnet/src/webdriver/SeleniumManager.cs

@@ -22,6 +22,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using System.Reflection;
 
 #if !NET45 && !NET46 && !NET47
@@ -38,8 +39,40 @@ namespace OpenQA.Selenium
     /// </summary>
     public static class SeleniumManager
     {
-        private static string basePath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-        private static string binary;
+        private readonly static string binaryFullPath;
+
+        static SeleniumManager()
+        {
+#if NET45
+            var currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+#else
+            var currentDirectory = AppContext.BaseDirectory;
+#endif
+
+            string binary;
+#if NET45 || NET46 || NET47
+                binary = "selenium-manager/windows/selenium-manager.exe";
+#else
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    binary = "selenium-manager/windows/selenium-manager.exe";
+                }
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    binary = "selenium-manager/linux/selenium-manager";
+                }
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    binary = "selenium-manager/macos/selenium-manager";
+                }
+                else
+                {
+                    throw new WebDriverException("Selenium Manager did not find supported operating system");
+                }
+#endif
+
+            binaryFullPath = Path.Combine(currentDirectory, binary);
+        }
 
         /// <summary>
         /// Determines the location of the correct driver.
@@ -50,9 +83,6 @@ public static class SeleniumManager
         /// </returns>
         public static string DriverPath(DriverOptions options)
         {
-            var binaryFile = Binary;
-            if (binaryFile == null) return null;
-
             StringBuilder argsBuilder = new StringBuilder();
             argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --browser \"{0}\"", options.BrowserName);
             argsBuilder.Append(" --output json");
@@ -68,8 +98,7 @@ public static string DriverPath(DriverOptions options)
                 argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --browser-path \"{0}\"", browserBinary);
             }
 
-
-            return RunCommand(binaryFile, argsBuilder.ToString());
+            return RunCommand(binaryFullPath, argsBuilder.ToString());
         }
 
 
@@ -96,40 +125,6 @@ private static string BrowserBinary(DriverOptions options)
             return null;
         }
 
-        /// <summary>
-        /// Gets the location of the correct Selenium Manager binary.
-        /// </summary>
-        private static string Binary
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(binary))
-                {
-#if NET45 || NET46 || NET47
-                    binary = "selenium-manager/windows/selenium-manager.exe";
-#else
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    {
-                        binary = "selenium-manager/windows/selenium-manager.exe";
-                    }
-                    else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                    {
-                        binary = "selenium-manager/linux/selenium-manager";
-                    }
-                    else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                    {
-                        binary = "selenium-manager/macos/selenium-manager";
-                    }
-                    else
-                    {
-                        throw new WebDriverException("Selenium Manager did not find supported operating system");
-                    }
-#endif
-                }
-
-                return binary;
-            }
-        }
 
         /// <summary>
         /// Executes a process with the given arguments.
@@ -142,7 +137,7 @@ private static string Binary
         private static string RunCommand(string fileName, string arguments)
         {
             Process process = new Process();
-            process.StartInfo.FileName = $"{basePath}/{fileName}";
+            process.StartInfo.FileName = binaryFullPath;
             process.StartInfo.Arguments = arguments;
             process.StartInfo.UseShellExecute = false;
             process.StartInfo.StandardErrorEncoding = Encoding.UTF8;
@@ -151,7 +146,6 @@ private static string RunCommand(string fileName, string arguments)
             process.StartInfo.RedirectStandardError = true;
 
             StringBuilder outputBuilder = new StringBuilder();
-            int processExitCode;
 
             DataReceivedEventHandler outputHandler = (sender, e) => outputBuilder.AppendLine(e.Data);
 
@@ -164,14 +158,20 @@ private static string RunCommand(string fileName, string arguments)
                 process.BeginOutputReadLine();
 
                 process.WaitForExit();
+
+                if (process.ExitCode != 0)
+                {
+                    // We do not log any warnings coming from Selenium Manager like the other bindings as we don't have any logging in the .NET bindings
+
+                    throw new WebDriverException($"Selenium Manager process exited abnormally with {process.ExitCode} code: {fileName} {arguments}\n{outputBuilder}");
+                }
             }
             catch (Exception ex)
             {
                 throw new WebDriverException($"Error starting process: {fileName} {arguments}", ex);
             }
             finally
             {
-                processExitCode = process.ExitCode;
                 process.OutputDataReceived -= outputHandler;
             }
 
@@ -188,13 +188,6 @@ private static string RunCommand(string fileName, string arguments)
                 throw new WebDriverException($"Error deserializing Selenium Manager's response: {output}", ex);
             }
 
-            // We do not log any warnings coming from Selenium Manager like the other bindings as we don't have any logging in the .NET bindings
-
-            if (processExitCode != 0)
-            {
-                throw new WebDriverException($"Invalid response from process (code {processExitCode}): {fileName} {arguments}\n{result}");
-            }
-
             return result;
         }
     }