From ebf0498363c53f0d3c403b0548212c147e3747fe Mon Sep 17 00:00:00 2001
From: dmitrykobets-msft <89153909+dmitrykobets-msft@users.noreply.github.com>
Date: Thu, 6 Jan 2022 10:17:21 -0800
Subject: [PATCH] Update compiler support (#1021)

Bump clang and Xcode supported versions and add support for VS with LLVM
---
 README.md                 | 16 ++++++++++------
 azure-pipelines.yml       | 33 ++++++++++++++-------------------
 pipelines/setup_apple.yml |  2 +-
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index f0367eb..a0c44f3 100644
--- a/README.md
+++ b/README.md
@@ -93,13 +93,17 @@ Below is a table showing the versions currently being tested.
 
 Compiler |Toolset Versions Currently Tested
 :------- |--:
- XCode | 13.1 & 12.5.1
- GCC | 11.1.0 & 10.3.0
- Clang | 11.0.0 & 10.0.0
- Visual Studio with MSVC | VS2019 (16.11) & VS2022 (17.0)
- Visual Studio with LLVM | VS2019 (16.11)
+ XCode | 13.2.1 & 12.5.1
+ GCC | 11[^1] & 10[^2]
+ Clang | 12[^2] & 11[^2]
+ Visual Studio with MSVC | VS2022[^3] & VS2019[^4]
+ Visual Studio with LLVM | VS2022[^3] & VS2019[^4]
 
-- Support for Visual Studio 2022 with LLVM will be added in the near future
+
+[^1]: Precise version may be found in the [latest CI results](https://dev.azure.com/cppstat/GSL/_build?definitionId=1&branchFilter=26).
+[^2]: Precise version may be found in the [latest CI results](https://dev.azure.com/cppstat/GSL/_build?definitionId=1&branchFilter=26). Should be the version specified [here](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md#language-and-runtime).
+[^3]: Precise version may be found in the [latest CI results](https://dev.azure.com/cppstat/GSL/_build?definitionId=1&branchFilter=26). Should be the version specified [here](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md#visual-studio-enterprise-2022).
+[^4]: Precise version may be found in the [latest CI results](https://dev.azure.com/cppstat/GSL/_build?definitionId=1&branchFilter=26). Should be the version specified [here](https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#visual-studio-enterprise-2019).
 
 ---
 If you successfully port GSL to another platform, we would love to hear from you!
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a82e3c4..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,18 +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'
-
-# The *same* config as with 2019 but on 2022 yields an error.
-# Tracking issue: https://github.com/actions/virtual-environments/issues/4716
-# - template: ./pipelines/jobs.yml
-#   parameters:
-#     compiler: 'VS2022 LLVM'
-#     compilerVersions: [ '17.0' ]
-#     image: windows-2022
-#     extraCmakeArgs: '-T ClangCL'
-#     CXXVersions: [ 14 ]
-#     buildTypes: [ Release ]
+  - template: ./pipelines/jobs.yml
+    parameters:
+      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