diff --git a/eng/pipelines/runtime-manual.yml b/eng/pipelines/runtime-manual.yml
index 83f9e891dab573..36aff64ad272d7 100644
--- a/eng/pipelines/runtime-manual.yml
+++ b/eng/pipelines/runtime-manual.yml
@@ -332,47 +332,46 @@ jobs:
eq(variables['isManualOrIsNotPR'], true),
eq(variables['isFullMatrix'], true))
-# Disabled due to https://github.com/dotnet/runtime/issues/61721
-#- template: /eng/pipelines/common/platform-matrix.yml
- #parameters:
- #jobTemplate: /eng/pipelines/common/global-build-job.yml
- #helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
- #buildConfig: release
- #runtimeFlavor: mono
- #platforms:
- #- Browser_wasm_win
- #variables:
- ## map dependencies variables to local variables
- #- name: librariesContainsChange
- #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
- #- name: monoContainsChange
- #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
- #jobParameters:
- #testGroup: innerloop
- #nameSuffix: Windows_wasm_AOT
- #buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
- #timeoutInMinutes: 180
- #condition: >-
- #or(
- #eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
- #eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
- #eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
- #eq(variables['isManualOrIsNotPR'], true),
- #eq(variables['isFullMatrix'], true))
- ## extra steps, run tests
- #extraStepsTemplate: /eng/pipelines/libraries/helix.yml
- #extraStepsParameters:
- #creator: dotnet-bot
- #testRunNamePrefixSuffix: Mono_$(_BuildConfig)
- #extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
- #scenarios:
- #- normal
- #condition: >-
- #or(
- #eq(variables['librariesContainsChange'], true),
- #eq(variables['monoContainsChange'], true),
- #eq(variables['isManualOrIsNotPR'], true),
- #eq(variables['isFullMatrix'], true))
+- template: /eng/pipelines/common/platform-matrix.yml
+ parameters:
+ jobTemplate: /eng/pipelines/common/global-build-job.yml
+ helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+ buildConfig: release
+ runtimeFlavor: mono
+ platforms:
+ - Browser_wasm_win
+ variables:
+ # map dependencies variables to local variables
+ - name: librariesContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+ - name: monoContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
+ jobParameters:
+ testGroup: innerloop
+ nameSuffix: Windows_wasm_AOT
+ buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
+ timeoutInMinutes: 180
+ condition: >-
+ or(
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+ eq(variables['isManualOrIsNotPR'], true),
+ eq(variables['isFullMatrix'], true))
+ # extra steps, run tests
+ extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+ extraStepsParameters:
+ creator: dotnet-bot
+ testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+ extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
+ scenarios:
+ - normal
+ condition: >-
+ or(
+ eq(variables['librariesContainsChange'], true),
+ eq(variables['monoContainsChange'], true),
+ eq(variables['isManualOrIsNotPR'], true),
+ eq(variables['isFullMatrix'], true))
#
# Build for Browser/wasm, with EnableAggressiveTrimming=true
diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml
index a38deea1927a5c..38652409b42e1f 100644
--- a/eng/pipelines/runtime-staging.yml
+++ b/eng/pipelines/runtime-staging.yml
@@ -493,47 +493,44 @@ jobs:
# Build Browser_wasm, on windows, and run tests with AOT
#
# Disabled due to https://github.com/dotnet/runtime/issues/61721
-#- template: /eng/pipelines/common/platform-matrix.yml
- #parameters:
- #jobTemplate: /eng/pipelines/common/global-build-job.yml
- #helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
- #buildConfig: release
- #runtimeFlavor: mono
- #platforms:
- #- Browser_wasm_win
- #variables:
- ## map dependencies variables to local variables
- #- name: librariesContainsChange
- #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
- #- name: monoContainsChange
- #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
- #jobParameters:
- #testGroup: innerloop
- #nameSuffix: Windows_wasm_AOT
- #buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
- #timeoutInMinutes: 180
- #condition: >-
- #or(
- #eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
- #eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
- #eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
- #eq(variables['isManualOrIsNotPR'], true),
- #eq(variables['isFullMatrix'], true))
- ## extra steps, run tests
- #extraStepsTemplate: /eng/pipelines/libraries/helix.yml
- #extraStepsParameters:
- #creator: dotnet-bot
- #testRunNamePrefixSuffix: Mono_$(_BuildConfig)
- #extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
- #scenarios:
- #- normal
- #condition: >-
- #or(
- #eq(variables['librariesContainsChange'], true),
- #eq(variables['monoContainsChange'], true),
- #eq(variables['isManualOrIsNotPR'], true),
- #eq(variables['isFullMatrix'], true))
-
+- template: /eng/pipelines/common/platform-matrix.yml
+ parameters:
+ jobTemplate: /eng/pipelines/common/global-build-job.yml
+ helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+ buildConfig: release
+ runtimeFlavor: mono
+ platforms:
+ - Browser_wasm_win
+ variables:
+ # map dependencies variables to local variables
+ - name: librariesContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
+ - name: monoContainsChange
+ value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
+ jobParameters:
+ testGroup: innerloop
+ nameSuffix: Windows_wasm_AOT
+ buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg)
+ timeoutInMinutes: 180
+ condition: >-
+ or(
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
+ eq(variables['isFullMatrix'], true))
+ # extra steps, run tests
+ extraStepsTemplate: /eng/pipelines/libraries/helix.yml
+ extraStepsParameters:
+ creator: dotnet-bot
+ testRunNamePrefixSuffix: Mono_$(_BuildConfig)
+ extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg)
+ scenarios:
+ - normal
+ condition: >-
+ or(
+ eq(variables['librariesContainsChange'], true),
+ eq(variables['monoContainsChange'], true),
+ eq(variables['isFullMatrix'], true))
#
# Build Browser_wasm, on windows, and run Wasm.Build.Tests
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 1dfa55960628b1..a0e088b9b484a9 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -33,6 +33,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+