From 8ea7ea014aef9e60ac773462ded214ce21d78c7d Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Thu, 11 Jun 2026 08:25:30 +0200
Subject: [PATCH 1/8] Adjust mobile runtime test and build legs in CI pipelines

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../runtime-extra-platforms-ioslike.yml       |  40 ------
 ...ntime-extra-platforms-ioslikesimulator.yml |  34 -----
 .../runtime-extra-platforms-maccatalyst.yml   |  67 ---------
 eng/pipelines/performance/perf-build.yml      |   4 +-
 eng/pipelines/runtime.yml                     | 135 ------------------
 5 files changed, 2 insertions(+), 278 deletions(-)

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
index 4b4c576ab3ee4a..6f9b02b443ba92 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
@@ -10,46 +10,6 @@ parameters:
 
 jobs:
 
-#
-# tvOS - Full AOT + AggressiveTrimming to reduce size
-# Build the whole product using Mono and run libraries tests
-#
-- 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
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
-    platforms:
-      - tvos_arm64
-    variables:
-      # map dependencies variables to local variables
-      - name: librariesContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      - name: monoContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-      - name: illinkContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'] ]
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono
-      isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
-      # Don't trim tests on rolling builds
-      ${{ if eq(variables['isRollingBuild'], true) }}:
-        buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=false /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=false
-      ${{ else }}:
-        buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=false /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=true
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      postBuildSteps:
-        - template: /eng/pipelines/libraries/helix.yml
-          parameters:
-            creator: dotnet-bot
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-            extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
-
 #
 # tvOS
 # Build the whole product using Mono and run runtime tests
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
index 1f9ca62d63d437..e1bdbf63d98cd8 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
@@ -10,40 +10,6 @@ parameters:
 
 jobs:
 
-#
-# iOSSimulator interp - requires AOT Compilation and Interp flags
-# Build the whole product using Mono and run libraries tests
-#
-- 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
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isiOSLikeSimulatorOnlyBuild: ${{ parameters.isiOSLikeSimulatorOnlyBuild }}
-    platforms:
-    - iossimulator_x64
-    - iossimulator_arm64
-    variables:
-      # map dependencies variables to local variables
-      - name: librariesContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      - name: monoContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono
-      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true $(_runSmokeTestsOnlyArg) /p:RunAOTCompilation=true /p:MonoForceInterpreter=true
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      postBuildSteps:
-        - template: /eng/pipelines/libraries/helix.yml
-          parameters:
-            creator: dotnet-bot
-            interpreter: true
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-
 #
 # iOSSimulator
 # Build the whole product using Mono and run runtime tests
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
index 33275659ab10fe..e0691b611a7239 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
@@ -10,39 +10,6 @@ parameters:
 
 jobs:
 
-#
-# MacCatalyst interp - requires AOT Compilation and Interp flags
-# Build the whole product using Mono and run libraries tests
-#
-- 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
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isMacCatalystOnlyBuild: ${{ parameters.isMacCatalystOnlyBuild }}
-    platforms:
-      - maccatalyst_x64
-      - maccatalyst_arm64
-    variables:
-      # map dependencies variables to local variables
-      - name: librariesContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      - name: monoContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono
-      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      postBuildSteps:
-        - template: /eng/pipelines/libraries/helix.yml
-          parameters:
-            creator: dotnet-bot
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-
 #
 # MacCatalyst interp - requires AOT Compilation and Interp flags
 # Build the whole product using Mono and run runtime tests
@@ -90,40 +57,6 @@ jobs:
             testBuildArgs: /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true
             testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 
-#
-# MacCatalyst interp - requires AOT Compilation and Interp flags
-# Build the whole product using Mono and run libraries tests
-# The test app is built with the App Sandbox entitlement
-#
-- 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
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isMacCatalystOnlyBuild: ${{ parameters.isMacCatalystOnlyBuild }}
-    platforms:
-    - maccatalyst_arm64
-    variables:
-      # map dependencies variables to local variables
-      - name: librariesContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      - name: monoContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono_AppSandbox
-      buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true $(_runSmokeTestsOnlyArg) /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:EnableAppSandbox=true
-      timeoutInMinutes: 180
-      # extra steps, run tests
-      postBuildSteps:
-        - template: /eng/pipelines/libraries/helix.yml
-          parameters:
-            creator: dotnet-bot
-            interpreter: true
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-
 #
 # MacCatalyst
 # Build the whole product using Native AOT and run libraries tests
