From 9fe940e8a3cb67b6ecf0dbbcc9cb7efcc68aa008 Mon Sep 17 00:00:00 2001
From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com>
Date: Sat, 18 Sep 2021 01:10:15 +0300
Subject: [PATCH] [macOS] Install Xcode 13 beta along with 13 stable (#4102)

---
 images/macos/provision/core/xcode.ps1 | 6 +++++-
 images/macos/toolsets/toolset-11.json | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1
index ece967b1..ab984cd9 100644
--- a/images/macos/provision/core/xcode.ps1
+++ b/images/macos/provision/core/xcode.ps1
@@ -44,7 +44,11 @@ Invoke-XcodeRunFirstLaunch -Version $defaultXcode
 Write-Host "Configuring Xcode symlinks..."
 $xcodeVersions | ForEach-Object {
     Build-XcodeSymlinks -Version $_.link -Symlinks $_.symlinks
-    Build-ProvisionatorSymlink -Version $_.link
+
+    # Skip creating symlink to install multiple releases of the same Xcode version side-by-side
+    if ($_."skip-symlink" -ne "true") {
+        Build-ProvisionatorSymlink -Version $_.link
+    }
 }
 
 Write-Host "Setting default Xcode to $defaultXcode"
diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index 0c24f649..313e37f2 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -3,6 +3,7 @@
         "default": "12.5.1",
         "versions": [
             { "link": "13.0", "version": "13.0.0"},
+            { "link": "13.0_beta", "version": "13 beta 5", "skip-symlink": "true"},
             { "link": "12.5.1", "version": "12.5.1"},
             { "link": "12.5", "version": "12.5.0"},
             { "link": "12.4", "version": "12.4.0"},