Remove Xcode 12 beta

images/macos/provision/core/xcode-tools.sh

@@ -35,13 +35,7 @@ do
     echo "Extracting Xcode.app ($VERSION_TO_INSTALL) to ${WORK_DIR} ..."
     extractXcodeXip $WORK_DIR "$VERSION_TO_INSTALL"
 
-    # Remove "beta" postfix from version
-    if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then
-        # trick to install Xcode 12 GM and Xcode 12 beta 6 side by side
-        XCODE_VERSION="12_beta"
-    else
-        XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
-    fi
+    XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
 
     echo "Checking if unpacked Xcode ${XCODE_VERSION} is valid"
     validateXcodeIntegrity "$WORK_DIR"
@@ -55,9 +49,7 @@ do
     # 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
 
-    if [ ! $(echo $XCODE_VERSION | grep "beta") ]; then
-        createXamarinProvisionatorSymlink "$XCODE_VERSION"
-    fi
+    createXamarinProvisionatorSymlink "$XCODE_VERSION"
 
     find $WORK_DIR -mindepth 1 -delete
 done
@@ -74,12 +66,7 @@ do
         continue
     fi
 
-    if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then
-        # trick to install Xcode 12 GM and Xcode 12 beta 6 side by side
-        XCODE_VERSION="12_beta"
-    else
-        XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
-    fi
+    XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
 
     echo "Running 'runFirstLaunch' for Xcode ${XCODE_VERSION}..."
     runFirstLaunch $XCODE_VERSION

images/macos/tests/Xcode.Tests.ps1

@@ -40,7 +40,7 @@ Describe "Xcode" {
     It "Xcode <XcodeVersion> has correct beta symlink" -TestCases $testCases {
         param ( [string] $XcodeVersion )
 
-        $xcodesWithBetaSymlink = @("12", "12_beta", "9.3", "9.4")
+        $xcodesWithBetaSymlink = @("12", "9.3", "9.4")
         $shouldBetaSymlinkExists = $XcodeVersion.StartsWith("10") -or $XcodeVersion.StartsWith("11") -or ($XcodeVersion -in $xcodesWithBetaSymlink)
 
         $betaSymlinkPath = Get-XcodeRootPath -Version "${XcodeVersion}_beta"

images/macos/toolsets/toolset-10.15.json

@@ -2,7 +2,7 @@
     "xcode": {
         "default": "11.7",
         "versions": [
-            "12.2_beta", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
+            "12.2_beta", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
         ]
     },
     "xamarin": {

images/macos/toolsets/toolset-11.0.json

@@ -2,7 +2,7 @@
     "xcode": {
         "default": "11.7",
         "versions": [
-            "12.2_beta", "12_beta", "11.7"
+            "12.2_beta", "11.7"
         ]
     },
     "xamarin": {