From aad7e0bb423b8a20029860ccbcd9df214218bab4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 11:07:26 +0300 Subject: [PATCH 1/9] macOS software update week45 --- images/macos/provision/core/openjdk.sh | 2 +- images/macos/provision/core/python.sh | 4 ---- images/macos/toolsets/toolset-10.15.json | 4 ++-- images/macos/toolsets/toolset-11.0.json | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index c2b22baf..afca628e 100644 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -35,7 +35,7 @@ JAVA_DEFAULT=$(get_toolset_value '.java.default') for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}" do if [[ $JAVA_VERSION == "7" ]]; then - installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.40.0.15-ca-jdk7.0.272-macosx_x64.dmg" + installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.42.0.13-ca-jdk7.0.282-macosx_x64.dmg" else brew cask install "adoptopenjdk${JAVA_VERSION}" fi diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 62922053..7dafd273 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -6,11 +6,7 @@ echo "Installing Python Tooling" echo "Brew Installing Python 3" # Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked -brew install python@3.8 brew install python@3.9 -brew unlink python@3.9 -brew unlink python@3.8 -brew link python@3.8 echo "Brew Installing Python 2" # Create local tap with formula due to python2 formula depreciation diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e041c15e..41fc166a 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_GM_seed", "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.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" ] }, "xamarin": { @@ -11,7 +11,7 @@ "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.2.0.12", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index cb14b3a0..0d85f142 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -11,7 +11,7 @@ "6.12.0.93" ], "ios-versions": [ - "14.0.0.0", "13.20.2.2" + "14.2.0.12", "13.20.2.2" ], "mac-versions": [ "6.20.2.2" From 3c6b9c2a86f4e859441098971b5f440352a25d03 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 11:17:57 +0300 Subject: [PATCH 2/9] fix shebang pipx-packages.sh --- images/macos/provision/core/pipx-packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/provision/core/pipx-packages.sh b/images/macos/provision/core/pipx-packages.sh index 658600fa..47de190f 100644 --- a/images/macos/provision/core/pipx-packages.sh +++ b/images/macos/provision/core/pipx-packages.sh @@ -1,3 +1,4 @@ +#!/bin/bash -e -o pipefail source ~/utils/utils.sh export PATH="$PATH:/opt/pipx_bin" From 45a3f22ba984e230a18ff46ee269d95a13cf43e0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 11:20:29 +0300 Subject: [PATCH 3/9] fix shebang select-xamarin-sdk.sh --- images/macos/provision/assets/select-xamarin-sdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/assets/select-xamarin-sdk.sh b/images/macos/provision/assets/select-xamarin-sdk.sh index 45adc969..0fb4a343 100644 --- a/images/macos/provision/assets/select-xamarin-sdk.sh +++ b/images/macos/provision/assets/select-xamarin-sdk.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e -o pipefail if [ -z "$1" ]; then echo "No Xamarin SDK specified." exit 0 From 15ddb9d5da2c7a34a79ef3fadf893bc5edab49fb Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 11:28:42 +0300 Subject: [PATCH 4/9] revert ios 14.0.0.0 --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.0.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 41fc166a..52f5d135 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -11,7 +11,7 @@ "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.2.0.12", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 0d85f142..0fc950ec 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -11,7 +11,7 @@ "6.12.0.93" ], "ios-versions": [ - "14.2.0.12", "13.20.2.2" + "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ "6.20.2.2" From 2d9bef6d16975ccce42e0bfdaeaf708d2cb11c3b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 11:35:16 +0300 Subject: [PATCH 5/9] add 6_12_2 bundle --- images/macos/toolsets/toolset-10.15.json | 7 +++++++ images/macos/toolsets/toolset-11.0.json | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 52f5d135..9428525b 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -21,6 +21,13 @@ ], "bundle-default": "latest", "bundles": [ + { + "symlink": "6_12_2", + "mono":"6.12", + "ios": "14.2", + "mac": "6.20", + "android": "11.0" + }, { "symlink": "6_12_1", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 0fc950ec..c05de28c 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -21,6 +21,13 @@ ], "bundle-default": "6_12_0", "bundles": [ + { + "symlink": "6_12_2", + "mono":"6.12", + "ios": "14.2", + "mac": "6.20", + "android": "11.0" + }, { "symlink": "6_12_1", "mono":"6.12", From 8af39dcd65d4d9382bd9dfe5dfa724e0f099403f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 11:52:03 +0300 Subject: [PATCH 6/9] set default bundle as 6_12_1 --- images/macos/toolsets/toolset-10.15.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9428525b..229ccc79 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -19,7 +19,7 @@ "android-versions": [ "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], - "bundle-default": "latest", + "bundle-default": "6_12_1", "bundles": [ { "symlink": "6_12_2", From baebd6c1097a6c243d9d0ff1f68b298d092d4e1d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 16:42:28 +0300 Subject: [PATCH 7/9] python link flag --force --- images/macos/provision/core/python.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 7dafd273..da049319 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -6,7 +6,11 @@ echo "Installing Python Tooling" echo "Brew Installing Python 3" # Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked +brew install python@3.8 brew install python@3.9 +brew unlink python@3.9 +brew unlink python@3.8 +brew link python@3.8 --force echo "Brew Installing Python 2" # Create local tap with formula due to python2 formula depreciation From 26134ef1b76add52d2d6829a5e6dd26b47b966d1 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 16:43:44 +0300 Subject: [PATCH 8/9] remove python unlink --- images/macos/provision/core/python.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index da049319..37065e90 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -8,8 +8,6 @@ echo "Brew Installing Python 3" # Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked brew install python@3.8 brew install python@3.9 -brew unlink python@3.9 -brew unlink python@3.8 brew link python@3.8 --force echo "Brew Installing Python 2" From ff71699425c7ea6a1ce01230c159c01cfaf716e8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 18:47:15 +0300 Subject: [PATCH 9/9] python unlink --- images/macos/provision/core/python.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 37065e90..da049319 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -8,6 +8,8 @@ echo "Brew Installing Python 3" # Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked brew install python@3.8 brew install python@3.9 +brew unlink python@3.9 +brew unlink python@3.8 brew link python@3.8 --force echo "Brew Installing Python 2"