xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[mono] Bump mono to bring iOS binaries built with xcode12.4 (#10943) 

* [mono] Bump mono to bring iOS binaries built with xcode12.4

Also bumping system mono pkg to the one that contains arm64 support

New commits in mono/mono:

* mono/mono@eb4c3116eb Build iOS SDK archives on Xcode 12.4
* mono/mono@acb8d8ed6f [2020-02][marshal] Fix VARIANT and BSTR marshaling in structs (#20918)

Diff: be9218f4d1..eb4c3116eb

* [mtouch] fix version logic check

Fixes Unexpected minOS version (expected 8.0.0, found 7.0.0) in MonoTouch.iphonesimulator.sdk/lib/libmono-native-compat.dylib ()

we really only care if it is over the version we expect not below.

* Fix version test
This commit is contained in:
Alex Soto 2021-03-24 17:34:30 -04:00 коммит произвёл GitHub
Родитель 1b658149ff
Коммит 9c791dcd07
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 11 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
Make.config
Просмотреть файл

@ -136,9 +136,9 @@ include $(TOP)/mk/mono.mk
MONO_HASH := $(NEEDED_MONO_VERSION) MONO_HASH := $(NEEDED_MONO_VERSION)
# Minimum Mono version for building XI/XM # Minimum Mono version for building XI/XM
MIN_MONO_VERSION=6.12.0.114 MIN_MONO_VERSION=6.12.0.131
MAX_MONO_VERSION=6.12.99 MAX_MONO_VERSION=6.12.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/121/5e9cb6d1c1de430965312927d5aed7fcb27bfa73/MonoFramework-MDK-6.12.0.114.macos10.xamarin.universal.pkg MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/138/eb4c3116ebf3ac44f72232fc9315fa4947c04b44/MonoFramework-MDK-6.12.0.131.macos10.xamarin.universal.pkg
# Minimum Mono version for Xamarin.Mac apps using the system mono # Minimum Mono version for Xamarin.Mac apps using the system mono
MIN_XM_MONO_VERSION=6.4.0.94 MIN_XM_MONO_VERSION=6.4.0.94
@ -470,9 +470,9 @@ JENKINS_RESULTS_DIRECTORY ?= $(abspath $(TOP)/jenkins-results)
CP:=$(shell df -t apfs / >/dev/null 2>&1 && echo "cp -c" || echo "cp") CP:=$(shell df -t apfs / >/dev/null 2>&1 && echo "cp -c" || echo "cp")
# WORKAROUND, Ideally it should be xcode-$(XCODE_PRODUCT_BUILD_VERSION) but mono does not build binaries for each xcode release # WORKAROUND, Ideally it should be xcode-$(XCODE_PRODUCT_BUILD_VERSION) but mono does not build binaries for each xcode release
# Xcode 11.3 Build 11C29 # Xcode 12.4 Build 12D4e
XCODE_IOS_ARCHIVE_VERSION=xcode-11C29 XCODE_IOS_ARCHIVE_VERSION=xcode-12D4e
# Xcode 12.4 Build 11C29 # Xcode 12.4 Build 12D4e
XCODE_MACOS_ARCHIVE_VERSION=xcode-12D4e XCODE_MACOS_ARCHIVE_VERSION=xcode-12D4e
MONO_IOS_FILENAME:=ios-release-Darwin-$(MONO_HASH).7z MONO_IOS_FILENAME:=ios-release-Darwin-$(MONO_HASH).7z
MONO_IOS_URL:=https://xamjenkinsartifact.azureedge.net/mono-sdks/$(XCODE_IOS_ARCHIVE_VERSION)/$(MONO_IOS_FILENAME) MONO_IOS_URL:=https://xamjenkinsartifact.azureedge.net/mono-sdks/$(XCODE_IOS_ARCHIVE_VERSION)/$(MONO_IOS_FILENAME)

2
mk/mono.mk
Просмотреть файл

@ -1,4 +1,4 @@
NEEDED_MONO_VERSION := be9218f4d1f7529fbe85d15c58f6fe78161909b3 NEEDED_MONO_VERSION := eb4c3116ebf3ac44f72232fc9315fa4947c04b44
NEEDED_MONO_BRANCH := 2020-02 NEEDED_MONO_BRANCH := 2020-02
MONO_DIRECTORY := mono MONO_DIRECTORY := mono

6
tests/common/ProductTests.cs
Просмотреть файл

@ -107,6 +107,7 @@ namespace Xamarin.Tests
Version version; Version version;
Version alternate_version = null; Version alternate_version = null;
Version mono_native_compat_version; Version mono_native_compat_version;
Version alternate_mono_native_compat_version = null;
Version mono_native_unified_version; Version mono_native_unified_version;
Version alternate_mono_native_unified_version = null; Version alternate_mono_native_unified_version = null;
switch (load_command) { switch (load_command) {
@ -132,6 +133,7 @@ namespace Xamarin.Tests
} }
mono_native_compat_version = version; mono_native_compat_version = version;
mono_native_unified_version = new Version (10, 0, 0); mono_native_unified_version = new Version (10, 0, 0);
alternate_mono_native_compat_version = new Version (7, 0, 0); // Xcode 12.4 built binaries
break; break;
case MachO.LoadCommands.MintvOS: case MachO.LoadCommands.MintvOS:
version = SdkVersions.MinTVOSVersion; version = SdkVersions.MinTVOSVersion;
@ -157,11 +159,13 @@ namespace Xamarin.Tests
alternate_version = version; alternate_version = version;
if (alternate_mono_native_unified_version == null) if (alternate_mono_native_unified_version == null)
alternate_mono_native_unified_version = mono_native_unified_version; alternate_mono_native_unified_version = mono_native_unified_version;
if (alternate_mono_native_compat_version == null)
alternate_mono_native_compat_version = mono_native_compat_version;
switch (Path.GetFileName (machoFile)) { switch (Path.GetFileName (machoFile)) {
case "libmono-native-compat.dylib": case "libmono-native-compat.dylib":
case "libmono-native-compat.a": case "libmono-native-compat.a":
if (mono_native_compat_version != lc_min_version) if (mono_native_compat_version != lc_min_version && alternate_mono_native_compat_version != lc_min_version)
failed.Add ($"Unexpected minOS version (expected {mono_native_compat_version}, found {lc_min_version}) in {machoFile} ({slice.Filename})."); failed.Add ($"Unexpected minOS version (expected {mono_native_compat_version}, found {lc_min_version}) in {machoFile} ({slice.Filename}).");
break; break;
case "libmono-native-unified.dylib": case "libmono-native-unified.dylib":