[release/7.0] [wasm] Test, and app host fixes (dotnet#75295)

* [wasm] Use explicity allowed ports with playwright, on linux too Fixes dotnet#72436 . * [wasm] Quote path, and arguments for wasm app host Fixes use of app host on windows, when it's installed in `c:\program files`. * Update BrowserRunner.cs Co-authored-by: Ankit Jain <[email protected]>
eerhardt · Sep 9, 2022 · fcb841c · fcb841c
1 parent 784974e
commit fcb841c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/mono/wasm/build/WasmApp.targets b/src/mono/wasm/build/WasmApp.targets
@@ -126,7 +126,7 @@
   <PropertyGroup Condition="'$(WasmGenerateAppBundle)' == 'true'">
     <RunCommand Condition="'$(DOTNET_HOST_PATH)' != '' and Exists($(DOTNET_HOST_PATH))">$(DOTNET_HOST_PATH)</RunCommand>
     <RunCommand Condition="'$(RunCommand)' == ''">dotnet</RunCommand>
-    <RunArguments Condition="'$(RunArguments)' == ''">exec $([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll')) --runtime-config $(_AppBundleDirForRunCommand)/$(AssemblyName).runtimeconfig.json $(WasmHostArguments)</RunArguments>
+    <RunArguments Condition="'$(RunArguments)' == ''">exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --runtime-config &quot;$(_AppBundleDirForRunCommand)/$(AssemblyName).runtimeconfig.json&quot; $(WasmHostArguments)</RunArguments>
     <RunWorkingDirectory Condition="'$(RunWorkingDirectory)' == ''">$(_AppBundleDirForRunCommand)</RunWorkingDirectory>
   </PropertyGroup>
 

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BrowserRunner.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BrowserRunner.cs
@@ -77,12 +77,12 @@ public async Task<IPage> RunAsync(ToolCommand cmd, string args, bool headless =
 
         var url = new Uri(urlAvailable.Task.Result);
         Playwright = await Microsoft.Playwright.Playwright.CreateAsync();
+        string[] chromeArgs = new[] { $"--explicitly-allowed-ports={url.Port}" };
+        Console.WriteLine($"Launching chrome ('{s_chromePath.Value}') via playwright with args = {string.Join(',', chromeArgs)}");
         Browser = await Playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions{
             ExecutablePath = s_chromePath.Value,
             Headless = headless,
-            Args = OperatingSystem.IsWindows()
-                        ? new[] { $"--explicitly-allowed-ports={url.Port}" }
-                        : Array.Empty<string>()
+            Args = chromeArgs
         });
 
         IPage page = await Browser.NewPageAsync();