From 34fa3471f8a79446c988b320e955e63edc422b10 Mon Sep 17 00:00:00 2001
From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com>
Date: Fri, 20 Oct 2023 11:22:53 +0200
Subject: [PATCH] [macos] introduce more flexible way of managind xcode
 runtimes (#8572)

---
 images/macos/provision/core/xcode.ps1 |  2 +-
 images/macos/toolsets/toolset-12.json |  6 +++---
 images/macos/toolsets/toolset-13.json | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1
index 9dbc09d2..9f6c07c7 100644
--- a/images/macos/provision/core/xcode.ps1
+++ b/images/macos/provision/core/xcode.ps1
@@ -29,7 +29,7 @@ $xcodeVersions | ForEach-Object {
     Write-Host "Configuring Xcode $($_.link) ..."
     Invoke-XcodeRunFirstLaunch -Version $_.link
 
-    if ($_.link.Split(".")[0] -ge 14) {
+    if ($_.install_runtimes -eq 'true') {
         # Additional simulator runtimes are included by default for Xcode < 14
         Install-AdditionalSimulatorRuntimes -Version $_.link
     }
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 688be72f..8d36240c 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -3,9 +3,9 @@
         "default": "14.2",
         "x64": {
             "versions": [
-                { "link": "14.2", "version": "14.2.0+14C18" },
-                { "link": "14.1", "version": "14.1.0+14B47b" },
-                { "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"] },
+                { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" },
+                { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" },
+                { "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"], "install_runtimes": "true" },
                 { "link": "13.4.1", "version": "13.4.1+13F100", "symlinks": ["13.4"] },
                 { "link": "13.3.1", "version": "13.3.1+13E500a", "symlinks": ["13.3"] },
                 { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"] },
diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json
index 91323add..8d8f73b6 100644
--- a/images/macos/toolsets/toolset-13.json
+++ b/images/macos/toolsets/toolset-13.json
@@ -3,20 +3,20 @@
         "default": "14.3.1",
         "x64": {
             "versions": [
-                { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507"},
-                { "link": "15.0", "version": "15.0.0+15A240d"},
-                { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] },
-                { "link": "14.2", "version": "14.2.0+14C18" },
-                { "link": "14.1", "version": "14.1.0+14B47b" }
+                { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507", "install_runtimes": "true"},
+                { "link": "15.0", "version": "15.0.0+15A240d", "install_runtimes": "true"},
+                { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" },
+                { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" },
+                { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" }
                 ]
         },
         "arm64":{
             "versions": [
-                { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507"},
-                { "link": "15.0", "version": "15.0.0+15A240d"},
-                { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] },
-                { "link": "14.2", "version": "14.2.0+14C18" },
-                { "link": "14.1", "version": "14.1.0+14B47b" }
+                { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507", "install_runtimes": "true"},
+                { "link": "15.0", "version": "15.0.0+15A240d", "install_runtimes": "true"},
+                { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" },
+                { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" },
+                { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" }
             ]
         }
     },