[release/9.0-staging][wbt] Prevent InvalidOperationException on TestOutputHelper logging.

eng/Versions.props

@@ -263,7 +263,7 @@
     <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
     <!-- sdk version, for testing workloads -->
     <!-- <SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting> -->
-    <SdkVersionForWorkloadTesting>9.0.106</SdkVersionForWorkloadTesting>
+    <SdkVersionForWorkloadTesting>9.0.107</SdkVersionForWorkloadTesting>
     <runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
     <EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
     <NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

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

@@ -233,17 +233,16 @@ jobs:
       publishArtifactsForWorkload: true
       publishWBT: true
 
-  # disabled: https://github.com/dotnet/runtime/issues/116492
-  # - template: /eng/pipelines/common/templates/wasm-build-only.yml
-  #   parameters:
-  #     platforms:
-  #       - browser_wasm
-  #       - browser_wasm_win
-  #     nameSuffix: MultiThreaded
-  #     extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
-  #     condition: ne(variables['wasmMultiThreadedBuildOnlyNeededOnDefaultPipeline'], true)
-  #     publishArtifactsForWorkload: true
-  #     publishWBT: false
+  - template: /eng/pipelines/common/templates/wasm-build-only.yml
+    parameters:
+      platforms:
+        - browser_wasm
+        - browser_wasm_win
+      nameSuffix: MultiThreaded
+      extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+      condition: ne(variables['wasmMultiThreadedBuildOnlyNeededOnDefaultPipeline'], true)
+      publishArtifactsForWorkload: true
+      publishWBT: false
 
   # Browser Wasm.Build.Tests
   - template: /eng/pipelines/common/templates/browser-wasm-build-tests.yml

eng/pipelines/runtime-official.yml

@@ -364,25 +364,23 @@ extends:
                 parameters:
                   name: MonoRuntimePacks
 
-      # disabled: https://github.com/dotnet/runtime/issues/116492
-      # - template: /eng/pipelines/common/platform-matrix.yml
-      #   parameters:
-      #     jobTemplate: /eng/pipelines/common/global-build-job.yml
-      #     buildConfig: release
-      #     runtimeFlavor: mono
-      #     platforms:
-      #     - browser_wasm
-      #     jobParameters:
-      #       templatePath: 'templates-official'
-      #       buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
-      #       nameSuffix: Mono_multithread
-      #       isOfficialBuild: ${{ variables.isOfficialBuild }}
-      #       runtimeVariant: multithread
-      #       postBuildSteps:
-      #         - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
-      #           parameters:
-      #             name: MonoRuntimePacks
-
+      - template: /eng/pipelines/common/platform-matrix.yml
+        parameters:
+          jobTemplate: /eng/pipelines/common/global-build-job.yml
+          buildConfig: release
+          runtimeFlavor: mono
+          platforms:
+          - browser_wasm
+          jobParameters:
+            templatePath: 'templates-official'
+            buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+            nameSuffix: Mono_multithread
+            isOfficialBuild: ${{ variables.isOfficialBuild }}
+            runtimeVariant: multithread
+            postBuildSteps:
+              - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
+                parameters:
+                  name: MonoRuntimePacks
 
       # Build Mono AOT offset headers once, for consumption elsewhere
       #

eng/pipelines/runtime.yml

@@ -888,17 +888,16 @@ extends:
           publishArtifactsForWorkload: true
           publishWBT: true
 
-      # disabled: https://github.com/dotnet/runtime/issues/116492
-      # - template: /eng/pipelines/common/templates/wasm-build-only.yml
-      #   parameters:
-      #     platforms:
-      #       - browser_wasm
-      #       - browser_wasm_win
-      #     condition: or(eq(variables.isRollingBuild, true), eq(variables.wasmSingleThreadedBuildOnlyNeededOnDefaultPipeline, true))
-      #     nameSuffix: MultiThreaded
-      #     extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
-      #     publishArtifactsForWorkload: true
-      #     publishWBT: false
+      - template: /eng/pipelines/common/templates/wasm-build-only.yml
+        parameters:
+          platforms:
+            - browser_wasm
+            - browser_wasm_win
+          condition: or(eq(variables.isRollingBuild, true), eq(variables.wasmSingleThreadedBuildOnlyNeededOnDefaultPipeline, true))
+          nameSuffix: MultiThreaded
+          extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS)
+          publishArtifactsForWorkload: true
+          publishWBT: false
 
       # Browser Wasm.Build.Tests
       - template: /eng/pipelines/common/templates/browser-wasm-build-tests.yml

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

