From 827475587058fa5a1c5e8d77f1c4527f2a91f2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 4 Jun 2019 15:34:36 +0200 Subject: [PATCH 1/7] Bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 9f2e85cc82..c1d9646410 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 9f2e85cc82d5f8645b8e678fac12b557e8943cb8 +Subproject commit c1d9646410f0129ddf6dd3833011314d77294383 From 99e17e2019ac4c95b84431118f4e526c5071e54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 4 Jun 2019 15:35:50 +0200 Subject: [PATCH 2/7] Set MACOS_VERSION and WATCHOS5_VERSION in the Mono SDKs config To make sure we correctly propagate the values from xamarin-macios. --- builds/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builds/Makefile b/builds/Makefile index b4d0e4e9af..b77f341365 100644 --- a/builds/Makefile +++ b/builds/Makefile @@ -124,6 +124,8 @@ SDK_ARGS= \ IOS_VERSION=$(IOS_SDK_VERSION) IOS_VERSION_MIN=$(MIN_IOS_SDK_VERSION) \ TVOS_VERSION=$(TVOS_SDK_VERSION) TVOS_VERSION_MIN=$(MIN_TVOS_SDK_VERSION) \ WATCHOS_VERSION=$(WATCH_SDK_VERSION) WATCHOS_VERSION_MIN=$(MIN_WATCHOS_SDK_VERSION) \ + WATCHOS5_VERSION=$(WATCH_SDK_VERSION) WATCHOS5_VERSION_MIN=$(MIN_WATCHOS_SDK_VERSION) \ + MACOS_VERSION=$(OSX_SDK_VERSION) MACOS_VERSION_MIN=$(MIN_OSX_SDK_VERSION) IGNORE_PROVISION_LLVM=1 ifdef DISABLE_DOWNLOAD_LLVM From 8bf57063dc7af7395774be62af3917876abef853 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 4 Jun 2019 07:15:20 -0700 Subject: [PATCH 3/7] Temporary disable simulator system check. --- system-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-dependencies.sh b/system-dependencies.sh index 7924064c5b..6c4d5e064e 100755 --- a/system-dependencies.sh +++ b/system-dependencies.sh @@ -78,7 +78,7 @@ while ! test -z $1; do unset IGNORE_HOMEBREW PROVISION_SHARPIE=1 unset IGNORE_SHARPIE - PROVISION_SIMULATORS=1 + #PROVISION_SIMULATORS=1 unset IGNORE_SIMULATORS shift ;; From 02d01451a0c8d9506087b8da503f92b0ab36056b Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 4 Jun 2019 07:24:11 -0700 Subject: [PATCH 4/7] Build mono from source for now. --- jenkins/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jenkins/build.sh b/jenkins/build.sh index 3daf770ea6..07dd1507ae 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -113,6 +113,9 @@ if test -z "$ENABLE_DEVICE_BUILD"; then CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-ios-device" fi +# Build from source for Xcode 11 support until mono has packages +MONO_BUILD_FROM_SOURCE=1 + make reset make git-clean-all make print-versions From e01096c6f7bb68cf46e803f79f1aedd57b219a5c Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 4 Jun 2019 07:28:21 -0700 Subject: [PATCH 5/7] Fix logic confusion. --- jenkins/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/build.sh b/jenkins/build.sh index 07dd1507ae..0b421508e0 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -114,7 +114,7 @@ if test -z "$ENABLE_DEVICE_BUILD"; then fi # Build from source for Xcode 11 support until mono has packages -MONO_BUILD_FROM_SOURCE=1 +CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-packaged-mono" make reset make git-clean-all From 10d7ec62b3d96be6f31625d99ea486e03f6b6936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 4 Jun 2019 17:10:18 +0200 Subject: [PATCH 6/7] Bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index c1d9646410..d0276c7e78 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit c1d9646410f0129ddf6dd3833011314d77294383 +Subproject commit d0276c7e780e7a8d75aac59ecf8cb2d215230953 From 309277fc7e0e4f94f0768c6dbdf1055c934c071f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 4 Jun 2019 17:46:46 +0200 Subject: [PATCH 7/7] Bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index d0276c7e78..0b67549de5 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit d0276c7e780e7a8d75aac59ecf8cb2d215230953 +Subproject commit 0b67549de5d98a2abb520b71a5e9ded9be61580d