diff --git a/eng/pipelines/performance/perf-build.yml b/eng/pipelines/performance/perf-build.yml
index a4403ff6afcc59..fa295a829f7284 100644
--- a/eng/pipelines/performance/perf-build.yml
+++ b/eng/pipelines/performance/perf-build.yml
@@ -53,11 +53,11 @@ parameters:
 - name: mono_arm64_android
   displayName: Build Mono Arm64 Android
   type: boolean
-  default: true
+  default: false
 - name: mono_arm64_ios
   displayName: Build Mono Arm64 iOS
   type: boolean
-  default: true
+  default: false
 - name: monoBDN_arm64_android
   displayName: Build Mono Arm64 Android BDN (Not working)
   type: boolean
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 18afad1723cead..24217dc211b50d 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -882,11 +882,8 @@ extends:
           jobTemplate: /eng/pipelines/common/global-build-job.yml
           buildConfig: release
           platforms:
-          - android_x64
           - browser_wasm
           - wasi_wasm
-          - ios_arm64 # tvos and ios use the same offsets so we only need to build once
-          - maccatalyst_x64
           variables:
             - name: _osParameter
               value: -os linux
@@ -924,7 +921,6 @@ extends:
           buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
           runtimeFlavor: mono
           platforms:
-          - tvossimulator_arm64
           - linux_x64
           - linux_arm
           - linux_arm64
@@ -1080,48 +1076,6 @@ extends:
           publishArtifactsForWorkload: false
           publishWBT: false
 
-      #
-      # Android devices
-      # Build the whole product using Mono and run libraries tests
-      #
-      - 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:
-          - android_arm
-          - android_arm64
-          variables:
-            # map dependencies variables to local variables
-            - name: librariesContainsChange
-              value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-            - name: monoContainsChange
-              value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-          jobParameters:
-            testGroup: innerloop
-            nameSuffix: AllSubsets_Mono_Smoke
-            buildArgs: -s mono+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:RunSmokeTestsOnly=true /p:EnableAdditionalTimezoneChecks=true
-            timeoutInMinutes: 120
-            condition: >-
-              or(
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
-            # extra steps, run tests
-            postBuildSteps:
-              - template: /eng/pipelines/libraries/helix.yml
-                parameters:
-                  creator: dotnet-bot
-                  testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-                  condition: >-
-                    or(
-                    eq(variables['librariesContainsChange'], true),
-                    eq(variables['monoContainsChange'], true),
-                    eq(variables['isRollingBuild'], true))
-
       #
       # Android arm/arm64 devices and x64 emulators
       # Build the whole product using CoreCLR and run functional tests
@@ -1165,54 +1119,6 @@ extends:
                     eq(variables['coreclrContainsChange'], true),
                     eq(variables['isRollingBuild'], true))
 
-      #
-      # iOS simulators - Full AOT + AggressiveTrimming to reduce size
-      # Build the whole product using Mono and run libraries tests
-      # Temporarily switched from ios_arm64 (devices) to iossimulator_arm64 due to
-      # device queue infrastructure failure: https://github.com/dotnet/runtime/issues/125135
-      #
-      - 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:
-            - iossimulator_arm64
-          variables:
-            # map dependencies variables to local variables
-            - name: librariesContainsChange
-              value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-            - name: monoContainsChange
-              value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-            - name: illinkContainsChange
-              value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'] ]
-          jobParameters:
-            testGroup: innerloop
-            nameSuffix: AllSubsets_Mono_Smoke
-            buildArgs: -s mono+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:RunSmokeTestsOnly=true /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=false /p:EnableAggressiveTrimming=true
-            timeoutInMinutes: 120
-            condition: >-
-              or(
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
-            # extra steps, run tests
-            postBuildSteps:
-              - template: /eng/pipelines/libraries/helix.yml
-                parameters:
-                  creator: dotnet-bot
-                  testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-                  extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
-                  condition: >-
-                    or(
-                    eq(variables['librariesContainsChange'], true),
-                    eq(variables['monoContainsChange'], true),
-                    eq(variables['illinkContainsChange'], true),
-                    eq(variables['isRollingBuild'], true))
-
       #
       # iOS simulators
       # Build the whole product using Native AOT and run libraries tests
@@ -1305,47 +1211,6 @@ extends:
                     eq(variables['illinkContainsChange'], true),
                     eq(variables['isRollingBuild'], true))
 
