[browser][MT] Add new test for multi-threading SignalR in Blazor WBT

eng/testing/scenarios/BuildWasmAppsJobsList.txt

@@ -36,12 +36,13 @@ Wasm.Build.Tests.TestAppScenarios.AppSettingsTests
 Wasm.Build.Tests.TestAppScenarios.LazyLoadingTests
 Wasm.Build.Tests.TestAppScenarios.LibraryInitializerTests
 Wasm.Build.Tests.TestAppScenarios.SatelliteLoadingTests
+Wasm.Build.Tests.TestAppScenarios.DownloadResourceProgressTests
+Wasm.Build.Tests.TestAppScenarios.SignalRClientTests
 Wasm.Build.Tests.WasmBuildAppTest
 Wasm.Build.Tests.WasmNativeDefaultsTests
 Wasm.Build.Tests.WasmRunOutOfAppBundleTests
 Wasm.Build.Tests.WasmSIMDTests
 Wasm.Build.Tests.WasmTemplateTests
 Wasm.Build.Tests.WorkloadTests
-Wasm.Build.Tests.TestAppScenarios.DownloadResourceProgressTests
 Wasm.Build.Tests.MT.Blazor.SimpleMultiThreadedTests
 Wasm.Build.Tests.TestAppScenarios.DebugLevelTests

src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

@@ -223,7 +223,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <PropertyGroup>
       <_WasmNativeAssetFileNames>;@(WasmNativeAsset->'%(FileName)%(Extension)');</_WasmNativeAssetFileNames>
     </PropertyGroup>
-    
+
     <ItemGroup>
       <_WasmConfigFileCandidates Include="@(StaticWebAsset)" Condition="'%(SourceType)' == 'Discovered'" />
 

src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorRunOptions.cs

@@ -15,6 +15,7 @@ public record BlazorRunOptions
     bool CheckCounter = true,
     Func<IPage, Task>? Test = null,
     Action<IConsoleMessage>? OnConsoleMessage = null,
+    Action<string>? OnServerMessage = null,
     Action<string>? OnErrorMessage = null,
     string Config = "Debug",
     string? ExtraArgs = null,

src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs

@@ -195,7 +195,13 @@ public async Task BlazorRunTest(string runArgs,
                                     .WithWorkingDirectory(workingDirectory);
 
         await using var runner = new BrowserRunner(_testOutput);
-        var page = await runner.RunAsync(runCommand, runArgs, onConsoleMessage: OnConsoleMessage, onError: OnErrorMessage, modifyBrowserUrl: browserUrl => browserUrl + runOptions.QueryString);
+        var page = await runner.RunAsync(
+            runCommand,
+            runArgs,
+            onConsoleMessage: OnConsoleMessage,
+            onServerMessage: runOptions.OnServerMessage,
+            onError: OnErrorMessage,
+            modifyBrowserUrl: browserUrl => browserUrl + runOptions.QueryString);
 
         _testOutput.WriteLine("Waiting for page to load");
         await page.WaitForLoadStateAsync(LoadState.DOMContentLoaded, new () { Timeout = 1 * 60 * 1000 });
@@ -237,6 +243,12 @@ void OnErrorMessage(string msg)
         }
     }
 
-    public string FindBlazorBinFrameworkDir(string config, bool forPublish, string framework = DefaultTargetFrameworkForBlazor)
-        => _provider.FindBinFrameworkDir(config: config, forPublish: forPublish, framework: framework);
+    public string FindBlazorBinFrameworkDir(string config, bool forPublish, string framework = DefaultTargetFrameworkForBlazor, string? projectDir = null)
+        => _provider.FindBinFrameworkDir(config: config, forPublish: forPublish, framework: framework, projectDir: projectDir);
+
+    public string FindBlazorHostedBinFrameworkDir(string config, bool forPublish, string clientDirRelativeToProjectDir, string framework = DefaultTargetFrameworkForBlazor)
+    {
+        string? clientProjectDir = _projectDir == null ? null : Path.Combine(_projectDir, clientDirRelativeToProjectDir);
+        return _provider.FindBinFrameworkDir(config: config, forPublish: forPublish, framework: framework, projectDir: clientProjectDir);
+    }
 }

src/mono/wasm/Wasm.Build.Tests/BrowserRunner.cs

