[release/10.0] Move default build images to macos 15 (and xcode 16) (#120589) #122359
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Eric StJohn <[email protected]> Co-authored-by: Matous Kozak <[email protected]> (cherry picked from commit eaafd7c)
Contributor
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the default build infrastructure to use macOS 15 (with Xcode 16) and temporarily disables certain tests that fail on the new platform while those issues are being addressed.
- Updates public macOS build image from
macos-13tomacos-15 - Temporarily disables iOS/tvOS Mono library tests pending issue resolution
- Adds test exclusions for Swift interop stress tests on Mono x64 minijit
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| eng/pipelines/common/xplat-setup.yml | Updates the public macOS build pool image from macos-13 to macos-15, affecting osx, maccatalyst, ios, iossimulator, tvos, and tvossimulator builds. Includes comment noting the principle of building on the latest available platform version. |
| eng/pipelines/runtime.yml | Comments out postBuildSteps for iOS/tvOS Mono device tests with reference to tracking issue #121967, temporarily disabling these test runs until the platform compatibility issues are resolved. |
| src/tests/issues.targets | Adds exclusions for Swift interop stress tests (SwiftRetAbiStress and SwiftCallbackAbiStress) on Mono minijit x64 configuration, linking to issue #121983. |
agocke
changed the title
steveisok
approved these changes
Dec 9, 2025
Member
|
/ba-g Known test errors |
This was referenced Dec 9, 2025
Contributor
|
Started backporting to |
Member
Author
|
/backport to release/9.0-staging |
Contributor
|
Started backporting to |
Member
Author
|
/backport to release/8.0-staging |
Contributor
|
Started backporting to |
Contributor
|
@agocke backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Move default build images to macos 15 (and xcode 16) (#120589)
Using index info to reconstruct a base tree...
M eng/pipelines/common/xplat-setup.yml
M eng/pipelines/runtime.yml
M src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/common/xplat-setup.yml
Auto-merging eng/pipelines/runtime.yml
CONFLICT (content): Merge conflict in eng/pipelines/runtime.yml
Auto-merging src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Move default build images to macos 15 (and xcode 16) (#120589)
Error: The process '/usr/bin/git' failed with exit code 128 |
Contributor
|
@agocke backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Move default build images to macos 15 (and xcode 16) (#120589)
Using index info to reconstruct a base tree...
M eng/pipelines/common/xplat-setup.yml
M eng/pipelines/runtime.yml
M src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/common/xplat-setup.yml
Auto-merging eng/pipelines/runtime.yml
CONFLICT (content): Merge conflict in eng/pipelines/runtime.yml
Auto-merging src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Move default build images to macos 15 (and xcode 16) (#120589)
Error: The process '/usr/bin/git' failed with exit code 128 |
Contributor
|
@agocke backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Move default build images to macos 15 (and xcode 16) (#120589)
Using index info to reconstruct a base tree...
M eng/pipelines/common/xplat-setup.yml
M eng/pipelines/runtime.yml
M src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/common/xplat-setup.yml
Auto-merging eng/pipelines/runtime.yml
CONFLICT (content): Merge conflict in eng/pipelines/runtime.yml
Auto-merging src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Move default build images to macos 15 (and xcode 16) (#120589)
Error: The process '/usr/bin/git' failed with exit code 128 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(cherry picked from commit eaafd7c)