Merge pull request #7127 from VincentDondain/d16-4-bump-mono
[d16-4] Bump mono 2019-08@d8441dee - Fixes xamarin/maccore#1996
This commit is contained in:
Коммит
0c7c58576b
|
@ -1,4 +1,4 @@
|
|||
NEEDED_MONO_VERSION := c99adb97edc6a57d934105d5c13506518134b585
|
||||
NEEDED_MONO_VERSION := d8441deead62b3af591c6daefb5013b09ef1ab8b
|
||||
NEEDED_MONO_BRANCH := 2019-08
|
||||
|
||||
MONO_DIRECTORY := mono
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче