From cfaa7acb549bacf46977081f020016d61bb79f2c Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 2 Nov 2020 08:41:40 +0300 Subject: [PATCH] fix symlinks --- images/macos/helpers/Xcode.Installer.psm1 | 1 - images/macos/provision/core/xcode.ps1 | 2 ++ images/macos/toolsets/toolset-10.15.json | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index e076f5e07..c7213861f 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -130,7 +130,6 @@ function Build-XcodeSymlinks { param( [Parameter(Mandatory)] [string]$Version, - [Parameter(Mandatory)] [string[]]$Symlinks ) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 38287aa68..858280dfa 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -1,6 +1,8 @@ # The script currently requires 2 external variables to be set: XCODE_INSTALL_USER # and XCODE_INSTALL_PASSWORD, in order to access the Apple Developer Center +Write-Host "Script begin" + $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index c2bdbd2c4..b1b0215ef 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -6,13 +6,7 @@ { "link": "12.1", "version": "12.1.1 Release Candidate" }, { "link": "12", "version": "12.0.1" }, { "link": "11.7", "version": "11.7", "symlinks": ["11.7_beta"] }, - { "link": "11.6", "version": "11.6", "symlinks": ["11.6_beta"] }, - { "link": "11.5", "version": "11.5", "symlinks": ["11.5_beta"] }, { "link": "11.4.1", "version": "11.4.1", "symlinks": ["11.4", "11.4_beta"] }, - { "link": "11.3.1", "version": "11.3.1", "symlinks": ["11.3", "11.3_beta"] }, - { "link": "11.2.1", "version": "11.2.1", "symlinks": ["11.2", "11.2_beta"] }, - { "link": "11.1", "version": "11.1", "symlinks": ["11.1_beta"] }, - { "link": "11", "version": "11" }, { "link": "10.3", "version": "10.3", "symlinks": ["10.3_beta"] } ] },