@@ -36,16 +36,21 @@ internal class BrowserRunner : IAsyncDisposable
 
     public async Task<string> StartServerAndGetUrlAsync(
         ToolCommand cmd,
-        string args
+        string args,
+        Action<string>? onServerMessage = null
     ) {
         TaskCompletionSource<string> urlAvailable = new();
         Action<string?> outputHandler = msg =>
         {
             if (string.IsNullOrEmpty(msg))
                 return;
 
+            onServerMessage?.Invoke(msg);
+
             lock (OutputLines)
+            {
                 OutputLines.Add(msg);
+            }
 
             Match m = s_appHostUrlRegex.Match(msg);
             if (!m.Success)
@@ -91,7 +96,8 @@ public async Task<IBrowser> SpawnBrowserAsync(
     ) {
         var url = new Uri(browserUrl);
         Playwright = await Microsoft.Playwright.Playwright.CreateAsync();
-        string[] chromeArgs = new[] { $"--explicitly-allowed-ports={url.Port}" };
+        // codespaces: ignore certificate error -> Microsoft.Playwright.PlaywrightException : net::ERR_CERT_AUTHORITY_INVALID
+        string[] chromeArgs = new[] { $"--explicitly-allowed-ports={url.Port}", "--ignore-certificate-errors" };
         _testOutput.WriteLine($"Launching chrome ('{s_chromePath.Value}') via playwright with args = {string.Join(',', chromeArgs)}");
         return Browser = await Playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions{
             ExecutablePath = s_chromePath.Value,
@@ -106,10 +112,11 @@ public async Task<IPage> RunAsync(
         string args,
         bool headless = true,
         Action<IConsoleMessage>? onConsoleMessage = null,
+        Action<string>? onServerMessage = null,
         Action<string>? onError = null,
         Func<string, string>? modifyBrowserUrl = null)
     {
-        var urlString = await StartServerAndGetUrlAsync(cmd, args);
+        var urlString = await StartServerAndGetUrlAsync(cmd, args, onServerMessage);
         var browser = await SpawnBrowserAsync(urlString, headless);
         var context = await browser.NewContextAsync();
         return await RunAsync(context, urlString, headless, onConsoleMessage, onError, modifyBrowserUrl);

src/mono/wasm/Wasm.Build.Tests/Common/TestOutputWrapper.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Text;
 using Xunit.Abstractions;
 
 #nullable enable
@@ -10,17 +11,23 @@ namespace Wasm.Build.Tests;
 
 public class TestOutputWrapper(ITestOutputHelper baseOutput) : ITestOutputHelper
 {
+    private readonly StringBuilder _outputBuffer = new StringBuilder();
+
     public void WriteLine(string message)
     {
         baseOutput.WriteLine(message);
+        _outputBuffer.AppendLine(message);
         if (EnvironmentVariables.ShowBuildOutput)
             Console.WriteLine(message);
     }
 
     public void WriteLine(string format, params object[] args)
     {
         baseOutput.WriteLine(format, args);
+        _outputBuffer.AppendFormat(format, args).AppendLine();
         if (EnvironmentVariables.ShowBuildOutput)
             Console.WriteLine(format, args);
     }
+
+    public override string ToString() => _outputBuffer.ToString();
 }

src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

@@ -490,10 +490,10 @@ private void AssertFileNames(IEnumerable<string> expected, IEnumerable<string> a
         Assert.Equal(expected, actualFileNames);
     }
 
-    public virtual string FindBinFrameworkDir(string config, bool forPublish, string framework, string? bundleDirName = null)
+    public virtual string FindBinFrameworkDir(string config, bool forPublish, string framework, string? bundleDirName = null, string? projectDir = null)
     {
         EnsureProjectDirIsSet();
-        string basePath = Path.Combine(ProjectDir!, "bin", config, framework);
+        string basePath = Path.Combine(projectDir ?? ProjectDir!, "bin", config, framework);
         if (forPublish)
             basePath = FindSubDirIgnoringCase(basePath, "publish");
 

src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/AppTestBase.cs

@@ -31,14 +31,48 @@ protected void CopyTestAsset(string assetName, string generatedProjectNamePrefix
         LogPath = Path.Combine(s_buildEnv.LogRootPath, Id);
         Utils.DirectoryCopy(Path.Combine(BuildEnvironment.TestAssetsPath, assetName), Path.Combine(_projectDir!));
 
-        // WasmBasicTestApp consists of App + Library projects
-        if (assetName == "WasmBasicTestApp")
-            _projectDir = Path.Combine(_projectDir!, "App");
+        switch(assetName)
+        {
+            case "WasmBasicTestApp":
+                // WasmBasicTestApp consists of App + Library projects
+                _projectDir = Path.Combine(_projectDir!, "App");
+                break;
+            case "BlazorHostedApp":
+                // BlazorHostedApp consists of BlazorHosted.Client and BlazorHosted.Server projects
+                _projectDir = Path.Combine(_projectDir!, "BlazorHosted.Server");
+                break;
+        }
+    }
+
+    protected void BlazorHostedBuild(
+        string config,
+        string assetName,
+        string clientDirRelativeToProjectDir = "",
+        string? generatedProjectNamePrefix = null,
+        RuntimeVariant runtimeType = RuntimeVariant.SingleThreaded)
+    {
+        CopyTestAsset(assetName, generatedProjectNamePrefix);
+        string frameworkDir = FindBlazorHostedBinFrameworkDir(config,
+            forPublish: false,
+            clientDirRelativeToProjectDir: clientDirRelativeToProjectDir);
+        BuildProject(configuration: config,
+            binFrameworkDir: frameworkDir,
+            runtimeType: runtimeType);
     }
 
-    protected void BuildProject(string configuration, params string[] extraArgs)
+    protected void BuildProject(
+        string configuration,
+        string? binFrameworkDir = null,
+        RuntimeVariant runtimeType = RuntimeVariant.SingleThreaded,
+        bool assertAppBundle = true,
+        params string[] extraArgs)
     {
-        (CommandResult result, _) = BlazorBuild(new BlazorBuildOptions(Id, configuration), extraArgs);
+        (CommandResult result, _) = BlazorBuild(new BlazorBuildOptions(
+            Id: Id,
+            Config: configuration,
+            BinFrameworkDir: binFrameworkDir,
+            RuntimeType: runtimeType,
+            AssertAppBundle: assertAppBundle), extraArgs);
         result.EnsureSuccessful();
     }
 
@@ -54,7 +88,7 @@ protected void PublishProject(string configuration, params string[] extraArgs)
 
     protected Task<RunResult> RunSdkStyleAppForBuild(RunOptions options)
         => RunSdkStyleApp(options, BlazorRunHost.DotnetRun);
-    
+
     protected Task<RunResult> RunSdkStyleAppForPublish(RunOptions options)
         => RunSdkStyleApp(options, BlazorRunHost.WebServer);
 
@@ -67,12 +101,14 @@ private async Task<RunResult> RunSdkStyleApp(RunOptions options, BlazorRunHost h
         var tcs = new TaskCompletionSource<int>();
         List<string> testOutput = new();
         List<string> consoleOutput = new();
+        List<string> serverOutput = new();
         Regex exitRegex = new Regex("WASM EXIT (?<exitCode>[0-9]+)$");
 
         BlazorRunOptions blazorRunOptions = new(
                 CheckCounter: false,
                 Config: options.Configuration,
                 OnConsoleMessage: OnConsoleMessage,
+                OnServerMessage: OnServerMessage,
                 QueryString: queryString,
                 Host: host);
 
@@ -82,9 +118,7 @@ void OnConsoleMessage(IConsoleMessage msg)
         {
             consoleOutput.Add(msg.Text);
 
-            const string testOutputPrefix = "TestOutput -> ";
-            if (msg.Text.StartsWith(testOutputPrefix))
-                testOutput.Add(msg.Text.Substring(testOutputPrefix.Length));
+            OnTestOutput(msg.Text);
 
             var exitMatch = exitRegex.Match(msg.Text);
             if (exitMatch.Success)
@@ -97,6 +131,22 @@ void OnConsoleMessage(IConsoleMessage msg)
                 options.OnConsoleMessage(msg);
         }
 
+        void OnServerMessage(string msg)
+        {
+            serverOutput.Add(msg);
+            OnTestOutput(msg);
+
+            if (options.OnServerMessage != null)
+                options.OnServerMessage(msg);
+        }
+
+        void OnTestOutput(string msg)
+        {
+            const string testOutputPrefix = "TestOutput -> ";
+            if (msg.StartsWith(testOutputPrefix))
+                testOutput.Add(msg.Substring(testOutputPrefix.Length));
+        }
+
         //TimeSpan timeout = TimeSpan.FromMinutes(2);
         //await Task.WhenAny(tcs.Task, Task.Delay(timeout));
         //if (!tcs.Task.IsCompleted)
@@ -106,20 +156,22 @@ void OnConsoleMessage(IConsoleMessage msg)
         if (options.ExpectedExitCode != null && wasmExitCode != options.ExpectedExitCode)
             throw new Exception($"Expected exit code {options.ExpectedExitCode} but got {wasmExitCode}");
 
-        return new(wasmExitCode, testOutput, consoleOutput);
+        return new(wasmExitCode, testOutput, consoleOutput, serverOutput);
     }
 
     protected record RunOptions(
         string Configuration,
         string TestScenario,
         Dictionary<string, string> BrowserQueryString = null,
         Action<IConsoleMessage> OnConsoleMessage = null,
+        Action<string> OnServerMessage = null,
         int? ExpectedExitCode = 0
     );
 
     protected record RunResult(
         int ExitCode,
         IReadOnlyCollection<string> TestOutput,
-        IReadOnlyCollection<string> ConsoleOutput
+        IReadOnlyCollection<string> ConsoleOutput,
+        IReadOnlyCollection<string> ServerOutput
     );
 }

src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/DebugLevelTests.cs

@@ -20,7 +20,7 @@ public DebugLevelTests(ITestOutputHelper output, SharedBuildPerTestClassFixture
     {
     }
 
-    private void AssertDebugLevel(RunResult result, int value) 
+    private void AssertDebugLevel(RunResult result, int value)
     {
         Assert.Collection(
             result.TestOutput,
@@ -51,7 +51,7 @@ public async Task BuildWithDefaultLevel(string configuration)
     public async Task BuildWithExplicitValue(string configuration, int debugLevel)
     {
         CopyTestAsset("WasmBasicTestApp", $"DebugLevelTests_BuildWithExplicitValue_{configuration}");
-        BuildProject(configuration, $"-p:WasmDebugLevel={debugLevel}");
+        BuildProject(configuration: configuration, extraArgs: $"-p:WasmDebugLevel={debugLevel}");
 
         var result = await RunSdkStyleAppForBuild(new(
             Configuration: configuration,