From cc740822a5b1d14630f69274e3a3103e73dec406 Mon Sep 17 00:00:00 2001 From: Vincent Dondain Date: Fri, 27 Sep 2019 18:13:31 -0400 Subject: [PATCH 1/2] [d16-4] Bump mono@d8441dee New commits in mono/mono: * mono/mono@d8441deead6 [crashing] Remove Mono signal handlers when starting to handle a crash (#17078) * mono/mono@7ae0f38fd7e [runtime] Respect runtime_version in mono_init_internal (#17086) * mono/mono@61ca7fe3a46 [sdks] Bump min iOS version to 7.0. (#17070) Diff: https://github.com/mono/mono/compare/c99adb97edc6a57d934105d5c13506518134b585..d8441deead62b3af591c6daefb5013b09ef1ab8b --- mk/mono.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/mono.mk b/mk/mono.mk index 4f8e61bcd8..8322e7fed6 100644 --- a/mk/mono.mk +++ b/mk/mono.mk @@ -1,4 +1,4 @@ -NEEDED_MONO_VERSION := c99adb97edc6a57d934105d5c13506518134b585 +NEEDED_MONO_VERSION := d8441deead62b3af591c6daefb5013b09ef1ab8b NEEDED_MONO_BRANCH := 2019-08 MONO_DIRECTORY := mono From 979eb13ab230348bfb7c3b38fed7ec65cc668060 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Mon, 30 Sep 2019 08:44:07 +0200 Subject: [PATCH 2/2] [tests] Remove workaround for xamarin/maccore#1996. Fixes https://github.com/xamarin/maccore/issues/1996. --- tests/common/ProductTests.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/common/ProductTests.cs b/tests/common/ProductTests.cs index 670c888f93..a4a95c7017 100644 --- a/tests/common/ProductTests.cs +++ b/tests/common/ProductTests.cs @@ -126,13 +126,6 @@ namespace Xamarin.Tests } mono_native_compat_version = version; mono_native_unified_version = new Version (10, 0, 0); - - // This condition and everything inside it is a workaround for https://github.com/xamarin/maccore/issues/1996. - if (alternate_version == null || (alternate_version.Major == 7 && version.Major == 7)) { - alternate_version = new Version (6, 0, 0); - if (!slice.IsDynamicLibrary) - mono_native_compat_version = alternate_version; - } break; case MachO.LoadCommands.MintvOS: version = SdkVersions.MinTVOSVersion;