diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index 1dca99ef9d58be..299c248ca94ca6 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -24,335 +24,6 @@ parameters:
jobs:
-# Linux arm
-- ${{ if or(containsValue(parameters.platforms, 'Linux_arm'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- archType: arm
- targetRid: linux-arm
- platform: Linux_arm
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-cross-arm-20220907130538-70ed2e8
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/arm'
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux armv6
-- ${{ if containsValue(parameters.platforms, 'Linux_armv6') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- archType: armv6
- targetRid: linux-armv6
- platform: Linux_armv6
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-20.04-cross-armv6-raspbian-10-20211208135931-e6e3ac4
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/armv6'
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux arm64
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- archType: arm64
- targetRid: linux-arm64
- platform: Linux_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- ${{ if eq(parameters.container, '') }}:
- image: ubuntu-18.04-cross-arm64-20220907130538-70ed2e8
- ${{ if ne(parameters.container, '') }}:
- image: ${{ parameters.container }}
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/arm64'
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux musl x64
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_x64'), eq(parameters.platformGroup, 'all')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- osSubgroup: _musl
- archType: x64
- targetRid: linux-musl-x64
- platform: Linux_musl_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: alpine-3.13-WithNode-20210910135845-c401c85
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux musl arm
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm'), eq(parameters.platformGroup, 'all')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- osSubgroup: _musl
- archType: arm
- targetRid: linux-musl-arm
- platform: Linux_musl_arm
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/arm'
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux musl arm64
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm64'), eq(parameters.platformGroup, 'all')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- osSubgroup: _musl
- archType: arm64
- targetRid: linux-musl-arm64
- platform: Linux_musl_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/arm64'
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux Bionic arm64
-
-- ${{ if containsValue(parameters.platforms, 'Linux_bionic_arm64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- osSubgroup: _bionic
- archType: arm64
- targetRid: linux-bionic-arm64
- platform: Linux_bionic_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-android-20220808192756-8fcaabc
- registry: mcr
- jobParameters:
- runtimeFlavor: mono
- # We build on Linux, but the test queue runs Windows, so
- # we need to override the test script generation
- runScriptWindowsCmd: true
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux Bionic x64
-
-- ${{ if containsValue(parameters.platforms, 'Linux_bionic_x64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- osSubgroup: _bionic
- archType: x64
- targetRid: linux-bionic-x64
- platform: Linux_bionic_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-android-20220808192756-8fcaabc
- registry: mcr
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux x64
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_x64'), containsValue(parameters.platforms, 'CoreClrTestBuildHost'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- archType: x64
- targetRid: linux-x64
- platform: Linux_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- ${{ if eq(parameters.container, '') }}:
- image: centos-7-20210714125435-9b5bbc2
- ${{ if ne(parameters.container, '') }}:
- image: ${{ parameters.container }}
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux x86
-
-- ${{ if containsValue(parameters.platforms, 'Linux_x86') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- archType: x86
- targetRid: linux-x86
- platform: Linux_x86
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-cross-x86-linux-20211022152824-f853169
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/x86'
- disableClrTest: true
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux x64 Source Build
-
-- ${{ if containsValue(parameters.platforms, 'SourceBuild_Linux_x64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- archType: x64
- targetRid: linux-x64
- platform: Linux_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: centos-7-source-build-20210714125450-5d87b80
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
- buildingOnSourceBuildImage: true
-
-# Linux s390x
-
-- ${{ if containsValue(parameters.platforms, 'Linux_s390x') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- archType: s390x
- targetRid: linux-s390x
- platform: Linux_s390x
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-cross-s390x-20201102145728-d6e0352
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/s390x'
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux PPC64le
-
-- ${{ if containsValue(parameters.platforms, 'Linux_ppc64le') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Linux
- archType: ppc64le
- targetRid: linux-ppc64le
- platform: Linux_ppc64le
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-cross-ppc64le-20220531132048-b9de666
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/ppc64le'
- ${{ insert }}: ${{ parameters.jobParameters }}
-
# WebAssembly
- ${{ if containsValue(parameters.platforms, 'Browser_wasm') }}:
@@ -418,465 +89,3 @@ jobs:
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
${{ insert }}: ${{ parameters.jobParameters }}
-
-# FreeBSD
-- ${{ if containsValue(parameters.platforms, 'FreeBSD_x64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: FreeBSD
- archType: x64
- targetRid: freebsd-x64
- platform: FreeBSD_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-cross-freebsd-12-20210917001307-f13d79e
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/x64'
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Android x64
-
-- ${{ if containsValue(parameters.platforms, 'Android_x64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Android
- archType: x64
- targetRid: android-x64
- platform: Android_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-android-20220808192756-8fcaabc
- registry: mcr
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Android x86
-
-- ${{ if containsValue(parameters.platforms, 'Android_x86') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Android
- archType: x86
- targetRid: android-x86
- platform: Android_x86
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-android-20220808192756-8fcaabc
- registry: mcr
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Android arm
-
-- ${{ if containsValue(parameters.platforms, 'Android_arm') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Android
- archType: arm
- targetRid: android-arm
- platform: Android_arm
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-android-20220808192756-8fcaabc
- registry: mcr
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Android arm64
-
-- ${{ if containsValue(parameters.platforms, 'Android_arm64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Android
- archType: arm64
- targetRid: android-arm64
- platform: Android_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-android-20220808192756-8fcaabc
- registry: mcr
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Mac Catalyst x64
-
-- ${{ if containsValue(parameters.platforms, 'MacCatalyst_x64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: MacCatalyst
- archType: x64
- targetRid: maccatalyst-x64
- platform: MacCatalyst_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Mac Catalyst arm64
-
-- ${{ if containsValue(parameters.platforms, 'MacCatalyst_arm64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: MacCatalyst
- archType: arm64
- targetRid: maccatalyst-arm64
- platform: MacCatalyst_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# tvOS arm64
-
-- ${{ if containsValue(parameters.platforms, 'tvOS_arm64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: tvOS
- archType: arm64
- targetRid: tvos-arm64
- platform: tvOS_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# tvOS Simulator x64
-
-- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_x64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: tvOSSimulator
- archType: x64
- targetRid: tvossimulator-x64
- platform: tvOSSimulator_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# tvOS Simulator arm64
-
-- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_arm64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: tvOSSimulator
- archType: arm64
- targetRid: tvossimulator-arm64
- platform: tvOSSimulator_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS arm
-
-- ${{ if containsValue(parameters.platforms, 'iOS_arm') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: iOS
- archType: arm
- targetRid: ios-arm
- platform: iOS_arm
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS arm64
-
-- ${{ if containsValue(parameters.platforms, 'iOS_arm64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: iOS
- archType: arm64
- targetRid: ios-arm64
- platform: iOS_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS Simulator x64
-
-- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: iOSSimulator
- archType: x64
- targetRid: iossimulator-x64
- platform: iOSSimulator_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS Simulator x86
-
-- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x86') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: iOSSimulator
- archType: x86
- targetRid: iossimulator-x86
- platform: iOSsimulator_x86
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- managedTestBuildOsGroup: OSX
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS Simulator arm64
-
-- ${{ if containsValue(parameters.platforms, 'iOSSimulator_arm64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: iOSSimulator
- archType: arm64
- targetRid: iossimulator-arm64
- platform: iOSSimulator_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: mono
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# macOS arm64
-
-- ${{ if containsValue(parameters.platforms, 'OSX_arm64') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: OSX
- archType: arm64
- targetRid: osx-arm64
- platform: OSX_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# macOS x64
-
-- ${{ if or(containsValue(parameters.platforms, 'OSX_x64'), eq(parameters.platformGroup, 'all')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: OSX
- archType: x64
- targetRid: osx-x64
- platform: OSX_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Tizen armel
-
-- ${{ if containsValue(parameters.platforms, 'Tizen_armel') }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: Tizen
- archType: armel
- targetRid: tizen-armel
- platform: Tizen_armel
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- container:
- image: ubuntu-18.04-cross-armel-tizen-20210719212651-8b02f56
- registry: mcr
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- crossBuild: true
- crossrootfsDir: '/crossrootfs/armel'
- disableClrTest: true
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Windows x64
-
-- ${{ if or(containsValue(parameters.platforms, 'windows_x64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: windows
- archType: x64
- targetRid: win-x64
- platform: windows_x64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Windows x86
-
-- ${{ if or(containsValue(parameters.platforms, 'windows_x86'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: windows
- archType: x86
- targetRid: win-x86
- platform: windows_x86
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Windows arm
-- ${{ if or(containsValue(parameters.platforms, 'windows_arm'), eq(parameters.platformGroup, 'all')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: windows
- archType: arm
- targetRid: win-arm
- platform: windows_arm
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Windows arm64
-
-- ${{ if or(containsValue(parameters.platforms, 'windows_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
- - template: xplat-setup.yml
- parameters:
- jobTemplate: ${{ parameters.jobTemplate }}
- helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
- variables: ${{ parameters.variables }}
- osGroup: windows
- archType: arm64
- targetRid: win-arm64
- platform: windows_arm64
- shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- jobParameters:
- runtimeFlavor: ${{ parameters.runtimeFlavor }}
- stagedBuild: ${{ parameters.stagedBuild }}
- buildConfig: ${{ parameters.buildConfig }}
- helixQueueGroup: ${{ parameters.helixQueueGroup }}
- ${{ insert }}: ${{ parameters.jobParameters }}
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 09b192f74b1efc..16c3d39ee92940 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -373,60 +373,60 @@ jobs:
#
# WebAssembly legs
#
-- template: /eng/pipelines/common/templates/wasm-library-tests.yml
- parameters:
- platforms:
- - Browser_wasm
- buildAndRunWasi: true
- alwaysRun: ${{ variables.isRollingBuild }}
- scenarios:
- - normal
- - WasmTestOnBrowser
-
-- template: /eng/pipelines/common/templates/wasm-library-tests.yml
- parameters:
- platforms:
- - Browser_wasm_win
- alwaysRun: ${{ variables.isRollingBuild }}
- scenarios:
- - WasmTestOnBrowser
-
-# EAT Library tests - only run on linux
-- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
- parameters:
- platforms:
- - Browser_wasm
- nameSuffix: _EAT
- runAOT: false
- shouldRunSmokeOnly: false
- alwaysRun: ${{ variables.isRollingBuild }}
-
-# AOT Library tests
-- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
- parameters:
- platforms:
- - Browser_wasm
- nameSuffix: _AOT
- runAOT: true
- shouldRunSmokeOnly: true
- alwaysRun: ${{ variables.isRollingBuild }}
-
-- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
- parameters:
- platforms:
- - Browser_wasm_win
- nameSuffix: _AOT
- runAOT: true
- shouldRunSmokeOnly: true
- alwaysRun: ${{ variables.isRollingBuild }}
-
-# Wasm.Build.Tests
-- template: /eng/pipelines/common/templates/wasm-build-tests.yml
- parameters:
- platforms:
- - Browser_wasm
- - Browser_wasm_win
- alwaysRun: ${{ variables.isRollingBuild }}
+#- template: /eng/pipelines/common/templates/wasm-library-tests.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm
+ #buildAndRunWasi: true
+ #alwaysRun: ${{ variables.isRollingBuild }}
+ #scenarios:
+ #- normal
+ #- WasmTestOnBrowser
+
+#- template: /eng/pipelines/common/templates/wasm-library-tests.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm_win
+ #alwaysRun: ${{ variables.isRollingBuild }}
+ #scenarios:
+ #- WasmTestOnBrowser
+
+## EAT Library tests - only run on linux
+#- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm
+ #nameSuffix: _EAT
+ #runAOT: false
+ #shouldRunSmokeOnly: false
+ #alwaysRun: ${{ variables.isRollingBuild }}
+
+## AOT Library tests
+#- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm
+ #nameSuffix: _AOT
+ #runAOT: true
+ #shouldRunSmokeOnly: true
+ #alwaysRun: ${{ variables.isRollingBuild }}
+
+#- template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm_win
+ #nameSuffix: _AOT
+ #runAOT: true
+ #shouldRunSmokeOnly: true
+ #alwaysRun: ${{ variables.isRollingBuild }}
+
+## Wasm.Build.Tests
+#- template: /eng/pipelines/common/templates/wasm-build-tests.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm
+ #- Browser_wasm_win
+ #alwaysRun: ${{ variables.isRollingBuild }}
# Wasm Debugger tests
- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml
@@ -437,28 +437,28 @@ jobs:
alwaysRun: ${{ variables.isRollingBuild }}
# Wasm runtime tests
-- template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
- parameters:
- platforms:
- - Browser_wasm
- alwaysRun: ${{ variables.isRollingBuild }}
+#- template: /eng/pipelines/common/templates/wasm-runtime-tests.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm
+ #alwaysRun: ${{ variables.isRollingBuild }}
# BUILD ONLY - Wasm Threading Legs
-- template: /eng/pipelines/common/templates/wasm-build-only.yml
- parameters:
- platforms:
- - Browser_wasm
- nameSuffix: _Threading
- extraBuildArgs: /p:WasmEnableThreads=true
- alwaysRun: ${{ variables.isRollingBuild }}
-
-- template: /eng/pipelines/common/templates/wasm-build-only.yml
- parameters:
- platforms:
- - Browser_wasm
- nameSuffix: _Threading_PerfTracing
- extraBuildArgs: /p:WasmEnablePerfTracing=true
- alwaysRun: ${{ variables.isRollingBuild }}
+#- template: /eng/pipelines/common/templates/wasm-build-only.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm
+ #nameSuffix: _Threading
+ #extraBuildArgs: /p:WasmEnableThreads=true
+ #alwaysRun: ${{ variables.isRollingBuild }}
+
+#- template: /eng/pipelines/common/templates/wasm-build-only.yml
+ #parameters:
+ #platforms:
+ #- Browser_wasm
+ #nameSuffix: _Threading_PerfTracing
+ #extraBuildArgs: /p:WasmEnablePerfTracing=true
+ #alwaysRun: ${{ variables.isRollingBuild }}
#
# iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets
index 0199035708a630..cdbe7e31ef817c 100644
--- a/src/libraries/sendtohelix-wasm.targets
+++ b/src/libraries/sendtohelix-wasm.targets
@@ -286,8 +286,10 @@
+ set TEST_ARGS=--filter "FullyQualifiedName=DebuggerTests.AssignmentTests.InspectVariableBeforeAndAfterAssignment"
+ export TEST_ARGS="--filter Category!=failing&FullyQualifiedName=DebuggerTests.AssignmentTests.InspectVariableBeforeAndAfterAssignment"
$(_WasmDebuggerTestsPayloadArchive)
- $(HelixCommand)
+ $(HelixCommand) -method=
$(_workItemTimeout)
diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/AssignmentTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/AssignmentTests.cs
index ea2fc12f67e084..003cd1fb0d8c27 100644
--- a/src/mono/wasm/debugger/DebuggerTestSuite/AssignmentTests.cs
+++ b/src/mono/wasm/debugger/DebuggerTestSuite/AssignmentTests.cs
@@ -25,7 +25,7 @@ public AssignmentTests(ITestOutputHelper testOutput)
{ "MONO_TYPE_STRING", TString(default), TString("hello"), "DebuggerTests.StepInTest.TestedMethod"},
// [ActiveIssue("https://github.com/dotnet/runtime/issues/64188")]
- // { "MONO_TYPE_ENUM", TEnum("DebuggerTests.RGB", "Red"), TEnum("DebuggerTests.RGB", "Blue"), "DebuggerTests.StepInTest.TestedMethod"},
+ { "MONO_TYPE_ENUM", TEnum("DebuggerTests.RGB", "Red"), TEnum("DebuggerTests.RGB", "Blue"), "DebuggerTests.StepInTest.TestedMethod"},
{ "MONO_TYPE_ARRAY", TObject("byte[]", is_null: true), TArray("byte[]", "byte[2]"), "DebuggerTests.StepInTest.TestedMethod"},
{ "MONO_TYPE_VALUETYPE", TValueType("DebuggerTests.Point"), TValueType("DebuggerTests.Point"), "DebuggerTests.StepInTest.TestedMethod"},
@@ -33,7 +33,7 @@ public AssignmentTests(ITestOutputHelper testOutput)
{ "MONO_TYPE_GENERICINST", TObject("System.Func", is_null: true), TDelegate("System.Func", "int Prepare ()"), "DebuggerTests.StepInTest>.TestedMethod"},
// Disabled due to https://github.com/dotnet/runtime/issues/65881
- //{ "MONO_TYPE_FNPTR", TPointer("*()", is_null: true), TPointer("*()") },
+ { "MONO_TYPE_FNPTR", TPointer("*()", is_null: true), TPointer("*()"), "xy" },
{ "MONO_TYPE_PTR", TPointer("int*", is_null: true), TPointer("int*"), "DebuggerTests.MONO_TYPE_PTR.TestedMethod"},
{ "MONO_TYPE_I1", TNumber(0), TNumber(-1), "DebuggerTests.StepInTest.TestedMethod"},