From eddf4a0208b2235f513595d369d0bac437cb4780 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 13 Sep 2021 12:36:49 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"[macOS]=20Software=20Updates=202021?= =?UTF-8?q?=20Week=2037=20-=20Update=20Mono=20to=206.12.0.140=20ver?= =?UTF-8?q?=E2=80=A6=20(#4050)"=20(#4070)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/macos/provision/core/xamarin.sh | 5 ----- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/provision/core/xamarin.sh index 9d390409e..5cc6b360c 100755 --- a/images/macos/provision/core/xamarin.sh +++ b/images/macos/provision/core/xamarin.sh @@ -64,11 +64,6 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current" # Fix nuget in some mono versions because of known bugs # -if is_BigSur || is_Catalina; then - # The "nuget restore" command fails: https://github.com/mono/mono/issues/21180 - installNuget "6.12.0" "5.9.1" -fi - if is_Less_BigSur; then # Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637 installNuget "6.4.0" "5.3.1" diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 899f39f78..832cafa7a 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.125", "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 0e5b7a815..f70c90409 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -12,7 +12,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140" + "6.12.0.125" ], "ios-versions": [ "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"