@@ -487,6 +487,7 @@ public static (int exitCode, string buildOutput) RunProcess(string path,
             _testOutput.WriteLine($"WorkingDirectory: {workingDir}");
             StringBuilder outputBuilder = new();
             object syncObj = new();
+            bool isDisposed = false;
 
             var processStartInfo = new ProcessStartInfo
             {
@@ -542,11 +543,13 @@ public static (int exitCode, string buildOutput) RunProcess(string path,
                 using CancellationTokenSource cts = new();
                 cts.CancelAfter(timeoutMs ?? s_defaultPerTestTimeoutMs);
 
-                await process.WaitForExitAsync(cts.Token);
-
-                if (cts.IsCancellationRequested)
+                try
+                {
+                    await process.WaitForExitAsync(cts.Token);
+                }
+                catch (OperationCanceledException)
                 {
-                    // process didn't exit
+                    // process didn't exit within timeout
                     process.Kill(entireProcessTree: true);
                     lock (syncObj)
                     {
@@ -560,6 +563,12 @@ public static (int exitCode, string buildOutput) RunProcess(string path,
                 // https://learn.microsoft.com/dotnet/api/system.diagnostics.process.waitforexit?view=net-5.0#System_Diagnostics_Process_WaitForExit_System_Int32_
                 process.WaitForExit();
 
+                // Mark as disposed before detaching handlers to prevent further TestOutput access
+                lock (syncObj)
+                {
+                    isDisposed = true;
+                }
+
                 process.ErrorDataReceived -= logStdErr;
                 process.OutputDataReceived -= logStdOut;
                 process.CancelErrorRead();
@@ -573,17 +582,24 @@ public static (int exitCode, string buildOutput) RunProcess(string path,
             }
             catch (Exception ex)
             {
-                _testOutput.WriteLine($"-- exception -- {ex}");
+                // Mark as disposed before writing to avoid potential race condition
+                lock (syncObj)
+                {
+                    isDisposed = true;
+                }
+                TryWriteToTestOutput(_testOutput, $"-- exception -- {ex}", outputBuilder);
                 throw;
             }
 
             void LogData(string label, string? message)
             {
                 lock (syncObj)
                 {
+                    if (isDisposed)
+                        return;
                     if (message != null)
                     {
-                        _testOutput.WriteLine($"{label} {message}");
+                        TryWriteToTestOutput(_testOutput, $"{label} {message}", outputBuilder, label);
                     }
                     outputBuilder.AppendLine($"{label} {message}");
                 }
@@ -627,6 +643,24 @@ public static string AddItemsPropertiesToProject(string projectFile, string? ext
             return projectFile;
         }
 
+        private static void TryWriteToTestOutput(ITestOutputHelper testOutput, string message, StringBuilder? outputBuffer = null, string? warningPrefix = null)
+        {
+            try
+            {
+                testOutput.WriteLine(message);
+            }
+            catch (InvalidOperationException)
+            {
+                // Test context has expired, but we still want to capture output in buffer
+                // for potential debugging purposes
+                if (outputBuffer != null)
+                {
+                    string prefix = warningPrefix ?? "";
+                    outputBuffer.AppendLine($"{prefix}[WARNING: Test context expired, subsequent output may be incomplete]");
+                }
+            }
+        }
+
         public void Dispose()
         {
             if (_projectDir != null && _enablePerTestCleanup)

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

@@ -15,6 +15,6 @@ public enum RunHost
         Firefox = 8,
         NodeJS = 16,
 
-        All = V8 | NodeJS | Chrome//| Firefox//Safari
+        All = V8 | Chrome//| NodeJS//Firefox//Safari
     }
 }

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

@@ -110,12 +110,12 @@ public virtual void Dispose()
         }
 
         protected virtual string GetFullArgs(params string[] args) => string.Join(" ", args);
-
         private async Task<CommandResult> ExecuteAsyncInternal(string executable, string args)
         {
             var output = new List<string>();
             CurrentProcess = CreateProcess(executable, args);
-            DataReceivedEventHandler errorHandler = (s, e) =>
+
+            void HandleDataReceived(DataReceivedEventArgs e, DataReceivedEventHandler? additionalHandler)
             {
                 if (e.Data == null || isDisposed)
                     return;
@@ -127,24 +127,13 @@ private async Task<CommandResult> ExecuteAsyncInternal(string executable, string
 
                     string msg = $"[{_label}] {e.Data}";
                     output.Add(msg);
-                    _testOutput.WriteLine(msg);
-                    ErrorDataReceived?.Invoke(s, e);
+                    TryWriteToTestOutput(msg, output);
+                    additionalHandler?.Invoke(this, e);
                 }
-            };
-
-            DataReceivedEventHandler outputHandler = (s, e) =>
-            {
-                lock (_lock)
-                {
-                    if (e.Data == null || isDisposed)
-                        return;
+            }
 
-                    string msg = $"[{_label}] {e.Data}";
-                    output.Add(msg);
-                    _testOutput.WriteLine(msg);
-                    OutputDataReceived?.Invoke(s, e);
-                }
-            };
+            DataReceivedEventHandler errorHandler = (s, e) => HandleDataReceived(e, ErrorDataReceived);
+            DataReceivedEventHandler outputHandler = (s, e) => HandleDataReceived(e, OutputDataReceived);
 
             CurrentProcess.ErrorDataReceived += errorHandler;
             CurrentProcess.OutputDataReceived += outputHandler;
@@ -165,6 +154,20 @@ private async Task<CommandResult> ExecuteAsyncInternal(string executable, string
                 string.Join(System.Environment.NewLine, output));
         }
 
+        private void TryWriteToTestOutput(string message, List<string> output)
+        {
+            try
+            {
+                _testOutput.WriteLine(message);
+            }
+            catch (InvalidOperationException)
+            {
+                // Test context may have expired, continue without logging to test output
+                // Add a marker to the output buffer so we know this happened
+                output.Add($"[{_label}] [WARNING: Test context expired, subsequent output may be incomplete]");
+            }
+        }
+
         private Process CreateProcess(string executable, string args)
         {
             var psi = new ProcessStartInfo

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

@@ -35,8 +35,8 @@ public IcuShardingTests(ITestOutputHelper output, SharedBuildPerTestClassFixture
             .UnwrapItemsAsArrays();
 
     [Theory]
-    [MemberData(nameof(IcuExpectedAndMissingCustomShardTestData), parameters: new object[] { false, RunHost.NodeJS | RunHost.Chrome })]
-    [MemberData(nameof(IcuExpectedAndMissingCustomShardTestData), parameters: new object[] { true, RunHost.NodeJS | RunHost.Chrome })]
+    [MemberData(nameof(IcuExpectedAndMissingCustomShardTestData), parameters: new object[] { false,  RunHost.Chrome })]
+    [MemberData(nameof(IcuExpectedAndMissingCustomShardTestData), parameters: new object[] { true, RunHost.Chrome })]
     public void CustomIcuShard(BuildArgs buildArgs, string shardName, string testedLocales, bool onlyPredefinedCultures, RunHost host, string id) =>
         TestIcuShards(buildArgs, shardName, testedLocales, host, id, onlyPredefinedCultures);
 

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

@@ -32,8 +32,8 @@ public IcuShardingTests2(ITestOutputHelper output, SharedBuildPerTestClassFixtur
 
 
     [Theory]
-    [MemberData(nameof(IcuExpectedAndMissingShardFromRuntimePackTestData), parameters: new object[] { false, RunHost.NodeJS | RunHost.Chrome })]
-    [MemberData(nameof(IcuExpectedAndMissingShardFromRuntimePackTestData), parameters: new object[] { true, RunHost.NodeJS | RunHost.Chrome })]
+    [MemberData(nameof(IcuExpectedAndMissingShardFromRuntimePackTestData), parameters: new object[] { false, RunHost.Chrome })]
+    [MemberData(nameof(IcuExpectedAndMissingShardFromRuntimePackTestData), parameters: new object[] { true, RunHost.Chrome })]
     public void DefaultAvailableIcuShardsFromRuntimePack(BuildArgs buildArgs, string shardName, string testedLocales, RunHost host, string id) =>
         TestIcuShards(buildArgs, shardName, testedLocales, host, id);
 }

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

@@ -37,8 +37,8 @@ public IcuTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildCo
             .UnwrapItemsAsArrays();
 
     [Theory]
-    [MemberData(nameof(FullIcuWithInvariantTestData), parameters: new object[] { false, RunHost.NodeJS | RunHost.Chrome })]
-    [MemberData(nameof(FullIcuWithInvariantTestData), parameters: new object[] { true, RunHost.NodeJS | RunHost.Chrome })]
+    [MemberData(nameof(FullIcuWithInvariantTestData), parameters: new object[] { false, RunHost.Chrome })]
+    [MemberData(nameof(FullIcuWithInvariantTestData), parameters: new object[] { true, RunHost.Chrome })]
     public void FullIcuFromRuntimePackWithInvariant(BuildArgs buildArgs, bool invariant, bool fullIcu, string testedLocales, RunHost host, string id)
     {
         string projectName = $"fullIcuInvariant_{fullIcu}_{invariant}_{buildArgs.Config}_{buildArgs.AOT}";
@@ -60,8 +60,8 @@ public void FullIcuFromRuntimePackWithInvariant(BuildArgs buildArgs, bool invari
     }
 
     [Theory]
-    [MemberData(nameof(FullIcuWithICustomIcuTestData), parameters: new object[] { false, RunHost.NodeJS | RunHost.Chrome })]
-    [MemberData(nameof(FullIcuWithICustomIcuTestData), parameters: new object[] { true, RunHost.NodeJS | RunHost.Chrome })]
+    [MemberData(nameof(FullIcuWithICustomIcuTestData), parameters: new object[] { false, RunHost.Chrome })]
+    [MemberData(nameof(FullIcuWithICustomIcuTestData), parameters: new object[] { true, RunHost.Chrome })]
     public void FullIcuFromRuntimePackWithCustomIcu(BuildArgs buildArgs, bool fullIcu, RunHost host, string id)
     {
         string projectName = $"fullIcuCustom_{fullIcu}_{buildArgs.Config}_{buildArgs.AOT}";

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

@@ -38,13 +38,13 @@ public static async System.Threading.Tasks.Task<int> Main(string[] args)
                 }",
                 buildArgs, args, host, id);
 
-        [Theory]
-        [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ false, RunHost.NodeJS })]
-        //[MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ true, RunHost.All })]
-        public void TopLevelWithArgs(BuildArgs buildArgs, string[] args, RunHost host, string id)
-            => TestMainWithArgs("top_level_args",
-                                @"##CODE## return await System.Threading.Tasks.Task.FromResult(42 + count);",
-                                buildArgs, args, host, id);
+        // [Theory]
+        // [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ false, RunHost.NodeJS })]
+        // //[MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ true, RunHost.All })]
+        // public void TopLevelWithArgs(BuildArgs buildArgs, string[] args, RunHost host, string id)
+        //     => TestMainWithArgs("top_level_args",
+        //                         @"##CODE## return await System.Threading.Tasks.Task.FromResult(42 + count);",
+        //                         buildArgs, args, host, id);
 
         [Theory]
         [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ false, RunHost.All })]

src/mono/wasm/Wasm.Build.Tests/Templates/NativeBuildTests.cs

@@ -61,41 +61,5 @@ public void BuildWithUndefinedNativeSymbol(bool allowUndefined)
                 Assert.Contains("Use '-p:WasmAllowUndefinedSymbols=true' to allow undefined symbols", result.Output);
             }
         }
