Merge pull request #1930 from al-cheb/al-cheb/software-update-week45

[macOS] Software update week 45
This commit is contained in:
Maxim Lobanov
2020-10-30 09:21:09 +03:00
committed by GitHub
6 changed files with 22 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -e -o pipefail
if [ -z "$1" ]; then
echo "No Xamarin SDK specified."
exit 0

View File

@@ -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

View File

@@ -1,3 +1,4 @@
#!/bin/bash -e -o pipefail
source ~/utils/utils.sh
export PATH="$PATH:/opt/pipx_bin"

View File

@@ -10,7 +10,7 @@ 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
brew link python@3.8 --force
echo "Brew Installing Python 2"
# Create local tap with formula due to python2 formula depreciation

View File

@@ -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", "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"
@@ -19,8 +19,15 @@
"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",
"mono":"6.12",
"ios": "14.2",
"mac": "6.20",
"android": "11.0"
},
{
"symlink": "6_12_1",
"mono":"6.12",

View File

@@ -11,7 +11,7 @@
"6.12.0.93"
],
"ios-versions": [
"14.0.0.0", "13.20.2.2"
"14.2.0.12", "14.0.0.0", "13.20.2.2"
],
"mac-versions": [
"6.20.2.2"
@@ -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",