[browser][MT] send cancel to abandoned threads with event loop during mono_exit

src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.cs

@@ -24,6 +24,7 @@ public static async Task<int> Main(string[] args)
         var includedClasses = new List<string>();
         var includedMethods = new List<string>();
         var backgroundExec = false;
+        var untilFailed = false;
 
         for (int i = 1; i < args.Length; i++)
         {
@@ -53,6 +54,9 @@ public static async Task<int> Main(string[] args)
                 case "-backgroundExec":
                     backgroundExec = true;
                     break;
+                case "-untilFailed":
+                    untilFailed = true;
+                    break;
                 default:
                     throw new ArgumentException($"Invalid argument '{option}'.");
             }
@@ -72,10 +76,21 @@ public static async Task<int> Main(string[] args)
         {
             await Task.Yield();
         }
-        if (backgroundExec)
+
+        var res = 0;
+        do
         {
-            return await Task.Run(() => runner.Run());
+            if (backgroundExec)
+            {
+                res = await Task.Run(() => runner.Run());
+            }
+            else
+            {
+                res = await runner.Run();
+            }
         }
-        return await runner.Run();
+        while(res == 0 && untilFailed);
+
+        return res;
     }
 }

src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSWebWorker.cs

@@ -194,6 +194,7 @@ private void Dispose(bool disposing)
                 {
                     _cancellationRegistration?.Dispose();
                     _cancellationRegistration = null;
+                    _thread?.Join(50);
                 }
 
                 if (_jsSynchronizationContext != null)

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System.Runtime.InteropServices.JavaScript.Tests.csproj

@@ -18,14 +18,13 @@
   <!-- Make debugging easier -->
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <WasmNativeStrip>false</WasmNativeStrip>
-    <WasmXHarnessMonoArgs>$(WasmXHarnessMonoArgs) --setenv=XHARNESS_LOG_TEST_START=true</WasmXHarnessMonoArgs>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Runtime\InteropServices\JavaScript\JavaScriptTestHelper.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\JSImportExportTest.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\SecondRuntimeTest.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\HttpRequestMessageTest.cs" />
-    <Compile Include="System\Runtime\InteropServices\JavaScript\TimerTests.cs" />
+    <Compile Include="System\Runtime\InteropServices\JavaScript\TimerTests.cs" Condition="'$(FeatureWasmThreads)' != 'true'"/>
     <Compile Include="System\Runtime\InteropServices\JavaScript\Utils.cs" />
     <None Include="System\Runtime\InteropServices\JavaScript\JavaScriptTestHelper.mjs" />
     <None Include="$(CompilerGeneratedFilesOutputPath)\..\browser-wasm\generated\Microsoft.Interop.JavaScript.JSImportGenerator\Microsoft.Interop.JavaScript.JSImportGenerator\JSImports.g.cs" />

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/SecondRuntimeTest.cs

@@ -14,10 +14,11 @@ public partial class SecondRuntimeTest
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowserDomSupportedOrNodeJS))]
         public static async Task RunSecondRuntimeAndTestStaticState()
         {
-            await JSHost.ImportAsync("SecondRuntimeTest", "../SecondRuntimeTest.js");
+            var runId = Guid.NewGuid().ToString();
+            await JSHost.ImportAsync("SecondRuntimeTest", "../SecondRuntimeTest.js?run=" + runId);
 
             Interop.State = 42;
-            var state2 = await Interop.RunSecondRuntimeAndTestStaticState();
+            var state2 = await Interop.RunSecondRuntimeAndTestStaticState(runId);
             Assert.Equal(44, Interop.State);
             Assert.Equal(3, state2);
         }
@@ -31,7 +32,7 @@ public static partial class Interop
 
             [JSImport("runSecondRuntimeAndTestStaticState", "SecondRuntimeTest")]
             [return: JSMarshalAs<JSType.Promise<JSType.Number>>]
-            internal static partial Task<int> RunSecondRuntimeAndTestStaticState();
+            internal static partial Task<int> RunSecondRuntimeAndTestStaticState(string guid);
         }
     }
 }

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/SecondRuntimeTest.js

@@ -1,5 +1,5 @@
-export async function runSecondRuntimeAndTestStaticState() {
-    const { dotnet: dotnet2 } = await import('./_framework/dotnet.js?instance=2');
+export async function runSecondRuntimeAndTestStaticState(guid) {
+    const { dotnet: dotnet2 } = await import('./_framework/dotnet.js?instance=2-' + guid);
     const runtime2 = await dotnet2
         .withStartupMemoryCache(false)
         .withConfig({