-      #
-      # MacCatalyst interp - requires AOT Compilation and Interp flags
-      # Build the whole product using Mono and run libraries tests
-      #
-      - 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:
-          - maccatalyst_arm64
-          variables:
-            # map dependencies variables to local variables
-            - name: librariesContainsChange
-              value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-            - name: monoContainsChange
-              value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-          jobParameters:
-            testGroup: innerloop
-            nameSuffix: AllSubsets_Mono_Smoke
-            buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunSmokeTestsOnly=true /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true
-            timeoutInMinutes: 180
-            condition: >-
-              or(
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
-                eq(variables['isRollingBuild'], true))
-            # extra steps, run tests
-            postBuildSteps:
-              - template: /eng/pipelines/libraries/helix.yml
-                parameters:
-                  creator: dotnet-bot
-                  testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-                  condition: >-
-                    or(
-                      eq(variables['librariesContainsChange'], true),
-                      eq(variables['monoContainsChange'], true),
-                      eq(variables['isRollingBuild'], true))
-
       #
       # MacCatalyst
       # Build the whole product using Native AOT and run libraries tests

From 4709e8663d90aca228df135d03f1417f61f542ed Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Wed, 10 Jun 2026 15:15:12 +0200
Subject: [PATCH 2/8] Update .NET 11 SDK to preview 6 (build 20260610.6)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 8d47900ffba1b7..3a3753fb4ceace 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "11.0.100-preview.5.26227.104",
+    "version": "11.0.100-preview.6.26310.106",
     "allowPrerelease": true,
     "rollForward": "major",
     "paths": [
@@ -10,7 +10,7 @@
     "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.sh (Unix) or eng\\common\\dotnet.cmd (Windows) to install it."
   },
   "tools": {
-    "dotnet": "11.0.100-preview.5.26227.104"
+    "dotnet": "11.0.100-preview.6.26310.106"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26302.118",

From c96edac94131a37f7c47ee1c4b1f37d6d963e373 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Wed, 10 Jun 2026 16:47:20 +0200
Subject: [PATCH 3/8] Use validation package feed for SDK packages

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 NuGet.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NuGet.config b/NuGet.config
index 8d2d351914d014..123dc38845c1d2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,6 +7,7 @@
   </fallbackPackageFolders>
   <packageSources>
     <clear />
+    <add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
     <!--
       'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
       one as a template. The following line is a marker to insert the test restore sources.

From f82ca2996ff99cf60a17430f2d42194e5a9adec3 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@users.noreply.github.com>
Date: Fri, 12 Jun 2026 10:07:10 +0200
Subject: [PATCH 4/8] [mobile] Remove remaining Mono mobile test legs and perf
 build types

Remove the Mono mobile runtime-test legs (tvos, iossimulator, maccatalyst)
and the Mono mobile libraries-test legs (android devices and emulator) from
the extra-platforms pipelines, and remove the Mono mobile build types from
the perf build instead of leaving them as disabled parameters. CoreCLR,
NativeAOT, desktop Mono and wasm Mono legs are unchanged.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../runtime-extra-platforms-android.yml       |  32 -----
 ...untime-extra-platforms-androidemulator.yml | 110 ------------------
 .../runtime-extra-platforms-ioslike.yml       |  43 -------
 ...ntime-extra-platforms-ioslikesimulator.yml |  43 -------
 .../runtime-extra-platforms-maccatalyst.yml   |  47 --------
 eng/pipelines/performance/perf-build.yml      |  20 ----
 6 files changed, 295 deletions(-)

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml
index de253ff460f7a0..ee5f3ff5e4d718 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml
@@ -52,38 +52,6 @@ jobs:
 #         extraVariablesTemplates:
 #           - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
 
-#
-# Android devices
-# Build the whole product using Mono and run libraries tests
-#
-- 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:
-    - android_arm
-    - android_arm64
-    variables:
-      # map dependencies variables to local variables
-      - name: librariesContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      - name: monoContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono
-      isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
-      buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true $(_runSmokeTestsOnlyArg) /p:EnableAdditionalTimezoneChecks=true
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      postBuildSteps:
-        - template: /eng/pipelines/libraries/helix.yml
-          parameters:
-            creator: dotnet-bot
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-
 #
 # Android devices
 # Build the whole product using CoreCLR and run libraries tests
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
index e93a51a4cea1ed..13631864cac316 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
@@ -10,84 +10,6 @@ parameters:
 
 jobs:
 
-# Build the whole product using Mono for Android and run runtime tests with Android emulator
-#
-- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    jobTemplate: /eng/pipelines/common/global-build-job.yml
-    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
-    buildConfig: Release
-    runtimeFlavor: mono
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isAndroidEmulatorOnlyBuild: ${{ parameters.isAndroidEmulatorOnlyBuild }}
-    platforms:
-    - android_x64
-    variables:
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: pr/dotnet/runtime/$(Build.SourceBranch)
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: ci/dotnet/runtime/$(Build.SourceBranch)
-      - name: timeoutPerTestInMinutes
-        value: 60
-      - name: timeoutPerTestCollectionInMinutes
-        value: 180
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono_RuntimeTests
-      runtimeVariant: minijit
-      buildArgs: -s mono+libs -c $(_BuildConfig)
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      postBuildSteps:
-        - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
-          parameters:
-            creator: dotnet-bot
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-      extraVariablesTemplates:
-        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
-
-#
-# Build the whole product using Mono for Android and run runtime tests with interpreter
-#
-- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    jobTemplate: /eng/pipelines/common/global-build-job.yml
-    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
-    buildConfig: Release
-    runtimeFlavor: mono
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isAndroidEmulatorOnlyBuild: ${{ parameters.isAndroidEmulatorOnlyBuild }}
-    platforms:
-      - android_x64
-    variables:
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: pr/dotnet/runtime/$(Build.SourceBranch)
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: ci/dotnet/runtime/$(Build.SourceBranch)
-      - name: timeoutPerTestInMinutes
-        value: 60
-      - name: timeoutPerTestCollectionInMinutes
-        value: 180
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono_RuntimeTests_Interp
-      runtimeVariant: monointerpreter
-      buildArgs: -s mono+libs -c $(_BuildConfig)
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      postBuildSteps:
-        - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
-          parameters:
-            creator: dotnet-bot
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-      extraVariablesTemplates:
-        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
-
-
 #
 # Build the whole product using NativeAOT and run runtime tests
 #
@@ -127,38 +49,6 @@ jobs:
       extraVariablesTemplates:
         - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
 
-#
-# Android emulators
-# Build the whole product using Mono and run libraries tests
-#
-- 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:
-    - android_x86
-    - android_x64
-    variables:
-      # map dependencies variables to local variables
-      - name: librariesContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      - name: monoContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono
-      isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
-      buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true $(_runSmokeTestsOnlyArg)
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      postBuildSteps:
-        - template: /eng/pipelines/libraries/helix.yml
-          parameters:
-            creator: dotnet-bot
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-
 #
 # Android emulators
 # Build the whole product using CoreCLR and run libraries tests
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
index 6f9b02b443ba92..ac64ccaaeb9476 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
@@ -10,49 +10,6 @@ parameters:
 
 jobs:
 
-#
-# tvOS
-# Build the whole product using Mono and run runtime tests
-#
-- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    jobTemplate: /eng/pipelines/common/global-build-job.yml
-    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
-    buildConfig: Release
-    runtimeFlavor: mono
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
-    platforms:
-      - tvos_arm64
-    variables:
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: pr/dotnet/runtime/$(Build.SourceBranch)
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: ci/dotnet/runtime/$(Build.SourceBranch)
-      - name: timeoutPerTestInMinutes
-        value: 60
-      - name: timeoutPerTestCollectionInMinutes
-        value: 180
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono_RuntimeTests
-      buildArgs: -s mono+libs -c $(_BuildConfig)
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      extraVariablesTemplates:
-        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
-          parameters:
-            testGroup: innerloop
-      postBuildSteps:
-        - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
-          parameters:
-            creator: dotnet-bot
-            testBuildArgs: /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildTestsOnHelix=true
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-            extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
-
 #
 # tvOS
 # Build the whole product using Native AOT and run libraries tests
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
index e1bdbf63d98cd8..1c302d28f888f4 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
@@ -10,49 +10,6 @@ parameters:
 
 jobs:
 
-#
-# iOSSimulator
-# Build the whole product using Mono and run runtime tests
-#
-- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    jobTemplate: /eng/pipelines/common/global-build-job.yml
-    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
-    buildConfig: Release
-    runtimeFlavor: mono
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
-    platforms:
-      - iossimulator_arm64
-    variables:
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: pr/dotnet/runtime/$(Build.SourceBranch)
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: ci/dotnet/runtime/$(Build.SourceBranch)
-      - name: timeoutPerTestInMinutes
-        value: 60
-      - name: timeoutPerTestCollectionInMinutes
-        value: 180
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono_RuntimeTests
-      buildArgs: -s mono+libs -c $(_BuildConfig)
-      timeoutInMinutes: 240
-      # extra steps, run tests
-      extraVariablesTemplates:
-        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
-          parameters:
-            testGroup: innerloop
-      postBuildSteps:
-        - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
-          parameters:
-            creator: dotnet-bot
-            testBuildArgs: /p:DevTeamProvisioning=- /p:RunAOTCompilation=true /p:MonoForceInterpreter=true /p:BuildTestsOnHelix=true
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-            extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
-
 #
 # iOSSimulator
 # Build the whole product using Native AOT and run libraries tests
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
index e0691b611a7239..4fe7dbfbba84a6 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
@@ -10,53 +10,6 @@ parameters:
 
 jobs:
 
-#
-# MacCatalyst interp - requires AOT Compilation and Interp flags
-# Build the whole product using Mono and run runtime tests
-#
-- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    jobTemplate: /eng/pipelines/common/global-build-job.yml
-    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
-    buildConfig: Release
-    runtimeFlavor: mono
-    isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
-    platforms:
-      - maccatalyst_arm64
-    variables:
-      # map dependencies variables to local variables
-      - name: librariesContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-      - name: monoContainsChange
-        value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: pr/dotnet/runtime/$(Build.SourceBranch)
-      - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-        - name: _HelixSource
-          value: ci/dotnet/runtime/$(Build.SourceBranch)
-      - name: timeoutPerTestInMinutes
-        value: 60
-      - name: timeoutPerTestCollectionInMinutes
-        value: 180
-    jobParameters:
-      testGroup: innerloop
-      nameSuffix: AllSubsets_Mono_RuntimeTests
-      buildArgs: -s mono+libs -c $(_BuildConfig)
-      timeoutInMinutes: 360
-      # extra steps, run tests
-      extraVariablesTemplates:
-        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
-          parameters:
-            testGroup: innerloop
-      postBuildSteps:
-        - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
-          parameters:
-            creator: dotnet-bot
-            testBuildArgs: /p:DevTeamProvisioning=adhoc /p:RunAOTCompilation=true /p:MonoForceInterpreter=true
-            testRunNamePrefixSuffix: Mono_$(_BuildConfig)
-
 #
 # MacCatalyst
 # Build the whole product using Native AOT and run libraries tests
diff --git a/eng/pipelines/performance/perf-build.yml b/eng/pipelines/performance/perf-build.yml
index fa295a829f7284..4f88ba64a95969 100644
--- a/eng/pipelines/performance/perf-build.yml
+++ b/eng/pipelines/performance/perf-build.yml
@@ -50,14 +50,6 @@ parameters:
   displayName: Build Mono Arm64 Linux
   type: boolean
   default: true
-- name: mono_arm64_android
-  displayName: Build Mono Arm64 Android
-  type: boolean
-  default: false
-- name: mono_arm64_ios
-  displayName: Build Mono Arm64 iOS
-  type: boolean
-  default: false
 - name: monoBDN_arm64_android
   displayName: Build Mono Arm64 Android BDN (Not working)
   type: boolean
@@ -136,10 +128,6 @@ extends:
                 - mono_x64_linux
               - ${{ if eq(parameters.mono_arm64_linux, true) }}:
                 - mono_arm64_linux
-              - ${{ if eq(parameters.mono_arm64_android, true) }}:
-                - mono_arm64_android
-              - ${{ if eq(parameters.mono_arm64_ios, true) }}:
-                - mono_arm64_ios
               - ${{ if eq(parameters.monoBDN_arm64_android, true) }}:
                 - monoBDN_arm64_android
               - ${{ if eq(parameters.nativeAot_arm64_ios, true) }}:
@@ -182,10 +170,6 @@ extends:
               - mono_x64_linux
             - ${{ if eq(parameters.mono_arm64_linux, true) }}:
               - mono_arm64_linux
-            - ${{ if eq(parameters.mono_arm64_android, true) }}:
-              - mono_arm64_android
-            - ${{ if eq(parameters.mono_arm64_ios, true) }}:
-              - mono_arm64_ios
             - ${{ if eq(parameters.monoBDN_arm64_android, true) }}:
               - monoBDN_arm64_android
             - ${{ if eq(parameters.nativeAot_arm64_ios, true) }}:
@@ -234,10 +218,6 @@ extends:
                 - mono_x64_linux
               - ${{ if eq(parameters.mono_arm64_linux, true) }}:
                 - mono_arm64_linux
-              - ${{ if eq(parameters.mono_arm64_android, true) }}:
-                - mono_arm64_android
-              - ${{ if eq(parameters.mono_arm64_ios, true) }}:
-                - mono_arm64_ios
               - ${{ if eq(parameters.monoBDN_arm64_android, true) }}:
                 - monoBDN_arm64_android
               - ${{ if eq(parameters.nativeAot_arm64_ios, true) }}:

From 9a4bd7147811771a953616ebdc4bb66a85efedaf Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@users.noreply.github.com>
Date: Fri, 12 Jun 2026 10:26:52 +0200
Subject: [PATCH 5/8] [mobile] Remove Android Mono perf toggles from gapfill
 pipeline

Remove the run_android_mono_jit and run_android_mono_aot parameters, their
include-gate references, and the forwarding overrides, matching the removal
of the Android Mono JIT/AOT job groups in runtime-perf-jobs.yml. Android
CoreCLR and desktop Mono perf toggles are kept.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/pipelines/performance/perf-gapfill.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/eng/pipelines/performance/perf-gapfill.yml b/eng/pipelines/performance/perf-gapfill.yml
index 1359bada08fb51..73ab6b000c984f 100644
--- a/eng/pipelines/performance/perf-gapfill.yml
+++ b/eng/pipelines/performance/perf-gapfill.yml
@@ -42,14 +42,6 @@ parameters:
     type: boolean
     default: true
 
-  - name: run_android_mono_jit
-    type: boolean
-    default: true
-
-  - name: run_android_mono_aot
-    type: boolean
-    default: true
-
   - name: run_android_coreclr_jit
     type: boolean
     default: true
@@ -100,7 +92,7 @@ extends:
 
       # Runtime perf jobs (non-WASM) — included when any non-WASM group is enabled.
       # Per-job-group toggles are forwarded to runtime-perf-jobs.yml as parameter overrides.
-      - ${{ if or(eq(parameters.run_viper_micro, true), eq(parameters.run_viper_micro_nor2r, true), eq(parameters.run_mono_micro, true), eq(parameters.run_mono_interpreter, true), eq(parameters.run_mono_aot, true), eq(parameters.run_android_mono_jit, true), eq(parameters.run_android_mono_aot, true), eq(parameters.run_android_coreclr_jit, true), eq(parameters.run_android_coreclr_r2r, true)) }}:
+      - ${{ if or(eq(parameters.run_viper_micro, true), eq(parameters.run_viper_micro_nor2r, true), eq(parameters.run_mono_micro, true), eq(parameters.run_mono_interpreter, true), eq(parameters.run_mono_aot, true), eq(parameters.run_android_coreclr_jit, true), eq(parameters.run_android_coreclr_r2r, true)) }}:
         - template: /eng/pipelines/runtime-perf-jobs.yml@performance
           parameters:
             runtimeRepoAlias: self
@@ -139,12 +131,6 @@ extends:
                 enabled: false
                 configs: []
             # Android toggles
-            ${{ if eq(parameters.run_android_mono_jit, false) }}:
-              androidMonoJit:
-                enabled: false
-            ${{ if eq(parameters.run_android_mono_aot, false) }}:
-              androidMonoAot:
-                enabled: false
             ${{ if eq(parameters.run_android_coreclr_jit, false) }}:
               androidCoreclrJit:
                 enabled: false

From a0bd0de3155f29ec0af0987f36d6c03a584527b9 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@users.noreply.github.com>
Date: Fri, 12 Jun 2026 10:58:10 +0200
Subject: [PATCH 6/8] [mobile] Use correct only-build flag in iOS simulator and
 MacCatalyst templates

The iOS simulator and MacCatalyst CoreCLR jobs referenced isiOSLikeOnlyBuild,
which is not declared in those templates' parameters and is not passed by
runtime-extra-platforms.yml. Use each template's declared flag
(isiOSLikeSimulatorOnlyBuild and isMacCatalystOnlyBuild) so the templates are
self-contained and gated consistently with their sibling jobs.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../runtime-extra-platforms-ioslikesimulator.yml              | 4 ++--
 .../extra-platforms/runtime-extra-platforms-maccatalyst.yml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
index 1c302d28f888f4..65a6b6f68534b3 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
@@ -21,7 +21,7 @@ jobs:
     buildConfig: Release
     runtimeFlavor: coreclr
     isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
+    isiOSLikeSimulatorOnlyBuild: ${{ parameters.isiOSLikeSimulatorOnlyBuild }}
     platforms:
       - iossimulator_x64
       - iossimulator_arm64
@@ -91,7 +91,7 @@ jobs:
     buildConfig: Release
     runtimeFlavor: coreclr
     isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
+    isiOSLikeSimulatorOnlyBuild: ${{ parameters.isiOSLikeSimulatorOnlyBuild }}
     platforms:
       - iossimulator_arm64
     variables:
diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
index 4fe7dbfbba84a6..1355f09813fe22 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
@@ -124,7 +124,7 @@ jobs:
     buildConfig: Release
     runtimeFlavor: coreclr
     isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
+    isMacCatalystOnlyBuild: ${{ parameters.isMacCatalystOnlyBuild }}
     platforms:
       - maccatalyst_arm64
     variables:

From 1edbc197e9674527e7aaea72d785908b366bf3a1 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@users.noreply.github.com>
Date: Mon, 15 Jun 2026 15:40:42 +0200
Subject: [PATCH 7/8] Revert temporary validation pins (SDK version and
 general-testing feed)

Restore global.json and NuGet.config to the official dependency-flow versions
ahead of merge.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 NuGet.config | 1 -
 global.json  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 123dc38845c1d2..8d2d351914d014 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,6 @@
   </fallbackPackageFolders>
   <packageSources>
     <clear />
-    <add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
     <!--
       'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
       one as a template. The following line is a marker to insert the test restore sources.
diff --git a/global.json b/global.json
index 3a3753fb4ceace..8d47900ffba1b7 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "11.0.100-preview.6.26310.106",
+    "version": "11.0.100-preview.5.26227.104",
     "allowPrerelease": true,
     "rollForward": "major",
     "paths": [
@@ -10,7 +10,7 @@
     "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.sh (Unix) or eng\\common\\dotnet.cmd (Windows) to install it."
   },
   "tools": {
-    "dotnet": "11.0.100-preview.6.26310.106"
+    "dotnet": "11.0.100-preview.5.26227.104"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26302.118",

From 60f0c6992f75f83b1591fd442fd10b6e48770011 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@users.noreply.github.com>
Date: Mon, 15 Jun 2026 17:02:56 +0200
Subject: [PATCH 8/8] Remove Android Mono build from perf build jobs

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/pipelines/performance/templates/perf-build-jobs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/pipelines/performance/templates/perf-build-jobs.yml b/eng/pipelines/performance/templates/perf-build-jobs.yml
index c6fa59c85a6343..3a129a306e5647 100644
--- a/eng/pipelines/performance/templates/perf-build-jobs.yml
+++ b/eng/pipelines/performance/templates/perf-build-jobs.yml
@@ -17,7 +17,6 @@ jobs:
     parameters:
       mono_x64: true
       monoAot_x64: true
-      monoAndroid: true
 
   # Disabled due to not successfully building at the moment. https://github.com/dotnet/performance/issues/4729
   - ${{ if false }}: