From f8f49e0fd12582bae963a251313784bfbb945b69 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 1 Dec 2025 23:28:35 +0000
Subject: [PATCH 1/3] Initial plan


From 61177718d2a25566aadd4bed6631524a4fc65cf7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 1 Dec 2025 23:53:54 +0000
Subject: [PATCH 2/3] Switch default CI focus to osx-arm64 for CoreCLR PRs

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 eng/pipelines/runtime.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 7184087e80f660..65ab3868fa5762 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -141,7 +141,7 @@ extends:
           platforms:
           - linux_x64
           - linux_musl_x64
-          - osx_x64
+          - osx_arm64
           - windows_x64
           jobParameters:
             nameSuffix: CoreCLR_Libraries
@@ -214,7 +214,7 @@ extends:
           jobTemplate: /eng/pipelines/common/global-build-job.yml
           buildConfig: release
           platforms:
-          - osx_arm64
+          - osx_x64
           jobParameters:
             nameSuffix: CoreCLR_Libraries
             buildArgs: -s clr+libs -c $(_BuildConfig)
@@ -245,7 +245,7 @@ extends:
           buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
           platforms:
           - linux_arm64
-          - osx_x64
+          - osx_arm64
           jobParameters:
             nameSuffix: Libraries_CheckedCoreCLR
             buildArgs: -s clr+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:ArchiveTests=true
@@ -353,7 +353,7 @@ extends:
           jobTemplate: /eng/pipelines/common/global-build-job.yml
           buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
           platforms:
-          - osx_arm64
+          - osx_x64
           jobParameters:
             nameSuffix: Libraries_CheckedCoreCLR
             buildArgs: -s clr+libs -c $(_BuildConfig) -rc Checked
@@ -376,7 +376,8 @@ extends:
                   configOverride: Checked
             condition: >-
               or(
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr_AppleSilicon.containsChange'], true),
+                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
+                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
                 eq(variables['isRollingBuild'], true))
 
       - template: /eng/pipelines/common/platform-matrix.yml
@@ -1335,7 +1336,7 @@ extends:
           buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
           platforms:
             - windows_x86
-            - osx_arm64
+            - osx_x64
           helixQueuesTemplate: /eng/pipelines/installer/helix-queues-setup.yml
           jobParameters:
             nameSuffix: Installer_Build_And_Test
@@ -1366,7 +1367,7 @@ extends:
           buildConfig: release
           platforms:
             - windows_x64
-            - osx_x64
+            - osx_arm64
             - linux_x64
           helixQueuesTemplate: /eng/pipelines/installer/helix-queues-setup.yml
           jobParameters:
@@ -1590,7 +1591,7 @@ extends:
           jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
           buildConfig: checked
           platforms:
-          - osx_x64
+          - osx_arm64
           - linux_x64
           - linux_arm64
           - windows_x64
@@ -1613,7 +1614,7 @@ extends:
           jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
           buildConfig: checked
           platforms:
-          - osx_arm64
+          - osx_x64
           helixQueueGroup: pr
           helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
           jobParameters:
@@ -1624,7 +1625,8 @@ extends:
             unifiedBuildConfigOverride: ${{ variables.debugOnPrReleaseOnRolling }}
             condition: >-
               or(
-                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr_AppleSilicon.containsChange'], true),
+                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
+                eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
                 eq(variables['isRollingBuild'], true))
 
       #
@@ -1660,7 +1662,7 @@ extends:
           buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
           platforms:
           - windows_x64
-          - osx_x64
+          - osx_arm64
           - linux_x64
           - linux_musl_x64
           helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
@@ -1685,7 +1687,7 @@ extends:
       # | linux-arm64      | Debug   | Release |
       # | windows-x86      | Debug   | Release |
       # | linux-musl-x64   | Debug   | Release |
-      # | OSX-x64          | Debug   | Release |
+      # | OSX-arm64        | Debug   | Release |
       # | linux-musl-arm   | Release | Release |
       # | linux-musl-arm64 | Release | Release |
       # | linux-x64        | Release | Release |
@@ -1748,7 +1750,7 @@ extends:
           jobTemplate: /eng/pipelines/libraries/run-test-job.yml
           buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
           platforms:
-          - osx_x64
+          - osx_arm64
           helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
           helixQueueGroup: libraries
           jobParameters:

From fee3e567a4178a03c11a576eb95315c13ba18bd8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 20:21:33 +0000
Subject: [PATCH 3/3] Fix RID casing: OSX-arm64 -> osx-arm64 in comment table

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 eng/pipelines/runtime.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 31622963c6b9a2..d6633c52635653 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -1686,7 +1686,7 @@ extends:
       # | linux-arm64      | Debug   | Release |
       # | windows-x86      | Debug   | Release |
       # | linux-musl-x64   | Debug   | Release |
-      # | OSX-arm64        | Debug   | Release |
+      # | osx-arm64        | Debug   | Release |
       # | linux-musl-arm   | Release | Release |
       # | linux-musl-arm64 | Release | Release |
       # | linux-x64        | Release | Release |