Skip to content

[mono] Bump mono to match android #7104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dalexsoto merged 2 commits into from
Sep 26, 2019
Merged

[mono] Bump mono to match android #7104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf2f801
[mono] Bump mono to match android
dalexsoto Sep 25, 2019
4b222c3
[tests] Add workaround for xamarin/maccore#1996.
rolfbjarne Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mk/mono.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NEEDED_MONO_VERSION := 4546440471d8817fb89896fa33c3bd2fff1bf000
NEEDED_MONO_VERSION := c99adb97edc6a57d934105d5c13506518134b585
NEEDED_MONO_BRANCH := 2019-08

MONO_DIRECTORY := mono
Expand Down
7 changes: 7 additions & 0 deletions tests/common/ProductTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down