Don't change public behavior

Author: nvborisenko

dotnet/src/webdriver/Firefox/FirefoxExtension.cs

@@ -22,6 +22,7 @@
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
+using System.Reflection;
 using System.Text.Json.Nodes;
 using System.Xml;
 
@@ -88,7 +89,7 @@ public void Install(string profileDirectory)
 
         // First, expand the .xpi archive into a temporary location.
         Directory.CreateDirectory(tempFileName);
-        Stream zipFileStream = ResourceUtilities.GetResourceStream(this.extensionFileName, this.extensionResourceId);
+        Stream zipFileStream = ResourceUtilities.GetResourceStream(this.extensionFileName, $"{Assembly.GetExecutingAssembly().GetName().Name}.{this.extensionResourceId}");
         using (ZipArchive extensionZipArchive = new ZipArchive(zipFileStream, ZipArchiveMode.Read))
         {
             extensionZipArchive.ExtractToDirectory(tempFileName);

dotnet/src/webdriver/Firefox/FirefoxProfile.cs

@@ -23,6 +23,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.IO.Compression;
+using System.Reflection;
 using System.Text.Json;
 
 namespace OpenQA.Selenium.Firefox;
@@ -297,7 +298,7 @@ private void UpdateUserPreferences(string profileDirectory)
 
     private Preferences ReadDefaultPreferences()
     {
-        using (Stream defaultPrefsStream = ResourceUtilities.GetResourceStream("webdriver_prefs.json", "webdriver_prefs.json"))
+        using (Stream defaultPrefsStream = ResourceUtilities.GetResourceStream("webdriver_prefs.json", $"{Assembly.GetExecutingAssembly().GetName().Name}.webdriver_prefs.json"))
         {
             using JsonDocument defaultPreferences = JsonDocument.Parse(defaultPrefsStream);
 

dotnet/src/webdriver/Internal/ResourceUtilities.cs

@@ -101,7 +101,6 @@ public static Stream GetResourceStream(string fileName, string resourceId)
             }
 
             Assembly executingAssembly = Assembly.GetExecutingAssembly();
-            resourceId = $"{executingAssembly.GetName().Name}.{resourceId}";
             resourceStream = executingAssembly.GetManifestResourceStream(resourceId);
         }
 

dotnet/src/webdriver/JavaScriptEngine.cs

@@ -25,6 +25,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text.Json;
 using System.Threading.Tasks;
 
@@ -411,7 +412,7 @@ private async Task EnableDomains()
     private static string GetMutationListenerScript()
     {
         string listenerScript = string.Empty;
-        using (Stream resourceStream = ResourceUtilities.GetResourceStream("mutation-listener.js", "mutation-listener.js"))
+        using (Stream resourceStream = ResourceUtilities.GetResourceStream("mutation-listener.js", $"{Assembly.GetExecutingAssembly().GetName().Name}.mutation-listener.js"))
         {
             using (StreamReader resourceReader = new StreamReader(resourceStream))
             {

dotnet/src/webdriver/RelativeBy.cs

@@ -23,6 +23,7 @@
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
+using System.Reflection;
 
 namespace OpenQA.Selenium;
 
@@ -38,7 +39,7 @@ public sealed class RelativeBy : By
     private static string GetWrappedAtom()
     {
         string atom;
-        using (Stream atomStream = ResourceUtilities.GetResourceStream("find-elements.js", "find-elements.js"))
+        using (Stream atomStream = ResourceUtilities.GetResourceStream("find-elements.js", $"{Assembly.GetExecutingAssembly().GetName().Name}.find-elements.js"))
         {
             using (StreamReader atomReader = new StreamReader(atomStream))
             {

dotnet/src/webdriver/WebElement.cs

@@ -27,6 +27,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Reflection;
 
 namespace OpenQA.Selenium;
 
@@ -709,7 +710,7 @@ protected virtual Response Execute(string commandToExecute, Dictionary<string,
     private static string GetAtom(string atomResourceName)
     {
         string atom;
-        using (Stream atomStream = ResourceUtilities.GetResourceStream(atomResourceName, atomResourceName))
+        using (Stream atomStream = ResourceUtilities.GetResourceStream(atomResourceName, $"{Assembly.GetExecutingAssembly().GetName().Name}.{atomResourceName}"))
         {
             using (StreamReader atomReader = new StreamReader(atomStream))
             {