From eae7b14f576f7a2dfbd0979bba0b82b5257e49fa Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Thu, 4 Nov 2021 14:42:29 -0700
Subject: [PATCH] Add Xcode 12.5.1 (#3023)

---
 eng/pipelines/templates/jobs/ci.tests.yml           |  9 +++++++++
 eng/pipelines/templates/stages/platform-matrix.json | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
index 8092e2ac3..ed9315411 100644
--- a/eng/pipelines/templates/jobs/ci.tests.yml
+++ b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -74,6 +74,15 @@ jobs:
         condition: and(succeeded(), ne(variables['AptDependencies'], ''))
         displayName: Install dependencies from apt
 
+      - pwsh: sudo xcode-select -s /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer
+        condition: >-
+          and(
+            succeeded(),
+            contains(variables['OSVmImage'], 'macOS'),
+            ne(variables['XCODE_VERSION'], '')
+          )
+        displayName: Set Xcode version
+
       - template: /eng/pipelines/templates/steps/vcpkg.yml
         parameters:
           DependenciesVariableName: VcpkgInstall
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
index f58ee8dd5..bb8e58fc4 100644
--- a/eng/pipelines/templates/stages/platform-matrix.json
+++ b/eng/pipelines/templates/stages/platform-matrix.json
@@ -4,7 +4,18 @@
     },
     "include": [
         {
-            "OSVmImage": ["macOS-10.14", "macOS-10.15", "macOS-11"],
+            "OSConfiguration": {
+                "macOS-10.14": {
+                    "OSVmImage": "macOS-10.14"
+                },
+                "macOS-10.15": { 
+                    "OSVmImage": "macOS-10.15"
+                },
+                "macOS-11": {
+                    "OSVmImage": "macOS-11",
+                    "XCODE_VERSION": "12.5.1"
+                }
+            },
             "StaticConfigs": {
                 "_": {
                     "Pool": "Azure Pipelines",