From 1ec94ec47c3db2850a60b5f64e8f4f8e92f11b95 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Wed, 19 Nov 2025 09:20:44 -0800
Subject: [PATCH 1/3] Update build machines to MacOS 15

---
 .vsts-dotnet-ci.yml    | 4 ++--
 build/.night-build.yml | 2 +-
 build/vsts-ci.yml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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

From 04312897a33fa4a034a0484eb9e0475b53e8b059 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Wed, 19 Nov 2025 09:34:56 -0800
Subject: [PATCH 2/3] Make sure we specify the target MacOS version now that
 build machines run on newer version.

---
 src/Native/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt
index 0082d0dcd5..3da934a751 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_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

From e79845f320bb0361cf04112cbf302f79544cb518 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Wed, 19 Nov 2025 13:46:15 -0800
Subject: [PATCH 3/3] Update src/Native/CMakeLists.txt

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/Native/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt
index 3da934a751..9e3647ede1 100644
--- a/src/Native/CMakeLists.txt
+++ b/src/Native/CMakeLists.txt
@@ -112,7 +112,7 @@ endif()
 
 # 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_ARCHITECTURES ${ARCHITECTURE})
     set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
 endif()