diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index 59e727ce..194437a9 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -27,8 +27,8 @@ if is_Less_Catalina; then npm install -g appcenter-cli@^1.0.0 else # Install Node.JS 12 for macOS >= 10.15 - brew install node@12 - brew link node@12 --force + brew install node@14 + brew link node@14 --force for module in ${node_modules[@]}; do echo "Install $module" diff --git a/images/macos/provision/core/xcode-tools.sh b/images/macos/provision/core/xcode-tools.sh index 773b07a9..5c491708 100755 --- a/images/macos/provision/core/xcode-tools.sh +++ b/images/macos/provision/core/xcode-tools.sh @@ -77,6 +77,7 @@ runFirstLaunch $DEFAULT_XCODE_VERSION if is_Catalina; then ln -sf /Applications/Xcode_11.2.1.app /Applications/Xcode_11.2.app ln -sf /Applications/Xcode_11.3.1.app /Applications/Xcode_11.3.app + ln -sf /Applications/Xcode_11.4.1.app /Applications/Xcode_11.4.app fi echo "Setting Xcode ${DEFAULT_XCODE_VERSION} as default" diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 11a7e016..79f6d9eb 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -2,7 +2,7 @@ "xcode": { "default": "12", "versions": [ - "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" + "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.3.1", "11.2.1", "10.3" ] }, "xamarin": { @@ -168,8 +168,6 @@ "arch": "x64", "platform" : "darwin", "versions": [ - "1.11.*", - "1.12.*", "1.13.*", "1.14.*", "1.15.*"