From cf2f8015ffc9967cdac242386333980e3eea4554 Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Wed, 25 Sep 2019 15:09:29 -0400 Subject: [PATCH 1/2] [mono] Bump mono to match android https://github.com/mono/mono/compare/4546440471d8817fb89896fa33c3bd2fff1bf000...c99adb97edc6a57d934105d5c13506518134b585 --- mk/mono.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/mono.mk b/mk/mono.mk index a6b50dc5d1e4..4f8e61bcd8e3 100644 --- a/mk/mono.mk +++ b/mk/mono.mk @@ -1,4 +1,4 @@ -NEEDED_MONO_VERSION := 4546440471d8817fb89896fa33c3bd2fff1bf000 +NEEDED_MONO_VERSION := c99adb97edc6a57d934105d5c13506518134b585 NEEDED_MONO_BRANCH := 2019-08 MONO_DIRECTORY := mono From 4b222c3cf64efe40a906ae05971c15bd7b8bbaff Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 26 Sep 2019 08:21:26 +0200 Subject: [PATCH 2/2] [tests] Add workaround for xamarin/maccore#1996. --- tests/common/ProductTests.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/common/ProductTests.cs b/tests/common/ProductTests.cs index a4a95c701704..670c888f93da 100644 --- a/tests/common/ProductTests.cs +++ b/tests/common/ProductTests.cs @@ -126,6 +126,13 @@ public void MinOSVersion (Profile profile, MachO.LoadCommands load_command, Mach } 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;