Skip to content

[release/8.0] Move default build images to macos 15 (and xcode 16) (#120589) #122423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agocke wants to merge 8 commits into
base: release/8.0-staging
Choose a base branch
from
+116 −105
Open

[release/8.0] Move default build images to macos 15 (and xcode 16) (#120589) #122423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32cb9b5
Move default build images to macos 15 (and xcode 16) (#120589)
agocke Nov 28, 2025
7d9e6da
Replace the use of in some macros in Mono - it will expand to in C1…
steveisok Dec 11, 2025
e3a45c7
One more
steveisok Dec 11, 2025
a57b9a8
Fix warning on resolved in https://github.com/dotnet/runtime/pull/98018
steveisok Dec 11, 2025
a444b21
Also bump Helix testing to macos 14
agocke Jan 7, 2026
dbf26e8
Upgrade libraries queues
agocke Jan 7, 2026
b1df24b
Mark labels in x64 write barrier code as local/alt_entry to prevent i…
filipnavara Sep 1, 2025
e21e854
Bump the internal pool to use macos-15 too.
steveisok Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions eng/pipelines/common/xplat-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,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')) }}:
Expand All @@ -173,12 +176,12 @@ 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'

# OSX Internal Pool
${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
name: "Azure Pipelines"
vmImage: 'macOS-13'
vmImage: 'macos-15'
os: macOS

# Official Build Windows Pool
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,16 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.13.ARM64.Open
- OSX.14.ARM64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.13.ARM64
- OSX.14.ARM64

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.13.Amd64.Open
- OSX.14.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.13.Amd64
- OSX.14.Amd64

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- (Ubuntu.2204.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- (AzureLinux.3.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8

# Linux musl x64
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
- (Alpine.323.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.23-helix-amd64
Expand All @@ -45,7 +45,7 @@ jobs:
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- (Alpine.323.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.23-helix-arm64v8

# Linux x64
- ${{ if eq(parameters.platform, 'linux_x64') }}:
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
Expand Down Expand Up @@ -76,11 +76,11 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- OSX.13.ARM64.Open
- OSX.14.ARM64.Open

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- OSX.13.Amd64.Open
- OSX.14.Amd64.Open

# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
Expand Down
Loading
Loading