diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index 7e1c4183a..fc83275b2 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.42.0.13-ca-jdk7.0.282-macosx_x64.dmg" + installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.42.0.51-ca-jdk7.0.285-macosx_x64.dmg" else brew cask install "adoptopenjdk${JAVA_VERSION}" fi diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index b682cd7b2..a34e7fd22 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "12", + "default": "12.2", "versions": [ { "link": "12.3", "version": "12.3.0"}, { "link": "12.2", "version": "12.2.0" }, @@ -19,19 +19,26 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.107", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.4.1.3", "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" + "14.6.0.15", "14.4.1.3", "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.22.1.26", "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" + "7.0.0.15", "6.22.1.26", "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" ], "android-versions": [ "11.1.0.17", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], - "bundle-default": "6_12_1", + "bundle-default": "6_12_4", "bundles": [ + { + "symlink": "6_12_4", + "mono":"6.12", + "ios": "14.6", + "mac": "7.0", + "android": "11.1" + }, { "symlink": "6_12_3", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 8e6777e1b..a1ce67d0f 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "11.7", + "default": "12.2", "versions": [ { "link": "12.3", "version": "12.3.0"}, { "link": "12.2", "version": "12.2.0" }, @@ -10,19 +10,26 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.93" + "6.12.0.107" ], "ios-versions": [ - "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "6.22.1.26", "6.20.2.2" + "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "11.1.0.17", "11.0.2.0" ], - "bundle-default": "6_12_0", + "bundle-default": "6_12_4", "bundles": [ + { + "symlink": "6_12_4", + "mono":"6.12", + "ios": "14.6", + "mac": "7.0", + "android": "11.1" + }, { "symlink": "6_12_3", "mono":"6.12",