Revert WBT MT disabling from dotnet#116747.

Author: ilonatommy

eng/pipelines/common/templates/browser-wasm-build-tests.yml

@@ -41,10 +41,10 @@ jobs:
       jobParameters:
         dependsOn:
           - ${{ if eq(platform, 'browser_wasm') }}:
-            # - build_browser_wasm_linux_Release_MultiThreaded_BuildOnly
+            - build_browser_wasm_linux_Release_MultiThreaded_BuildOnly
             - build_browser_wasm_linux_Release_SingleThreaded_BuildOnly
           - ${{ if eq(platform, 'browser_wasm_win') }}:
-            # - build_browser_wasm_windows_Release_MultiThreaded_BuildOnly
+            - build_browser_wasm_windows_Release_MultiThreaded_BuildOnly
             - build_browser_wasm_windows_Release_SingleThreaded_BuildOnly
         isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
         testGroup: innerloop
@@ -67,22 +67,22 @@ jobs:
               TargetFolder: '$(Build.SourcesDirectory)/artifacts'
               CleanTargetFolder: false
 
-          # # Download for multi-threaded
-          # - task: DownloadBuildArtifacts@0
-          #   displayName: Download built nugets for multi-threaded runtime
-          #   inputs:
-          #     buildType: current
-          #     artifactName: BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly
-          #     downloadType: single
-          #     downloadPath: '$(Build.SourcesDirectory)/artifacts'
+          # Download for multi-threaded
+          - task: DownloadBuildArtifacts@0
+            displayName: Download built nugets for multi-threaded runtime
+            inputs:
+              buildType: current
+              artifactName: BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly
+              downloadType: single
+              downloadPath: '$(Build.SourcesDirectory)/artifacts'
 
-          # - task: CopyFiles@2
-          #   displayName: Copy multithreading runtime pack
-          #   inputs:
-          #     SourceFolder: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly'
-          #     Contents: packages/$(_BuildConfig)/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.*
-          #     TargetFolder: '$(Build.SourcesDirectory)/artifacts'
-          #     CleanTargetFolder: false
+          - task: CopyFiles@2
+            displayName: Copy multithreading runtime pack
+            inputs:
+              SourceFolder: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly'
+              Contents: packages/$(_BuildConfig)/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.*
+              TargetFolder: '$(Build.SourcesDirectory)/artifacts'
+              CleanTargetFolder: false
 
           # Download WBT
           - task: DownloadBuildArtifacts@0
@@ -108,7 +108,7 @@ jobs:
           /p:Configuration=$(_BuildConfig)
           /p:TestUsingWorkloads=true
           /p:InstallWorkloadForTesting=true
-          /p:WasmSkipMissingRuntimePackBuild=false
+          /p:WasmSkipMissingRuntimePackBuild=true
           /p:PreparePackagesForWorkloadInstall=false
           /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar)
         timeoutInMinutes: 180

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

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

@@ -104,13 +104,12 @@ public BuildEnvironment()
             }
 
             IsWorkloadWithMultiThreadingForDefaultFramework = IsMultiThreadingRuntimePackAvailableFor(BuildTestBase.DefaultTargetFramework);
-            // MT is disabled on CI: https://github.com/dotnet/runtime/issues/116492
-            // if (IsWorkload && EnvironmentVariables.IsRunningOnCI && !IsWorkloadWithMultiThreadingForDefaultFramework)
-            // {
-            //     throw new Exception(
-            //                 "Expected the multithreading runtime pack to be available when running on CI." +
-            //                 $" {nameof(IsRunningOnCI)} is true but {nameof(IsWorkloadWithMultiThreadingForDefaultFramework)} is false.");
-            // }
+            if (IsWorkload && EnvironmentVariables.IsRunningOnCI && !IsWorkloadWithMultiThreadingForDefaultFramework)
+            {
+                throw new Exception(
+                            "Expected the multithreading runtime pack to be available when running on CI." +
+                            $" {nameof(IsRunningOnCI)} is true but {nameof(IsWorkloadWithMultiThreadingForDefaultFramework)} is false.");
+            }
 
             UseWebcil = EnvironmentVariables.UseWebcil;