Skip to content

Commit 1410e7c

Browse files
[macos] introduce additional runtimes for XCode (#8254)
1 parent 6a44d73 commit 1410e7c

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

images/macos/helpers/Xcode.Installer.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ function Install-AdditionalSimulatorRuntimes {
176176

177177
Write-Host "Installing Simulator Runtimes for Xcode $Version ..."
178178
$xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild"
179-
Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms | xcpretty"
179+
Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms"
180180
}
181181

182182
function Build-XcodeSymlinks {

images/macos/provision/core/xcode.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ $xcodeVersions | ForEach-Object {
3838
Install-AdditionalSimulatorRuntimes -Version $_.link
3939
}
4040

41+
ForEach($runtime in $_.runtimes) {
42+
Write-Host "Installing Additional runtimes for Xcode '$runtime' ..."
43+
$xcodebuildPath = Get-XcodeToolPath -Version $_.link -ToolName 'xcodebuild'
44+
Invoke-ValidateCommand "sudo $xcodebuildPath -downloadPlatform $runtime"
45+
}
46+
4147
}
4248

4349
Invoke-XcodeRunFirstLaunch -Version $defaultXcode

images/macos/toolsets/toolset-13.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"default": "14.3.1",
44
"x64": {
55
"versions": [
6-
{ "link": "15.0", "version": "15.0.0-Beta.8+15A5229m" },
6+
{ "link": "15.0", "version": "15.0.0-Beta.8+15A5229m", "runtimes": [ "visionOS" ] },
77
{ "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] },
88
{ "link": "14.2", "version": "14.2.0+14C18" },
99
{ "link": "14.1", "version": "14.1.0+14B47b" }
1010
]
1111
},
1212
"arm64":{
1313
"versions": [
14-
{ "link": "15.0", "version": "15.0.0-Beta.8+15A5229m" },
14+
{ "link": "15.0", "version": "15.0.0-Beta.8+15A5229m", "runtimes": [ "visionOS" ] },
1515
{ "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] },
1616
{ "link": "14.2", "version": "14.2.0+14C18" },
1717
{ "link": "14.1", "version": "14.1.0+14B47b" }

0 commit comments

Comments
 (0)