From 9843c71d774b41fd2f8acb8e9f8edce162aa60af Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Wed, 27 Jul 2022 21:57:20 -0700
Subject: [PATCH] Bump macOs version to macos-11 (#3853)

---
 .../templates/stages/platform-matrix-cmakegenerate.json      | 2 +-
 .../stages/platform-matrix-cmakesourcegenerate.json          | 2 +-
 eng/pipelines/templates/stages/platform-matrix-live.json     | 2 +-
 eng/pipelines/templates/stages/platform-matrix.json          | 5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
index 1bab65ae73..a0ac2ef0c0 100644
--- a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
+++ b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
@@ -15,7 +15,7 @@
             },
             "Mac": {
                 "Pool": "Azure Pipelines",
-                "OSVmImage": "macOS-10.15",
+                "OSVmImage": "macos-11",
                 "VCPKG_DEFAULT_TRIPLET": "x64-osx"
             }
         }
diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
index 701d9d055f..49ac2e648a 100644
--- a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
+++ b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
@@ -14,7 +14,7 @@
             },
             "Mac": {
                 "Pool": "Azure Pipelines",
-                "OSVmImage": "macOS-10.15",
+                "OSVmImage": "macos-11",
                 "CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
                 "BrewDependencies": "openssl"
             }
diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json
index b843833c84..7e9f018107 100644
--- a/eng/pipelines/templates/stages/platform-matrix-live.json
+++ b/eng/pipelines/templates/stages/platform-matrix-live.json
@@ -7,7 +7,7 @@
             "StaticConfigs": {
                 "MacOS_x64_with_unit_test": {
                     "Pool": "Azure Pipelines",
-                    "OSVmImage": "macOS-10.15",
+                    "OSVmImage": "macos-11",
                     "VCPKG_DEFAULT_TRIPLET": "x64-osx",
                     "CmakeArgs": " -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON",
                     "AZURE_CORE_ENABLE_JSON_TESTS": 1,
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
index 15571ad469..889b8392c3 100644
--- a/eng/pipelines/templates/stages/platform-matrix.json
+++ b/eng/pipelines/templates/stages/platform-matrix.json
@@ -5,11 +5,8 @@
     "include": [
         {
             "OSConfiguration": {
-                "macOS-10.15": {
-                    "OSVmImage": "macOS-10.15"
-                },
                 "macOS-11": {
-                    "OSVmImage": "macOS-11",
+                    "OSVmImage": "macos-11",
                     "XCODE_VERSION": "12.5.1"
                 }
             },