Skip to content

Update mac build machines #7558

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

Merged
merged 3 commits into from
Nov 20, 2025
+6 −5
Merged

Update mac build machines #7558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ec94ec
Update build machines to MacOS 15
ericstj Nov 19, 2025
0431289
Make sure we specify the target MacOS version now that build machines…
ericstj Nov 19, 2025
e79845f
Update src/Native/CMakeLists.txt
ericstj Nov 19, 2025
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
4 changes: 2 additions & 2 deletions .vsts-dotnet-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
buildScript: ./build.sh
innerLoop: true
pool:
vmImage: macOS-13
vmImage: macOS-15
helixQueue: OSX.13.Amd64.Open

- template: /build/ci/job-template.yml
Expand All @@ -144,7 +144,7 @@ jobs:
_targetFramework: net8.0
innerLoop: true
pool:
vmImage: macOS-13
vmImage: macOS-15
helixQueue: OSX.13.Arm64.Open

- template: /build/ci/job-template.yml
Expand Down
2 changes: 1 addition & 1 deletion build/.night-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
buildScript: ./build.sh
nightlyBuild: true
pool:
vmImage: macOS-13
vmImage: macOS-15

- template: /build/ci/job-template.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion build/vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ variables:
- name: WindowsImage
value: 1es-windows-2022
- name: MacImage
value: macOS-13
value: macOS-15
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
- name: enableSourceIndex
value: true
Expand Down
3 changes: 2 additions & 1 deletion src/Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\\.[0-9]+)?$")
set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

# Set the architecture we are compiling for on APPLE. This lets you cross target from x86_64 -> arm64.
# Set the architecture and target version we are compiling for on APPLE. This lets you cross target from x86_64 to arm64 and vice versa.
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES ${ARCHITECTURE})
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
endif()

# Older CMake doesn't support CMAKE_CXX_STANDARD and GCC/Clang need a switch to enable C++ 11
Expand Down