diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index ed6591daf0..66a41af051 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -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 @@ -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 diff --git a/build/.night-build.yml b/build/.night-build.yml index 870f16654d..91d54e84fa 100644 --- a/build/.night-build.yml +++ b/build/.night-build.yml @@ -63,7 +63,7 @@ jobs: buildScript: ./build.sh nightlyBuild: true pool: - vmImage: macOS-13 + vmImage: macOS-15 - template: /build/ci/job-template.yml parameters: diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index c36a1cc22a..11f916e718 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -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 diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt index 0082d0dcd5..9e3647ede1 100644 --- a/src/Native/CMakeLists.txt +++ b/src/Native/CMakeLists.txt @@ -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