From 111d6ae5cfff5aae60c748bbe832fe3d06e4bedb Mon Sep 17 00:00:00 2001
From: Shamil Mubarakshin
 <127750046+shamil-mubarakshin@users.noreply.github.com>
Date: Tue, 16 May 2023 16:39:03 +0200
Subject: [PATCH] [macos] add architecture references (#7593)

---
 images/macos/tests/Ruby.arm64.Tests.ps1 |  2 +-
 images/macos/tests/Xcode.Tests.ps1      |  4 ++-
 images/macos/toolsets/toolset-11.json   | 32 +++++++++++++----------
 images/macos/toolsets/toolset-12.json   | 34 +++++++++++++++----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/images/macos/tests/Ruby.arm64.Tests.ps1 b/images/macos/tests/Ruby.arm64.Tests.ps1
index 41fee5f5..2e380ac1 100644
--- a/images/macos/tests/Ruby.arm64.Tests.ps1
+++ b/images/macos/tests/Ruby.arm64.Tests.ps1
@@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 $os = Get-OSVersion
 
-Describe "Ruby" -Skip:($os.IsVentura) {
+Describe "Ruby" -Skip:($os.IsVentura -or $os.IsBigSur -or $os.IsMonterey) {
     It "Ruby is available" {
         "ruby --version" | Should -ReturnZeroExitCode
     }
diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1
index 8c5973e0..9abec658 100644
--- a/images/macos/tests/Xcode.Tests.ps1
+++ b/images/macos/tests/Xcode.Tests.ps1
@@ -2,7 +2,9 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1"
 Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
-$xcodeVersions = Get-ToolsetValue "xcode.versions"
+$ARCH = arch
+if ($ARCH -ne "arm64") { $ARCH = "x64" }
+$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions"
 $defaultXcode = Get-ToolsetValue "xcode.default"
 $latestXcodeVersion = $xcodeVersions | Select-Object -First 1
 $os = Get-OSVersion
diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index f6f82906..d01248ff 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -1,14 +1,16 @@
 {
     "xcode": {
         "default": "13.2.1",
-        "versions": [
-            { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] },
-            { "link": "13.1", "version": "13.1.0" },
-            { "link": "13.0", "version": "13.0.0" },
-            { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] },
-            { "link": "12.4", "version": "12.4.0" },
-            { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] }
-        ]
+        "x64": {
+            "versions": [
+                { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] },
+                { "link": "13.1", "version": "13.1.0" },
+                { "link": "13.0", "version": "13.0.0" },
+                { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] },
+                { "link": "12.4", "version": "12.4.0" },
+                { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] }
+            ]
+        }
     },
     "xamarin": {
         "vsmac": {
@@ -307,11 +309,15 @@
         }
     ],
     "dotnet": {
-        "versions": [
-            "3.1",
-            "6.0",
-            "7.0"
-        ]
+        "arch":{
+            "x64": {
+                "versions": [
+                    "3.1",
+                    "6.0",
+                    "7.0"
+                ]
+            }
+        }
     },
     "ruby": {
         "default": "2.7",
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 33db39a3..9abbcfd8 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -1,15 +1,17 @@
 {
     "xcode": {
         "default": "14.2",
-        "versions": [
-            { "link": "14.2", "version": "14.2.0" },
-            { "link": "14.1", "version": "14.1.0" },
-            { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] },
-            { "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] },
-            { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] },
-            { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] },
-            { "link": "13.1", "version": "13.1.0" }
-        ]
+        "x64": {
+            "versions": [
+                { "link": "14.2", "version": "14.2.0" },
+                { "link": "14.1", "version": "14.1.0" },
+                { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] },
+                { "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] },
+                { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] },
+                { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] },
+                { "link": "13.1", "version": "13.1.0" }
+            ]
+        }
     },
     "xamarin": {
         "vsmac": {
@@ -290,11 +292,15 @@
         }
     ],
     "dotnet": {
-        "versions": [
-            "3.1",
-            "6.0",
-            "7.0"
-        ]
+        "arch":{
+            "x64": {
+                "versions": [
+                    "3.1",
+                    "6.0",
+                    "7.0"
+                ]
+            }
+        }
     },
     "ruby": {
         "default": "3.0",