-
-        [Theory]
-        [InlineData("Debug")]
-        [InlineData("Release")]
-        public void ProjectWithDllImportsRequiringMarshalIlGen_ArrayTypeParameter(string config)
-        {
-            string id = $"dllimport_incompatible_{GetRandomId()}";
-            string projectPath = CreateWasmTemplateProject(id, template: "wasmconsole");
-
-            string nativeSourceFilename = "incompatible_type.c";
-            string nativeCode = "void call_needing_marhsal_ilgen(void *x) {}";
-            File.WriteAllText(path: Path.Combine(_projectDir!, nativeSourceFilename), nativeCode);
-
-            AddItemsPropertiesToProject(
-                projectPath,
-                extraItems: "<NativeFileReference Include=\"" + nativeSourceFilename + "\" />"
-            );
-
-            File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "marshal_ilgen_test.cs"),
-                                    Path.Combine(_projectDir!, "Program.cs"),
-                                    overwrite: true);
-
-            using DotNetCommand cmd = new DotNetCommand(s_buildEnv, _testOutput);
-            CommandResult result = cmd.WithWorkingDirectory(_projectDir!)
-                    .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
-                    .ExecuteWithCapturedOutput("build", $"-c {config} -bl");
-
-            Assert.True(result.ExitCode == 0, "Expected build to succeed");
-
-            using RunCommand runCmd = new RunCommand(s_buildEnv, _testOutput);
-            CommandResult res = runCmd.WithWorkingDirectory(_projectDir!)
-                    .ExecuteWithCapturedOutput($"run --no-silent --no-build -c {config}")
-                    .EnsureSuccessful();
-            Assert.Contains("Hello, Console!", res.Output);
-            Assert.Contains("Hello, World! Greetings from node version", res.Output);
-        }
     }
 }