From 0d08e13079313bdfaf1fb28807057a1a10a06842 Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Mon, 19 Oct 2020 08:24:21 +0300
Subject: [PATCH] test changes

---
 images/macos/provision/core/xcode-tools.sh  | 28 +++++++++++----------
 images/macos/provision/utils/utils.sh       | 12 ---------
 images/macos/provision/utils/xcode-utils.sh |  4 +--
 images/macos/toolsets/toolset-10.15.json    | 13 +++++++++-
 4 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/images/macos/provision/core/xcode-tools.sh b/images/macos/provision/core/xcode-tools.sh
index 643dc2932..ebd6e43a3 100755
--- a/images/macos/provision/core/xcode-tools.sh
+++ b/images/macos/provision/core/xcode-tools.sh
@@ -13,17 +13,20 @@ if [ -z $XCODE_INSTALL_USER ] || [ -z $XCODE_INSTALL_PASSWORD ]; then
     exit 1
 fi
 
-XCODE_LIST=($(get_xcode_list_from_toolset))
-LATEST_XCODE_VERSION=$(get_latest_xcode_from_toolset)
-DEFAULT_XCODE_VERSION=$(get_default_xcode_from_toolset)
+XCODE_COUNT=$(get_toolset_value '.xcode.versions | length')
+DEFAULT_XCODE_VERSION=$(get_toolset_value '.xcode.default')
 WORK_DIR="${HOME}/Library/Caches/XcodeInstall"
 
 # Update the list of available versions
 xcversion update
 
-for XCODE_VERSION in "${XCODE_LIST[@]}"
-do
-    VERSION_TO_INSTALL="$(getXcodeVersionToInstall "$XCODE_VERSION")"
+for ((XCODE_INDEX=0; XCODE_INDEX<XCODE_COUNT; XCODE_INDEX++)); do
+    LOCAL_VERSION=$(get_toolset_value ".xcode.versions[$XCODE_INDEX].localVersion")
+    XCODE_VERSION=$(get_toolset_value ".xcode.versions[$XCODE_INDEX].version")
+    SYMLINKS=($(get_toolset_value ".xcode.versions[$XCODE_INDEX].symlinks"))
+
+    echo "Installing Xcode '$XCVERSION_VERSION' to '$LOCAL_VERSION'"
+    VERSION_TO_INSTALL=$(resolveLatestXcodeVersion "$XCODE_VERSION")
     if [[ -z "$VERSION_TO_INSTALL" ]]; then
         echo "No versions were found matching $XCODE_VERSION"
         exit 1
@@ -35,20 +38,17 @@ do
     echo "Extracting Xcode.app ($VERSION_TO_INSTALL) to ${WORK_DIR} ..."
     extractXcodeXip $WORK_DIR "$VERSION_TO_INSTALL"
 
-    XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
-
     echo "Checking if unpacked Xcode ${XCODE_VERSION} is valid"
     validateXcodeIntegrity "$WORK_DIR"
 
-    # Move Xcode to /Applications
-    mv -f "${WORK_DIR}/Xcode.app" "/Applications/Xcode_${XCODE_VERSION}.app"
+    echo "Copying Xcode.app to /Applications/Xcode_${LOCAL_VERSION}.app"
+    mv -f "${WORK_DIR}/Xcode.app" "/Applications/Xcode_${LOCAL_VERSION}.app"
 
     echo "Accepting license for Xcode ${XCODE_VERSION}..."
-    approveLicense $XCODE_VERSION
+    approveLicense "$LOCAL_VERSION"
 
     # Creating a symlink for all Xcode 10* and Xcode 9.3, 9.4 to stay backwards compatible with consumers of the Xcode beta version
-    createBetaSymlink $XCODE_VERSION
-
+    createBetaSymlink "$LOCAL_VERSION"
     createXamarinProvisionatorSymlink "$XCODE_VERSION"
 
     find $WORK_DIR -mindepth 1 -delete
@@ -56,6 +56,8 @@ done
 
 echo "Configuring 'runFirstLaunch' for all Xcode versions"
 if is_Less_Catalina; then
+##TO-DO
+    LATEST_XCODE_VERSION=$(get_latest_xcode_from_toolset)
     echo "Install additional packages for Xcode ${LATEST_XCODE_VERSION}"
     installAdditionalPackages $LATEST_XCODE_VERSION
 fi
diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh
index 85881c7e3..7fd248976 100755
--- a/images/macos/provision/utils/utils.sh
+++ b/images/macos/provision/utils/utils.sh
@@ -81,18 +81,6 @@ get_toolset_value() {
     echo "$(jq -r "$query" $toolset_path)"
 }
 
-get_xcode_list_from_toolset() {
-    echo $(get_toolset_value '.xcode.versions | reverse | .[]')
-}
-
-get_latest_xcode_from_toolset() {
-    echo $(get_toolset_value '.xcode.versions[0]')
-}
-
-get_default_xcode_from_toolset() {
-    echo $(get_toolset_value '.xcode.default')
-}
-
 verlte() {
     sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1)
     [  "$1" = "$sortedVersion" ]
diff --git a/images/macos/provision/utils/xcode-utils.sh b/images/macos/provision/utils/xcode-utils.sh
index fccde9efd..729b59d94 100644
--- a/images/macos/provision/utils/xcode-utils.sh
+++ b/images/macos/provision/utils/xcode-utils.sh
@@ -12,7 +12,7 @@ createXamarinProvisionatorSymlink() {
     fi
 }
 
-getXcodeVersionToInstall() {
+resolveLatestXcodeVersion() {
     local XCODE_VERSION="$1"
 
     if [[ $XCODE_VERSION == "12" ]]; then
@@ -82,7 +82,7 @@ extractXcodeXip() {
 
 createBetaSymlink() {
     local XCODE_VERSION=$1
-    if [[ $XCODE_VERSION =~ 1[01].* ]] || [[ $XCODE_VERSION == "12" ]]; then
+    if [[ $XCODE_VERSION =~ 1[01].* ]] || [[ $XCODE_VERSION == "12.0" ]]; then
         ln -sf "/Applications/Xcode_${XCODE_VERSION}.app" "/Applications/Xcode_${XCODE_VERSION}_beta.app"
     fi
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 77c8ec2e2..f7d7c6aeb 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -2,7 +2,18 @@
     "xcode": {
         "default": "11.7",
         "versions": [
-            "12.2_beta", "12.1_GM_seed", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
+            { "localVersion": "12.2", "version": "12.2_beta" },
+            { "localVersion": "12.1", "version": "12.1_GM_seed" },
+            { "localVersion": "12.0", "version": "12.0.1", "symlinks": ["12"] },
+            { "localVersion": "11.7", "version": "11.7" },
+            { "localVersion": "11.6", "version": "11.6" },
+            { "localVersion": "11.5", "version": "11.5" },
+            { "localVersion": "11.4", "version": "11.4.1" },
+            { "localVersion": "11.3", "version": "11.3.1", "symlinks": ["11.3"] },
+            { "localVersion": "11.2", "version": "11.2.1", "symlinks": ["11.2"] },
+            { "localVersion": "11.1", "version": "11.1" },
+            { "localVersion": "11.0", "version": "11", "symlinks": ["11"] },
+            { "localVersion": "10.3", "version": "10.3" }
         ]
     },
     "xamarin": {