[macos] add architecture references (#7593)

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
     }

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

images/macos/toolsets/toolset-11.json

@@ -1,6 +1,7 @@
 {
     "xcode": {
         "default": "13.2.1",
+        "x64": {
             "versions": [
                 { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] },
                 { "link": "13.1", "version": "13.1.0" },
@@ -9,6 +10,7 @@
                 { "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": {
+        "arch":{
+            "x64": {
                 "versions": [
                     "3.1",
                     "6.0",
                     "7.0"
                 ]
+            }
+        }
     },
     "ruby": {
         "default": "2.7",

images/macos/toolsets/toolset-12.json

@@ -1,6 +1,7 @@
 {
     "xcode": {
         "default": "14.2",
+        "x64": {
             "versions": [
                 { "link": "14.2", "version": "14.2.0" },
                 { "link": "14.1", "version": "14.1.0" },
@@ -10,6 +11,7 @@
                 { "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": {
+        "arch":{
+            "x64": {
                 "versions": [
                     "3.1",
                     "6.0",
                     "7.0"
                 ]
+            }
+        }
     },
     "ruby": {
         "default": "3.0",