From 02b78d07f41fc9a393619a23e9f10e15bd819575 Mon Sep 17 00:00:00 2001 From: AlexanderGitin <102294679+AlexanderGitin@users.noreply.github.com> Date: Wed, 22 Jun 2022 00:58:02 +0300 Subject: [PATCH] [MacOs] Add Xamarin & bump bundle to 6.12.17 (#5764) --- images/macos/provision/utils/xamarin-utils.sh | 6 +++++- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 4 ++-- images/macos/toolsets/toolset-12.json | 15 +++++++++++---- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/provision/utils/xamarin-utils.sh index a004fd761..f298d4959 100644 --- a/images/macos/provision/utils/xamarin-utils.sh +++ b/images/macos/provision/utils/xamarin-utils.sh @@ -19,7 +19,11 @@ buildVSMacDownloadUrl() { } buildMonoDownloadUrl() { - echo "https://dl.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" +if [[ $1 -eq 6.12.0.182 ]]; then + echo "https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" +else + echo "https://dl.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" +fi } buildXamariniIOSDownloadUrl() { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 7814909c6..28e289c4c 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -23,7 +23,7 @@ "versions": [ "2019" ] }, "mono-versions": [ - "6.12.0.162", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.182", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "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" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 84f9bb4e8..87a87a509 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -16,7 +16,7 @@ "versions": [ "2019", "2022" ] }, "mono-versions": [ - "6.12.0.174" + "6.12.0.182" ], "ios-versions": [ "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" @@ -25,7 +25,7 @@ "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "12.2.4.3", "12.1.0.2", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" + "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_12", "bundles": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 7c4ae21b2..c1b7c80e5 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -15,19 +15,26 @@ "versions": [ "2019", "2022" ] }, "mono-versions": [ - "6.12.0.174" + "6.12.0.182" ], "ios-versions": [ - "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ - "12.2.4.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" + "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_16", "bundles": [ + { + "symlink": "6_12_17", + "mono":"6.12", + "ios": "15.10", + "mac": "8.10", + "android": "12.2" + }, { "symlink": "6_12_16", "mono":"6.12",