Move default build images to macos 15 (and xcode 16) (dotnet#120589)

agocke · ericstj · matouskozak · agocke · commit 1905046c3ce0 · 2025-12-09T11:48:29.000-08:00
Co-authored-by: Eric StJohn <ericstj@microsoft.com> Co-authored-by: Matous Kozak <matouskozak@seznam.cz> (cherry picked from commit eaafd7c)
diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
@@ -160,6 +160,9 @@ jobs:
         container: ${{ parameters.container }}
 
     ${{ if eq(parameters.jobParameters.pool, '') }}:
+      # N.B.: We should always be building on the latest available version of our build platform.
+      # Each of these queues should be the latest version or have a tracking issue if the latest version
+      # does not work for some reason.
       pool:
         # Public Linux Build Pool
         ${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), eq(variables['System.TeamProject'], 'public')) }}:
@@ -174,7 +177,7 @@ jobs:
 
         # OSX Public Build Pool (we don't have on-prem OSX BuildPool).
         ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
-          vmImage: 'macos-13'
+          vmImage: 'macos-15'
 
         # Official build OSX pool
         ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -1026,18 +1026,19 @@ extends:
                 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))
+            # Disable tests on ios/tvos - mono - https://github.com/dotnet/runtime/issues/121967
+            # 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/tvOS devices
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
@@ -2430,6 +2430,15 @@
     <ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'llvmfullaot' and '$(TargetArchitecture)' == 'x64'">
     </ItemGroup>
 
+    <ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'minijit' and '$(TargetArchitecture)' == 'x64'">
+        <ExcludeList Include="$(XunitTestBinBase)/Interop/Swift/SwiftRetAbiStress/**">
+            <Issue>https://github.com/dotnet/runtime/issues/121983</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Interop/Swift/SwiftCallbackAbiStress/**">
+            <Issue>https://github.com/dotnet/runtime/issues/121983</Issue>
+        </ExcludeList>
+    </ItemGroup>
+
     <ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'minijit' and '$(TargetArchitecture)' == 'arm64'">
         <ExcludeList Include="$(XunitTestBinBase)/Interop/SuppressGCTransition/SuppressGCTransitionTest/**">
             <Issue>https://github.com/dotnet/runtime/issues/82859</Issue>
