From b4c00c3578ae115ca1b5b0133e851997a06d3239 Mon Sep 17 00:00:00 2001
From: Alena Sviridenko <alenasviridenko@github.com>
Date: Fri, 6 Nov 2020 02:56:26 +0300
Subject: [PATCH] [macOS] Add Xcode 12.1.1 RC  & Xcode 12.2 RC (#1991)

* Add Xcode 12.1.1

* add Xcode 12.2 RC as well
---
 images/macos/provision/utils/xcode-utils.sh | 7 -------
 images/macos/toolsets/toolset-10.15.json    | 2 +-
 images/macos/toolsets/toolset-11.0.json     | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/images/macos/provision/utils/xcode-utils.sh b/images/macos/provision/utils/xcode-utils.sh
index 4955ffcd..cfe93439 100644
--- a/images/macos/provision/utils/xcode-utils.sh
+++ b/images/macos/provision/utils/xcode-utils.sh
@@ -9,11 +9,6 @@ createXamarinProvisionatorSymlink() {
         FULL_VERSION="12.0.1"
     fi
 
-    # temporary trick for 12.1.1
-    if [[ $XCODE_VERSION == "12.1" ]]; then
-        FULL_VERSION="12.1.1"
-    fi
-
     if [ $FULL_VERSION != $XCODE_VERSION ]; then
         ln -sf "/Applications/Xcode_${XCODE_VERSION}.app" "/Applications/Xcode_${FULL_VERSION}.app"
     fi
@@ -24,8 +19,6 @@ getXcodeVersionToInstall() {
 
     if [[ $XCODE_VERSION == "12" ]]; then
         echo "12.0.1"
-    elif [[ $XCODE_VERSION == "12.1" ]]; then
-        echo "12.1.1 Release Candidate"
     elif [[ ! $XCODE_VERSION =~ "_beta" ]]; then
         echo "${XCODE_VERSION//_/ }"
     else
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 79f6d9eb..a2edef7a 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -2,7 +2,7 @@
     "xcode": {
         "default": "12",
         "versions": [
-            "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.3.1", "11.2.1", "10.3"
+            "12.2_Release_Candidate", "12.1.1_Release_Candidate", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.3.1", "11.2.1", "10.3"
         ]
     },
     "xamarin": {
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json
index 874dec12..7fedaad5 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.0.json
@@ -2,7 +2,7 @@
     "xcode": {
         "default": "11.7",
         "versions": [
-            "12.2_beta", "11.7"
+            "12.2_Release_Candidate", "11.7"
         ]
     },
     "xamarin": {