From c12188feaf1e7a122a7d7a506b61fe81a7eca4f4 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 6 Aug 2019 11:12:29 -0400 Subject: [PATCH 01/26] Bump to mono:2019-08 --- .external | 2 +- Configuration.props | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.external b/.external index c436f8504b9..f4a985e95ca 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-06@761220d914e28b3ebd67e5642cf8c200110f62ec +mono/mono:2019-08@1c57af4dc047dffa7b4792317a11eafecc20d933 diff --git a/Configuration.props b/Configuration.props index 1d4836735fa..ed8a6e7d05a 100644 --- a/Configuration.props +++ b/Configuration.props @@ -80,10 +80,10 @@ armeabi-v7a:arm64-v8a:x86 $(MSBuildThisFileDirectory)external\Java.Interop $(MSBuildThisFileDirectory)external\mono - 6.4.0 - 6.5.0 + 6.6.0 + 6.7.0 True - $(MonoRequiredMinimumVersion).98 + $(MonoRequiredMinimumVersion).1 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 9809979206c796b8f01ec72aed31e10316847779 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 7 Aug 2019 11:31:30 -0400 Subject: [PATCH 02/26] Bump to mono/mono:2019-08@3115d3a0c0ad9a3ab321bfe6dab22631d002713b --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index f4a985e95ca..66ea98ab407 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@1c57af4dc047dffa7b4792317a11eafecc20d933 +mono/mono:2019-08@3115d3a0c0ad9a3ab321bfe6dab22631d002713b diff --git a/Configuration.props b/Configuration.props index ed8a6e7d05a..f76526d0954 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).1 + $(MonoRequiredMinimumVersion).5 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 5753d3ad1c1b719468b5929833bda01256522cc7 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 9 Aug 2019 09:37:26 -0400 Subject: [PATCH 03/26] Bump to mono/mono:2019-08@409c0a7 --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 66ea98ab407..f76e0533578 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@3115d3a0c0ad9a3ab321bfe6dab22631d002713b +mono/mono:2019-08@409c0a7c2d2d69f346b767ec9dbc630604591b92 diff --git a/Configuration.props b/Configuration.props index f76526d0954..81ccb4fd485 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).5 + $(MonoRequiredMinimumVersion).10 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 8781b69f23e0cea601d18571babda1b2d0a728d6 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 12 Aug 2019 12:30:56 -0400 Subject: [PATCH 04/26] Bump to xamarin/Java.Interop/master@807ed48 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 4e364babe27..807ed482453 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 4e364babe27c62fa8704e443740de6be98ed45bf +Subproject commit 807ed482453803d5b6ca3d9c6b1e051f39de239d From aed1bb05949be3998c42ded6ff4bc82cf2247d9e Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 12 Aug 2019 12:51:19 -0400 Subject: [PATCH 05/26] Bump mono/2019-08@03be264 --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index f76e0533578..23dce17b3f9 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@409c0a7c2d2d69f346b767ec9dbc630604591b92 +mono/mono:2019-08@03be2643f5e3a02e9e2c8a4d0baa09db5d7bc86d diff --git a/Configuration.props b/Configuration.props index 81ccb4fd485..0b59791b854 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).10 + $(MonoRequiredMinimumVersion).14 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 0cbf84a302ad023901dbae26934cf8baa89ce90c Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 12 Aug 2019 14:52:15 -0400 Subject: [PATCH 06/26] Added a few build tool changes that were in https://github.com/xamarin/xamarin-android/pull/3443/files. They may help CI get further --- build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs | 2 +- build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs b/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs index 44bab0bdc8f..929140181ee 100644 --- a/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs +++ b/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs @@ -5,7 +5,7 @@ namespace Xamarin.Android.Prepare partial class LlvmRuntime : Runtime { public override string Flavor => "LLVM"; - public bool InstallBinaries { get; protected set; } + public bool InstallBinaries { get; protected set; } = true; public LlvmRuntime (string name, Func enabledCheck) : base (name, enabledCheck) diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs index da4d21d1547..3c8d4579cf6 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs @@ -99,11 +99,6 @@ partial class Runtimes enabledCheck: (Context ctx) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Host64Bit) ), - new LlvmRuntime ( - name: AbiNames.Llvm.Windows32Bit, - enabledCheck: (Context ctx) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Windows32Bit) - ), - new LlvmRuntime ( name: AbiNames.Llvm.Windows64Bit, enabledCheck: (Context) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Windows64Bit) From bdd86ea894f8d48688d03868d557ab3f8b5b9347 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 12 Aug 2019 15:14:00 -0400 Subject: [PATCH 07/26] Added one remaining change from https://github.com/xamarin/xamarin-android/pull/3443/files. It was under review, so I wanted to see if the other changes made CI work --- build-tools/xaprepare/xaprepare/Application/Abi.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Application/Abi.cs b/build-tools/xaprepare/xaprepare/Application/Abi.cs index a96b3b459cd..0bbacb19f5b 100644 --- a/build-tools/xaprepare/xaprepare/Application/Abi.cs +++ b/build-tools/xaprepare/xaprepare/Application/Abi.cs @@ -26,12 +26,12 @@ partial class Abi new Abi { Name = AbiNames.HostJit.Win32, Type = AbiType.HostJit, Is64Bit = false, IsCross = false, IsHost = true, IsLlvm = false, IsWindows = true }, new Abi { Name = AbiNames.HostJit.Win64, Type = AbiType.HostJit, Is64Bit = true, IsCross = false, IsHost = true, IsLlvm = false, IsWindows = true }, - new Abi { Name = AbiNames.CrossAot.ArmV7a, Type = AbiType.CrossAot, Is64Bit = false, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, - new Abi { Name = AbiNames.CrossAot.WinArmV7a, Type = AbiType.CrossAot, Is64Bit = false, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, + new Abi { Name = AbiNames.CrossAot.ArmV7a, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, + new Abi { Name = AbiNames.CrossAot.WinArmV7a, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, new Abi { Name = AbiNames.CrossAot.ArmV8a, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, new Abi { Name = AbiNames.CrossAot.WinArmV8a, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, - new Abi { Name = AbiNames.CrossAot.X86, Type = AbiType.CrossAot, Is64Bit = false, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, - new Abi { Name = AbiNames.CrossAot.WinX86, Type = AbiType.CrossAot, Is64Bit = false, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, + new Abi { Name = AbiNames.CrossAot.X86, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, + new Abi { Name = AbiNames.CrossAot.WinX86, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, new Abi { Name = AbiNames.CrossAot.X86_64, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, new Abi { Name = AbiNames.CrossAot.WinX86_64, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, From c7eb4f2df19ecb5decef279fb54a68cae149f896 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 12 Aug 2019 16:43:23 -0400 Subject: [PATCH 08/26] Missed on related change from https://github.com/xamarin/xamarin-android/pull/3443/files --- build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs b/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs index 929140181ee..633a0f238c1 100644 --- a/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs +++ b/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs @@ -12,8 +12,7 @@ public LlvmRuntime (string name, Func enabledCheck) {} public override void Init (Context context) - { - InstallBinaries = String.Compare (Name, AbiNames.Llvm.Windows64Bit, StringComparison.Ordinal) != 0; + { if (Context.IsLlvmWindowsAbi (Name)) { ExeSuffix = Configurables.Defaults.WindowsExecutableSuffix; InstallPath = Configurables.Paths.InstallMSBuildDir; From 959b07c4394968f513a031c9eafacb3db3b2acee Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 13 Aug 2019 21:00:42 +0200 Subject: [PATCH 09/26] Bump Java.Interop to use mono-2019-08 branch --- .gitmodules | 2 +- external/Java.Interop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4d78bec7701..dbbcbae8fd9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "external/Java.Interop"] path = external/Java.Interop url = https://github.com/xamarin/java.interop.git - branch = master + branch = mono-2019-08 [submodule "external/libzip"] path = external/libzip url = https://github.com/nih-at/libzip.git diff --git a/external/Java.Interop b/external/Java.Interop index 807ed482453..c35089597b8 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 807ed482453803d5b6ca3d9c6b1e051f39de239d +Subproject commit c35089597b8e575e207da91ae2ad4a95c4886884 From 4446cc2673ef74eae0cf509f74c992d5ba8266b1 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 14 Aug 2019 09:28:58 -0400 Subject: [PATCH 10/26] Bump to mono/mono:2019-08@c51c609 --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 23dce17b3f9..331756eee13 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@03be2643f5e3a02e9e2c8a4d0baa09db5d7bc86d +mono/mono:2019-08@c51c60988b7e9b589bc60ff9a02b2e52256ec1ab diff --git a/Configuration.props b/Configuration.props index 0b59791b854..9084186678c 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).14 + $(MonoRequiredMinimumVersion).20 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 1caa1dce9030182efc616a053d77cfafa4649bbe Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 16 Aug 2019 17:45:38 +0200 Subject: [PATCH 11/26] Bump Java.Interop to get recent interfaces fix --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index c35089597b8..56079219b58 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit c35089597b8e575e207da91ae2ad4a95c4886884 +Subproject commit 56079219b58afaf9a5bce53196ea4e21c3e99945 From aeee103e52b48d84e18538331009397381b5edba Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 20 Aug 2019 08:04:46 -0400 Subject: [PATCH 12/26] Bump to xamarin/java.interop@7d39ea7 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 56079219b58..7d39ea72536 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 56079219b58afaf9a5bce53196ea4e21c3e99945 +Subproject commit 7d39ea725361b21e3f166d04729db234f7be1da2 From 34a4d20af765006b4fc7c4de52455cc1cee97781 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 20 Aug 2019 08:35:50 -0400 Subject: [PATCH 13/26] Bump to mono/mono:2019-08@31f480c --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 331756eee13..ec117ae353f 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@c51c60988b7e9b589bc60ff9a02b2e52256ec1ab +mono/mono:2019-08@31f480c436d0aa36b1cf881e65749a506927df75 diff --git a/Configuration.props b/Configuration.props index 9084186678c..2f795c072ac 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).20 + $(MonoRequiredMinimumVersion).28 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 83ac78714064d66e3f1e42888c704b228d39e71f Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 20 Aug 2019 09:06:48 -0400 Subject: [PATCH 14/26] Bump xamarin/java.interop@70396fc --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 7d39ea72536..70396fc0afb 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 7d39ea725361b21e3f166d04729db234f7be1da2 +Subproject commit 70396fc0afb1fdfa593fe3e4f7b8f4cca0ec6728 From 595eb0150a04e26a3a448e07ca13d2b7b23dc7a4 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 21 Aug 2019 08:14:03 -0400 Subject: [PATCH 15/26] Bump to mono/mono:2019-08@d80d33b --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index ec117ae353f..67214f247ca 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@31f480c436d0aa36b1cf881e65749a506927df75 +mono/mono:2019-08@d80d33b05302549f42836b75c0073eec832da339 diff --git a/Configuration.props b/Configuration.props index 2f795c072ac..996164acc8f 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).28 + $(MonoRequiredMinimumVersion).32 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 624d0ecb1d78744eb7a8d7f897e39c399b72f56a Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 26 Aug 2019 09:19:45 -0400 Subject: [PATCH 16/26] Bump to mono/mono:2019-08@dc98767 --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 67214f247ca..0f7c7f76258 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@d80d33b05302549f42836b75c0073eec832da339 +mono/mono:2019-08@dc98767858873ff7a976049253401cdede2e25bd diff --git a/Configuration.props b/Configuration.props index 996164acc8f..e21d9b61053 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).32 + $(MonoRequiredMinimumVersion).36 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 6ade525cc4e9264a078893524d11b2aa1822265e Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 26 Aug 2019 09:39:11 -0400 Subject: [PATCH 17/26] Bump to xamarin/xamarin-android-tools@294f447 --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index cb41333efe0..294f4471a76 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit cb41333efe0089581ac3dff8137ec9281a5bbfdf +Subproject commit 294f4471a76da6df798c8520a8f8da0e6e83d3a5 From e24f836ddd89d0f8ad376ed1d6ca1ebfd835bab5 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 28 Aug 2019 08:47:06 -0400 Subject: [PATCH 18/26] Bump to mono/mon:2019-08@75f2ac1 --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 4082928fa7d..97cbe91c996 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@dc98767858873ff7a976049253401cdede2e25bd \ No newline at end of file +mono/mono:2019-08@75f2ac15bd75a5a20f16bb59b0e47300ed38661b \ No newline at end of file diff --git a/Configuration.props b/Configuration.props index e21d9b61053..bedb33535db 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).36 + $(MonoRequiredMinimumVersion).44 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From 527a65f675d7981dad70d3d2d3a5c8f356c77a4c Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 30 Aug 2019 09:10:21 -0400 Subject: [PATCH 19/26] Bump to mono/mono:2019-08@585f244 --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 97cbe91c996..3d8813574de 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 -mono/mono:2019-08@75f2ac15bd75a5a20f16bb59b0e47300ed38661b \ No newline at end of file +mono/mono:2019-08@585f244aed400c10a1c2ed335bd77b71b95da045 \ No newline at end of file diff --git a/Configuration.props b/Configuration.props index bedb33535db..3250452e595 100644 --- a/Configuration.props +++ b/Configuration.props @@ -83,7 +83,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).44 + $(MonoRequiredMinimumVersion).49 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From ecdb4b55ff131df92c9412edb8568e80d4075b27 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 30 Aug 2019 16:52:03 -0400 Subject: [PATCH 20/26] Bump to xamarin/java.interop:mono-2019-08@5dc64a1 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 70396fc0afb..5dc64a1fcb6 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 70396fc0afb1fdfa593fe3e4f7b8f4cca0ec6728 +Subproject commit 5dc64a1fcb6f573c639b16eb26cd87f028d3d4d4 From e85734e714f86e6b413cec3fe268af5ea410a213 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 3 Sep 2019 08:54:39 -0400 Subject: [PATCH 21/26] Bump to xamarin/monodroid:master@ba0a823 --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 0a9c385ea32..7d8f64e6213 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627 +xamarin/monodroid:master@ba0a823f07a72a8e820e3eb5724a58ef3af165db mono/mono:2019-08@585f244aed400c10a1c2ed335bd77b71b95da045 From 29853c6d01eff3bb950459e67e785d4c6dbc8b34 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 3 Sep 2019 16:12:55 -0400 Subject: [PATCH 22/26] Bump to mono/mono:2019-08@1ecb6e5 --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 7d8f64e6213..26ccdff081e 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@ba0a823f07a72a8e820e3eb5724a58ef3af165db -mono/mono:2019-08@585f244aed400c10a1c2ed335bd77b71b95da045 +mono/mono:2019-08@1ecb6e59de22b32a80c5b8eeb3d945f1b929ccfa diff --git a/Configuration.props b/Configuration.props index fd47743be9e..0a50bb8b80c 100644 --- a/Configuration.props +++ b/Configuration.props @@ -82,7 +82,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).49 + $(MonoRequiredMinimumVersion).52 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From d5870e71ebbd720f9b7e983569dc0155e77ffab6 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 4 Sep 2019 10:19:38 -0400 Subject: [PATCH 23/26] Bump to mono/mono:2019-08@29b1ac19 --- .external | 2 +- Configuration.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 7450570d04c..a4cda9dcd2e 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ xamarin/monodroid:master@ae622c72947620ec12b63520dec51913f7fa732b -mono/mono:2019-08@1ecb6e59de22b32a80c5b8eeb3d945f1b929ccfa +mono/mono:2019-08@29b1ac19c961b959a09097dbc0fe4cd567cc5298 diff --git a/Configuration.props b/Configuration.props index 0a50bb8b80c..3ef6746d382 100644 --- a/Configuration.props +++ b/Configuration.props @@ -82,7 +82,7 @@ 6.6.0 6.7.0 True - $(MonoRequiredMinimumVersion).52 + $(MonoRequiredMinimumVersion).54 $(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src $(MSBuildThisFileDirectory)external\opentk \usr From ea90c76e1c5af99f88c30f5fcf7c1fc104f9a389 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 4 Sep 2019 19:29:55 -0400 Subject: [PATCH 24/26] Revert changes to Abi.cs because bb7ffb7 fixed it --- build-tools/xaprepare/xaprepare/Application/Abi.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Application/Abi.cs b/build-tools/xaprepare/xaprepare/Application/Abi.cs index 0bbacb19f5b..a96b3b459cd 100644 --- a/build-tools/xaprepare/xaprepare/Application/Abi.cs +++ b/build-tools/xaprepare/xaprepare/Application/Abi.cs @@ -26,12 +26,12 @@ partial class Abi new Abi { Name = AbiNames.HostJit.Win32, Type = AbiType.HostJit, Is64Bit = false, IsCross = false, IsHost = true, IsLlvm = false, IsWindows = true }, new Abi { Name = AbiNames.HostJit.Win64, Type = AbiType.HostJit, Is64Bit = true, IsCross = false, IsHost = true, IsLlvm = false, IsWindows = true }, - new Abi { Name = AbiNames.CrossAot.ArmV7a, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, - new Abi { Name = AbiNames.CrossAot.WinArmV7a, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, + new Abi { Name = AbiNames.CrossAot.ArmV7a, Type = AbiType.CrossAot, Is64Bit = false, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, + new Abi { Name = AbiNames.CrossAot.WinArmV7a, Type = AbiType.CrossAot, Is64Bit = false, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, new Abi { Name = AbiNames.CrossAot.ArmV8a, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, new Abi { Name = AbiNames.CrossAot.WinArmV8a, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, - new Abi { Name = AbiNames.CrossAot.X86, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, - new Abi { Name = AbiNames.CrossAot.WinX86, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, + new Abi { Name = AbiNames.CrossAot.X86, Type = AbiType.CrossAot, Is64Bit = false, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, + new Abi { Name = AbiNames.CrossAot.WinX86, Type = AbiType.CrossAot, Is64Bit = false, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, new Abi { Name = AbiNames.CrossAot.X86_64, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = false }, new Abi { Name = AbiNames.CrossAot.WinX86_64, Type = AbiType.CrossAot, Is64Bit = true, IsCross = true, IsHost = false, IsLlvm = false, IsWindows = true }, From 4f9b12213d6190d9079155e6d366da183a96824e Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Thu, 5 Sep 2019 10:56:24 -0400 Subject: [PATCH 25/26] Ensure jenkins cleans up after itself --- build-tools/automation/build.groovy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-tools/automation/build.groovy b/build-tools/automation/build.groovy index be2de2f433e..2e5e083007a 100644 --- a/build-tools/automation/build.groovy +++ b/build-tools/automation/build.groovy @@ -146,6 +146,12 @@ timestamps { sh "rm -rf ${packagePath}" } + sh "git clean -xdff" + sh "git submodule foreach --recursive git clean -xdff" + sh "git submodule foreach --recursive git reset --hard HEAD" + sh "git submodule sync" + sh "git submodule update --recursive --init --force" + sh "mkdir -p ${packagePath}" } From 56b329f846fe4d6883a3a44a215e61a23dde2b0f Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Thu, 5 Sep 2019 12:58:28 -0400 Subject: [PATCH 26/26] Bump to xamarin/java.interop:master@be6048e --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 5dc64a1fcb6..be6048ed9c0 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 5dc64a1fcb6f573c639b16eb26cd87f028d3d4d4 +Subproject commit be6048ed9c0972f7bf121bf34e40b865fe3891a8