[wasm] Stop testing with V8 and wasmconsole

eng/pipelines/common/templates/wasm-library-aot-tests.yml

@@ -35,9 +35,7 @@ jobs:
         - ${{ if ne(parameters.scenarios[0], '') }}:
           - ${{ parameters.scenarios }}
         - ${{ else }}:
-          - ${{ if eq(platform, 'browser_wasm') }}:
-            - WasmTestOnV8
-          - ${{ if eq(platform, 'browser_wasm_win') }}:
+          - ${{ if or(eq(platform, 'browser_wasm'), eq(platform, 'browser_wasm_win')) }}:
             - WasmTestOnChrome
           - ${{ if or(eq(platform, 'wasi_wasm_win'), eq(platform, 'wasi_wasm')) }}:
             - WasmTestOnWasmtime

eng/pipelines/common/templates/wasm-library-tests.yml

@@ -6,7 +6,7 @@ parameters:
   isWasmOnlyBuild: false
   nameSuffix: ''
   platforms: []
-  scenarios: ['WasmTestOnV8']
+  scenarios: ['WasmTestOnChrome']
   shouldContinueOnError: false
   shouldRunSmokeOnly: false
 

eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml

@@ -89,7 +89,6 @@ jobs:
       isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
       isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
       scenarios:
-        - WasmTestOnV8
         - WasmTestOnChrome
 
   # EAT Library tests - only run on linux

eng/pipelines/libraries/outerloop-mono.yml

@@ -65,7 +65,7 @@ extends:
                 - template: /eng/pipelines/libraries/helix.yml
                   parameters:
                     scenarios:
-                    - WasmTestOnV8
+                    - WasmTestOnChrome
                     testScope: outerloop
                     creator: dotnet-bot
                     testRunNamePrefixSuffix: Mono_$(_BuildConfig)

eng/pipelines/runtime.yml

@@ -823,7 +823,6 @@ extends:
           alwaysRun: ${{ variables.isRollingBuild }}
           extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
           scenarios:
-            - WasmTestOnV8
             - WasmTestOnChrome
             - WasmTestOnFirefox
 

eng/testing/scenarios/BuildWasmAppsJobsList.txt

@@ -48,5 +48,4 @@ Wasm.Build.Tests.WasmSIMDTests
 Wasm.Build.Tests.WasmTemplateTests
 Wasm.Build.Tests.WorkloadTests
 Wasm.Build.Tests.MT.Blazor.SimpleMultiThreadedTests
-Wasm.Build.Tests.TestAppScenarios.WasmSdkDebugLevelTests
-Wasm.Build.Tests.TestAppScenarios.WasmAppBuilderDebugLevelTests
+Wasm.Build.Tests.DebugLevelTests

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

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.IO;
 using Xunit.Abstractions;
 
 #nullable enable
@@ -9,9 +10,9 @@ namespace Wasm.Build.Tests;
 
 public class BlazorWasmProjectProvider : WasmSdkBasedProjectProvider
 {
-    public BlazorWasmProjectProvider(ITestOutputHelper _testOutput, string? _projectDir = null)
-            : base(_testOutput, _projectDir)
-    {}
+    public BlazorWasmProjectProvider(ITestOutputHelper _testOutput, string defaultTargetFramework, string? _projectDir = null)
+            : base(_testOutput, defaultTargetFramework, _projectDir)
+    { }
 
     public void AssertBundle(BlazorBuildOptions options)
         => AssertBundle(new AssertWasmSdkBundleOptions(
@@ -28,4 +29,14 @@ public void AssertBundle(BlazorBuildOptions options)
                 AssertIcuAssets: true,
                 AssertSymbolsFile: false // FIXME: not supported yet
             ));
+
+    public override string FindBinFrameworkDir(string config, bool forPublish, string framework, string? projectDir = null)
+    {
+        EnsureProjectDirIsSet();
+        string basePath = Path.Combine(projectDir ?? ProjectDir!, "bin", config, framework);
+        if (forPublish)
+            basePath = FindSubDirIgnoringCase(basePath, "publish");
+
+        return Path.Combine(basePath, BundleDirName, "_framework");
+    }
 }

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

@@ -15,14 +15,13 @@
 
 namespace Wasm.Build.Tests;
 
