From f4167ec21a1f333f211ca825f2e061e9ab592978 Mon Sep 17 00:00:00 2001
From: Dmitry Kobets <dmitrykobets@microsoft.com>
Date: Mon, 3 Jan 2022 08:36:19 -0800
Subject: [PATCH] Update compiler support

---
 azure-pipelines.yml       | 20 ++++++++++----------
 pipelines/setup_apple.yml |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a034cc2..ba16ee9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,7 @@ stages:
     parameters:
       compiler: clang
       image: ubuntu-20.04
-      compilerVersions: [ 11, 10 ]
+      compilerVersions: [ 12, 11 ]
       setupfile: 'setup_clang.yml'
 
 - stage: Xcode
@@ -32,7 +32,7 @@ stages:
     parameters:
       compiler: 'Xcode'
       image: macOS-11
-      compilerVersions: [ '12.5.1', '13.1' ]
+      compilerVersions: [ '12.5.1', '13.2.1' ]
       setupfile: 'setup_apple.yml'
 
 - stage: VS_MSVC
@@ -40,13 +40,13 @@ stages:
   jobs:
   - template: ./pipelines/jobs.yml
     parameters:
-      compiler: 'VS2019 (16.11)'
-      compilerVersions: [ 'MSVC' ]
+      compiler: 'VS2019 (MSVC)'
+      compilerVersions: [ 'default' ]
       image: windows-2019
   - template: ./pipelines/jobs.yml
     parameters:
-      compiler: 'VS2022 (17.0)'
-      compilerVersions: [ 'MSVC' ]
+      compiler: 'VS2022 (MSVC)'
+      compilerVersions: [ 'default' ]
       image: windows-2022
 
 - stage: VS_LLVM
@@ -54,13 +54,13 @@ stages:
   jobs:
   - template: ./pipelines/jobs.yml
     parameters:
-      compiler: 'VS2019 (16.11)'
-      compilerVersions: [ 'LLVM' ]
+      compiler: 'VS2019 (LLVM)'
+      compilerVersions: [ 'default' ]
       image: windows-2019
       extraCmakeArgs: '-T ClangCL'
   - template: ./pipelines/jobs.yml
     parameters:
-      compiler: 'VS2022 (17.0)'
-      compilerVersions: [ 'LLVM' ]
+      compiler: 'VS2022 (LLVM)'
+      compilerVersions: [ 'default' ]
       image: windows-2022
       extraCmakeArgs: '-T ClangCL'
diff --git a/pipelines/setup_apple.yml b/pipelines/setup_apple.yml
index a424efa..6a256a5 100644
--- a/pipelines/setup_apple.yml
+++ b/pipelines/setup_apple.yml
@@ -3,7 +3,7 @@ parameters:
 
 steps:
   - script: |
-      if [ "${{ parameters.version }}" = "12.5.1" ]; then sudo xcode-select -switch /Applications/Xcode_12.5.1.app; fi
+      if [ "${{ parameters.version }}" != "default" ]; then sudo xcode-select -switch /Applications/Xcode_${{ parameters.version }}.app; fi
 
     displayName: "Setup Xcode Version"
     failOnStderr: true