Merge remote-tracking branch 'upstream/trunk' into bidi-webextension

Author: nvborisenko

dotnet/test/common/BUILD.bazel

@@ -51,9 +51,9 @@ csharp_library(
     ],
     deps = [
         "//dotnet/src/webdriver:webdriver-net8.0",
-        "@rules_dotnet//tools/runfiles",
         framework("nuget", "Newtonsoft.Json"),
         framework("nuget", "NUnit"),
+        framework("nuget", "Runfiles"),
     ],
 )
 
@@ -92,5 +92,6 @@ dotnet_nunit_test_suite(
         framework("nuget", "BenderProxy"),
         framework("nuget", "Newtonsoft.Json"),
         framework("nuget", "NUnit"),
+        framework("nuget", "Runfiles"),
     ],
 )

dotnet/test/common/Environment/TestWebServer.cs

@@ -52,7 +52,15 @@ public async Task StartAsync()
             try
             {
                 var runfiles = Runfiles.Create();
-                standaloneAppserverPath = runfiles.Rlocation(@"_main/java/test/org/openqa/selenium/environment/appserver");
+
+                var standaloneAppserverProbingPath = @"_main/java/test/org/openqa/selenium/environment/appserver";
+
+                if (OperatingSystem.IsWindows())
+                {
+                    standaloneAppserverProbingPath += ".exe";
+                }
+
+                standaloneAppserverPath = runfiles.Rlocation(standaloneAppserverProbingPath);
             }
             catch (FileNotFoundException)
             {