-public abstract class BlazorWasmTestBase : WasmTemplateTestBase
+public abstract class BlazorWasmTestBase : WasmTemplateTestsBase
 {
     protected readonly BlazorWasmProjectProvider _provider;
     protected BlazorWasmTestBase(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext)
-                : base(output, buildContext, new BlazorWasmProjectProvider(output))
+                : base(output, buildContext, new BlazorWasmProjectProvider(output, DefaultTargetFrameworkForBlazor))
     {
         _provider = GetProvider<BlazorWasmProjectProvider>();
-        _provider.BundleDirName = "wwwroot";
     }
 
     public void InitBlazorWasmProjectDir(string id, string targetFramework = DefaultTargetFrameworkForBlazor)
@@ -250,10 +249,4 @@ void OnErrorMessage(string msg)
 
     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/Blazor/DebugLevelTests.cs

@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+using Wasm.Build.Tests.TestAppScenarios;
+
+#nullable enable
+
+namespace Wasm.Build.Tests.Blazor;
+
+public class DebugLevelTests : AppTestBase
+{
+    public DebugLevelTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext)
+        : base(output, buildContext)
+    {
+    }
+
+    [Theory]
+    [InlineData("Debug")]
+    [InlineData("Release")]
+    public async Task PublishWithDefaultLevelAndPdbs(string configuration)
+    {
+        CopyTestAsset("WasmBasicTestApp", $"DebugLevelTests_PublishWithDefaultLevelAndPdbs_{configuration}", "App");
+        PublishProject(configuration, assertAppBundle: false, extraArgs: $"-p:CopyOutputSymbolsToPublishDirectory=true");
+
+        var result = await RunSdkStyleAppForBuild(new(
+            Configuration: configuration,
+            TestScenario: "DebugLevelTest"
+        ));
+        Assert.Contains($"WasmDebugLevel: -1", result.TestOutput);
+    }
+}

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

@@ -18,6 +18,8 @@ internal class BrowserRunner : IAsyncDisposable
 {
     private static Regex s_blazorUrlRegex = new Regex("Now listening on: (?<url>https?://.*$)");
     private static Regex s_appHostUrlRegex = new Regex("^App url: (?<url>https?://.*$)");
+    private static Regex s_appPublishedUrlRegex = new Regex(@"^\s{2}(?<url>https?://.*$)");
+    private static readonly Regex s_payloadRegex = new Regex("\"payload\":\"(?<payload>[^\"]*)\"", RegexOptions.Compiled);
     private static Regex s_exitRegex = new Regex("WASM EXIT (?<exitCode>-?[0-9]+)$");
     private static readonly Lazy<string> s_chromePath = new(() =>
     {
@@ -52,9 +54,15 @@ public async Task<string> StartServerAndGetUrlAsync(
                 OutputLines.Add(msg);
             }
 
-            Match m = s_appHostUrlRegex.Match(msg);
-            if (!m.Success)
-                m = s_blazorUrlRegex.Match(msg);
+            var regexes = new[] { s_appHostUrlRegex, s_blazorUrlRegex, s_appPublishedUrlRegex };
+            Match m = Match.Empty;
+
+            foreach (var regex in regexes)
+            {
+                m = regex.Match(msg);
+                if (m.Success)
+                    break;
+            }
 
             if (m.Success)
             {
@@ -176,8 +184,28 @@ public async Task<IPage> RunAsync(
 
         IPage page = await context.NewPageAsync();
 
-        if (onConsoleMessage is not null)
-            page.Console += (_, msg) => onConsoleMessage(page, msg);
+        page.Console += (_, msg) => 
+        {
+            Match payloadMatch = s_payloadRegex.Match(msg.Text);
+            if (payloadMatch.Success)
+            {
+                string payload = payloadMatch.Groups["payload"].Value;
+                lock (OutputLines)
+                {
+                    OutputLines.Add(payload);
+                }
+
+                Match exitMatch = s_exitRegex.Match(payload);
+                if (exitMatch.Success)
+                {
+                    _exited.TrySetResult(int.Parse(exitMatch.Groups["exitCode"].Value));
+                }
+            }
+            if (onConsoleMessage is not null)
+            {
+                onConsoleMessage(page, msg);
+            }
+        };
 
         onError ??= _testOutput.WriteLine;
         if (onError is not null)

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

@@ -198,6 +198,8 @@ public BuildTestBase(ProjectProviderBase providerBase, ITestOutputHelper output,
             return (res, logFilePath);
         }
 
+        protected bool IsDotnetWasmFromRuntimePack(BuildArgs buildArgs) => !(buildArgs.AOT || buildArgs.Config == "Release");
+
         protected string RunAndTestWasmApp(BuildArgs buildArgs,
                                            RunHost host,
                                            string id,

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

@@ -23,7 +23,7 @@ public record AssertTestMainJsAppBundleOptions(
     bool AssertSymbolsFile = true,
     bool HasV8Script = false,
     bool IsBrowserProject = true)
-        : AssertBundleOptionsBase(
+        : AssertWasmSdkBundleOptions(
                Config: Config,
                IsPublish: IsPublish,
                TargetFramework: TargetFramework,
@@ -32,7 +32,7 @@ public record AssertTestMainJsAppBundleOptions(
                GlobalizationMode: GlobalizationMode,
                ExpectedFileType: ExpectedFileType,
                RuntimeType: RuntimeType,
-               BootJsonFileName: BootJsonFileName,
+               BootConfigFileName: BootJsonFileName,
                ExpectFingerprintOnDotnetJs: ExpectFingerprintOnDotnetJs,
                ExpectSymbolsFile: ExpectSymbolsFile,
                AssertIcuAssets: AssertIcuAssets,

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

@@ -26,7 +26,7 @@ public void ConfigSrcAbsolutePath(BuildArgs buildArgs, RunHost host, string id)
                         id: id,
                         new BuildProjectOptions(
                             InitProject: () => File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), s_mainReturns42),
-                            DotnetWasmFromRuntimePack: !(buildArgs.AOT || buildArgs.Config == "Release")));
+                            DotnetWasmFromRuntimePack: IsDotnetWasmFromRuntimePack(buildArgs)));
 
         string binDir = GetBinDir(baseDir: _projectDir!, config: buildArgs.Config);
         string bundleDir = Path.Combine(binDir, "AppBundle");

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

@@ -0,0 +1,116 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+#nullable enable
+
+namespace Wasm.Build.Tests;
+
+public class DebugLevelTests : WasmTemplateTestsBase
+{
+    public DebugLevelTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext)
+        : base(output, buildContext)
+    {
+    }
+
+    private string SetupBrowserProject(string projectId, string extraProperties = "")
+    {
+        string id = $"{projectId}_{GetRandomId()}";
+        string projectfile = CreateWasmTemplateProject(id, "wasmbrowser", extraProperties: extraProperties);
+
+        UpdateBrowserMainJs();
+        string mainJs = Path.Combine("wwwroot", "main.js");
+        UpdateFile(mainJs, new Dictionary<string, string>
+        {
+            { "import { dotnet }", "import { dotnet, exit }" },
+            {"await dotnet.run()", "console.log('TestOutput -> WasmDebugLevel: ' + config.debugLevel); exit(42)" }
+        });
+        return projectfile;
+    }
+
+    private void AssertDebugLevel(string result, int value)
+        => Assert.Contains($"WasmDebugLevel: {value}", result);
+
+    private BuildProjectOptions GetProjectOptions(bool isPublish = false) =>
+        new BuildProjectOptions(
+            DotnetWasmFromRuntimePack: !isPublish,
+            CreateProject: false,
+            HasV8Script: false,
+            MainJS: "main.js",
+            Publish: isPublish,
+            AssertAppBundle: false
+        );
+
+    private string BuildPublishProject(string projectFile, string config, bool isPublish = false)
+    {
+        string projectName = Path.GetFileNameWithoutExtension(projectFile);
+        var buildArgs = new BuildArgs(projectName, config, false, projectName, null);
+        buildArgs = ExpandBuildArgs(buildArgs);
+        (string _, string output) = BuildTemplateProject(buildArgs,
+            buildArgs.Id,
+            GetProjectOptions(isPublish)
+        );
+        return output;
+    }
+
+    [Theory]
+    [InlineData("Debug")]
+    [InlineData("Release")]
+    public async Task BuildWithDefaultLevel(string configuration)
+    {
+        string projectFile = SetupBrowserProject($"DebugLevelTests_BuildWithDefaultLevel_{configuration}");
+        BuildPublishProject(projectFile, configuration);
+
+        string result = await RunBuiltBrowserApp(configuration, projectFile);
+        AssertDebugLevel(result, -1);
+    }
+
+    [Theory]
+    [InlineData("Debug", 1)]
+    [InlineData("Release", 1)]
+    [InlineData("Debug", 0)]
+    [InlineData("Release", 0)]
+    public async Task BuildWithExplicitValue(string configuration, int debugLevel)
+    {
+        string debugLvlProp = $"<WasmDebugLevel>{debugLevel}</WasmDebugLevel>";
+        string projectFile = SetupBrowserProject($"DebugLevelTests_BuildWithExplicitValue_{configuration}", extraProperties: debugLvlProp);
+        BuildPublishProject(projectFile, configuration);
+
+        string result = await RunBuiltBrowserApp(configuration, projectFile);
+        AssertDebugLevel(result, debugLevel);
+    }
+
+    [Theory]
+    [InlineData("Debug")]
+    [InlineData("Release")]
+    public async Task PublishWithDefaultLevel(string configuration)
+    {
+        string projectFile = SetupBrowserProject($"DebugLevelTests_PublishWithDefaultLevel_{configuration}");
+        BuildPublishProject(projectFile, configuration, isPublish: true);
+
+        string result = await RunPublishedBrowserApp(configuration);
+        AssertDebugLevel(result, 0);
+    }
+
+    [Theory]
+    [InlineData("Debug", 1)]
+    [InlineData("Release", 1)]
+    [InlineData("Debug", -1)]
+    [InlineData("Release", -1)]
+    public async Task PublishWithExplicitValue(string configuration, int debugLevel)
+    {
+        string debugLvlProp = $"<WasmDebugLevel>{debugLevel}</WasmDebugLevel>";
+        string projectFile = SetupBrowserProject($"DebugLevelTests_PublishWithExplicitValue_{configuration}", debugLvlProp);
+        BuildPublishProject(projectFile, configuration, isPublish: true);
+
+        string result = await RunBuiltBrowserApp(configuration, projectFile);
+        AssertDebugLevel(result, debugLevel);
+    }
+}

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

@@ -44,7 +44,7 @@ private void TestHybridGlobalizationTests(BuildArgs buildArgs, RunHost host, str
             buildArgs = ExpandBuildArgs(buildArgs, extraProperties);
 
             if (dotnetWasmFromRuntimePack == null)
-                dotnetWasmFromRuntimePack = !(buildArgs.AOT || buildArgs.Config == "Release");
+                dotnetWasmFromRuntimePack = IsDotnetWasmFromRuntimePack(buildArgs);
 
             string programText = File.ReadAllText(Path.Combine(BuildEnvironment.TestAssetsPath, "Wasm.Buid.Tests.Programs", "HybridGlobalization.cs"));
 

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

@@ -35,7 +35,6 @@ public static IEnumerable<object[]> IcuExpectedAndMissingAutomaticShardTestData(
             { "ja-JP", GetCjkTestedLocales(SundayNames.Japanese) },
             { "sk-SK", GetNocjkTestedLocales(SundayNames.Slovak) }
         }; 
-        // "wasmconsole": https://github.com/dotnet/runtime/issues/82593
         return from aot in boolOptions
             from locale in locales
             select new object[] { config, "wasmbrowser", aot, locale.Key, locale.Value };

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

@@ -31,11 +31,10 @@ public static IEnumerable<object[]> IcuExpectedAndMissingShardFromRuntimePackTes
             { "icudt_no_CJK.dat", GetNocjkTestedLocales() }
         }; 
         return
-            // "wasmconsole": https://github.com/dotnet/runtime/issues/82593
-            // from templateType in templateTypes
+            from templateType in templateTypes
             from aot in boolOptions
             from locale in locales
-            select new object[] { config, "wasmbrowser", aot, locale.Key, locale.Value };
+            select new object[] { config, templateType, aot, locale.Key, locale.Value };
     }
 
     [Theory]