From 76cef038dc5159c1211bc3149408f2aa3bc8cbbd Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 5 Jun 2017 18:53:13 -0400 Subject: [PATCH 01/40] Bump mono to 5.4.0.0 --- build-tools/dependencies/dependencies.projitems | 4 ++-- external/linker | 2 +- external/llvm | 2 +- external/mono | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems index db5cb1b2405..c181f80ccfc 100644 --- a/build-tools/dependencies/dependencies.projitems +++ b/build-tools/dependencies/dependencies.projitems @@ -1,7 +1,7 @@ - <_DarwinMonoFramework>MonoFramework-MDK-5.2.0.114.macos10.xamarin.universal.pkg + <_DarwinMonoFramework>MonoFramework-MDK-5.4.0.0.macos10.xamarin.universal.pkg <_AptGetInstall>apt-get -f -u install @@ -60,7 +60,7 @@ $(MonoRequiredMinimumVersion) $(MonoRequiredDarwinMinimumVersion) $(MSBuildThisFileDirectory)..\scripts\mono-version - https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-04/8a/8a4958ae3861143b55981cef3843c328462041f8/$(_DarwinMonoFramework) + https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-06/b3/b3e79ebc059795e5df52ebb9b0fae54f35621264/$(_DarwinMonoFramework) installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target / diff --git a/external/linker b/external/linker index c7450ca2669..0cbb1e78717 160000 --- a/external/linker +++ b/external/linker @@ -1 +1 @@ -Subproject commit c7450ca2669becddffdea7dcdcc06692e57989e1 +Subproject commit 0cbb1e787172bdfd8b2964f683d979e0ba719b41 diff --git a/external/llvm b/external/llvm index dbb6fdffdeb..5056b9f2bcb 160000 --- a/external/llvm +++ b/external/llvm @@ -1 +1 @@ -Subproject commit dbb6fdffdeb780d11851a6be77c209bd7ada4bd3 +Subproject commit 5056b9f2bcb45f0a3d1c676b7f06d4b8249754b3 diff --git a/external/mono b/external/mono index 1a227379203..b3e79ebc059 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 1a227379203671064ef08aa062af5e5c606d0ec9 +Subproject commit b3e79ebc059795e5df52ebb9b0fae54f35621264 From 0bf122c7246274fcce1f5dc17cce4d019e4d7b95 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 6 Jun 2017 14:40:17 +0200 Subject: [PATCH 02/40] [linker] add new source files to project file --- .../Xamarin.Android.Build.Tasks.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index e2586cafde4..110d7d690ea 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -292,6 +292,12 @@ Linker\Mono.Linker\Pipeline.cs + + Linker\Mono.Linker\MethodReferenceExtensions.cs + + + Linker\Mono.Linker\TypeReferenceExtensions.cs + Linker\Mono.Linker\TypePreserve.cs From cc6a7e8d39618e0322942c4746e6cbb844a76ea2 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 6 Jun 2017 19:18:13 +0200 Subject: [PATCH 03/40] [mono] bump to https://github.com/mono/mono/commit/ac71acfd526a3763bbbd54904d8978b088dca2e9 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index b3e79ebc059..ac71acfd526 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit b3e79ebc059795e5df52ebb9b0fae54f35621264 +Subproject commit ac71acfd526a3763bbbd54904d8978b088dca2e9 From 26846b754ad26e1b1043c7977117f04cf028d211 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 6 Jun 2017 21:43:21 +0200 Subject: [PATCH 04/40] bump mono and java.interop --- external/Java.Interop | 2 +- external/mono | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/Java.Interop b/external/Java.Interop index 4aa2cde3fbc..57e9501193b 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 4aa2cde3fbca49b8171e2094b6bdc13513188d22 +Subproject commit 57e9501193b41e8ed719f68641ec27492e967d6f diff --git a/external/mono b/external/mono index ac71acfd526..e3596928d8d 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit ac71acfd526a3763bbbd54904d8978b088dca2e9 +Subproject commit e3596928d8d871948a798959c9a6cd04eac4ee98 From 588aaa1b7a6b739aedb6f09d8efac17a640b1f19 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 7 Jun 2017 19:38:51 +0200 Subject: [PATCH 05/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index e3596928d8d..d3e6c9d17f0 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit e3596928d8d871948a798959c9a6cd04eac4ee98 +Subproject commit d3e6c9d17f017268fa779817dbb8968cc2f189d6 From dcc7e479738e496e9c7312ce5ca91ebb775de7d3 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Fri, 9 Jun 2017 12:45:32 +0200 Subject: [PATCH 06/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index d3e6c9d17f0..52a5acbd888 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit d3e6c9d17f017268fa779817dbb8968cc2f189d6 +Subproject commit 52a5acbd88837b86b7067aeac70aa7d662792289 From 17ae5c2c7d804e75851b97560c256e0306dd7e97 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 12 Jun 2017 19:11:31 +0200 Subject: [PATCH 07/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 52a5acbd888..9161e4e5a91 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 52a5acbd88837b86b7067aeac70aa7d662792289 +Subproject commit 9161e4e5a911286e02ec0fc741de8addf490ce68 From d69494aca59444636dab021bc83a3bed789546d2 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 14 Jun 2017 14:38:19 +0200 Subject: [PATCH 08/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 9161e4e5a91..33074493a01 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 9161e4e5a911286e02ec0fc741de8addf490ce68 +Subproject commit 33074493a01862a720fcfe91ce958f9a78265bc7 From 2868769877486421731c11d9d0c68e2897fbbf5c Mon Sep 17 00:00:00 2001 From: "ludovic.henry" Date: Wed, 14 Jun 2017 14:07:54 -0400 Subject: [PATCH 09/40] Updated submodule references Updated reference to mono Fixed target branch for mono --- .gitmodules | 2 +- external/mono | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 49b161473b8..845ed9be3c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "external/mono"] path = external/mono url = https://github.com/mono/mono.git - branch = 2017-04 + branch = 2017-06 [submodule "external/mxe"] path = external/mxe url = https://github.com/xamarin/mxe.git diff --git a/external/mono b/external/mono index 33074493a01..c51d1343f37 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 33074493a01862a720fcfe91ce958f9a78265bc7 +Subproject commit c51d1343f37b5b7a21ee2c0db5188485b7dae295 From 5cf27f9f92d1fa3504f3b3086d2338a1a3f3fe39 Mon Sep 17 00:00:00 2001 From: "ludovic.henry" Date: Thu, 15 Jun 2017 10:44:01 -0400 Subject: [PATCH 10/40] Updated reference to mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index c51d1343f37..00ea5f1e17d 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit c51d1343f37b5b7a21ee2c0db5188485b7dae295 +Subproject commit 00ea5f1e17dcddde3efa14f4ad4f8153804358b7 From 9b74651f9ff763ae556405f5887ffa40729d4cc5 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 20 Jun 2017 17:17:41 +0200 Subject: [PATCH 11/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 00ea5f1e17d..39150458f08 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 00ea5f1e17dcddde3efa14f4ad4f8153804358b7 +Subproject commit 39150458f081b0ba2d47150a1f947ffed6d6d5de From f2e299877cdd786dab54881af85ba01d82eec6a2 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 21 Jun 2017 16:46:37 +0200 Subject: [PATCH 12/40] bump mono, java.interop and linker --- external/Java.Interop | 2 +- external/linker | 2 +- external/mono | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/Java.Interop b/external/Java.Interop index 57e9501193b..b292931362f 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 57e9501193b41e8ed719f68641ec27492e967d6f +Subproject commit b292931362fa0bfc90e3facf30bc767fe89a3dea diff --git a/external/linker b/external/linker index 0cbb1e78717..59dd9e97cb3 160000 --- a/external/linker +++ b/external/linker @@ -1 +1 @@ -Subproject commit 0cbb1e787172bdfd8b2964f683d979e0ba719b41 +Subproject commit 59dd9e97cb39eb54dc69e76758ab0f9ec232854e diff --git a/external/mono b/external/mono index 39150458f08..6471bbd6eff 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 39150458f081b0ba2d47150a1f947ffed6d6d5de +Subproject commit 6471bbd6eff7af265999b15263ab022f1eb3ddc4 From 2b92f3afdd7a678eb083753627a42effeffeacfd Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 21 Jun 2017 16:56:14 +0200 Subject: [PATCH 13/40] bump mono desktop package --- build-tools/dependencies/dependencies.projitems | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems index c181f80ccfc..fc283221801 100644 --- a/build-tools/dependencies/dependencies.projitems +++ b/build-tools/dependencies/dependencies.projitems @@ -1,7 +1,7 @@ - <_DarwinMonoFramework>MonoFramework-MDK-5.4.0.0.macos10.xamarin.universal.pkg + <_DarwinMonoFramework>MonoFramework-MDK-5.4.0.56.macos10.xamarin.universal.pkg <_AptGetInstall>apt-get -f -u install @@ -60,7 +60,7 @@ $(MonoRequiredMinimumVersion) $(MonoRequiredDarwinMinimumVersion) $(MSBuildThisFileDirectory)..\scripts\mono-version - https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-06/b3/b3e79ebc059795e5df52ebb9b0fae54f35621264/$(_DarwinMonoFramework) + https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-06/64/6471bbd6eff7af265999b15263ab022f1eb3ddc4/$(_DarwinMonoFramework) installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target / From 93fd979a5ead5b80a0bc6066eebeee0401ba664c Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 21 Jun 2017 17:03:54 +0200 Subject: [PATCH 14/40] bump MonoRequiredMinimumVersion --- Configuration.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration.props b/Configuration.props index 5e9cd49fadc..d6055bd8813 100644 --- a/Configuration.props +++ b/Configuration.props @@ -51,8 +51,8 @@ $(MSBuildThisFileDirectory)external\Java.Interop $(MSBuildThisFileDirectory)external\llvm $(MSBuildThisFileDirectory)external\mono - 5.2.0 - $(MonoRequiredMinimumVersion).114 + 5.4.0 + $(MonoRequiredMinimumVersion).56 $(MSBuildThisFileDirectory)external\linker $(MSBuildThisFileDirectory)external\opentk $(MSBuildThisFileDirectory)external\libzip From 3559b6080a684038ee9a75f7982cde852c2b63e9 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 18 Jul 2017 22:43:41 +0200 Subject: [PATCH 15/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 6471bbd6eff..07ef3c251b4 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 6471bbd6eff7af265999b15263ab022f1eb3ddc4 +Subproject commit 07ef3c251b40ae2fa216adaf7ba36878d943b736 From 690845bf2cbbedfcc439f46eca5165e97bd767e4 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 19 Jul 2017 12:52:14 +0200 Subject: [PATCH 16/40] bump java.interop --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index b292931362f..6dbd6c05be7 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit b292931362fa0bfc90e3facf30bc767fe89a3dea +Subproject commit 6dbd6c05be7dd3612d7141b039c8aa6e44dd13ae From 86d71649e89da740daa60822ae3948b74202d56f Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 19 Jul 2017 12:55:08 +0200 Subject: [PATCH 17/40] bump libzipsharp --- external/LibZipSharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/LibZipSharp b/external/LibZipSharp index 4617436aebc..1b217dabdef 160000 --- a/external/LibZipSharp +++ b/external/LibZipSharp @@ -1 +1 @@ -Subproject commit 4617436aebce3028e87610eb87c0117c14d9fa87 +Subproject commit 1b217dabdefd5cefa0fdd391498f8cc0462575d6 From e4fc7adee533c5f449300bee38dd50fb610746dc Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 19 Jul 2017 12:56:02 +0200 Subject: [PATCH 18/40] bump linker --- external/linker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/linker b/external/linker index 59dd9e97cb3..4a15891227c 160000 --- a/external/linker +++ b/external/linker @@ -1 +1 @@ -Subproject commit 59dd9e97cb39eb54dc69e76758ab0f9ec232854e +Subproject commit 4a15891227c740a3db381b990c98536aea551bae From 8ca38ceadb6d76f819f6b50efb7660809d423d0c Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 19 Jul 2017 15:41:00 +0200 Subject: [PATCH 19/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 07ef3c251b4..9b3d1a60fc9 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 07ef3c251b40ae2fa216adaf7ba36878d943b736 +Subproject commit 9b3d1a60fc9ed2810f975e182ab33a28ba125318 From 979ab343a8e05936072fcc80fb43f3dd77493839 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 7 Aug 2017 18:48:32 +0200 Subject: [PATCH 20/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 9b3d1a60fc9..28a417c2c0d 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 9b3d1a60fc9ed2810f975e182ab33a28ba125318 +Subproject commit 28a417c2c0d1a2d1231d8b0a5beea3201208b57d From 67672d9be16071515d56109acd7c6f007a16a6b4 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 7 Aug 2017 18:49:05 +0200 Subject: [PATCH 21/40] bump linker --- external/linker | 2 +- external/xamarin-android-api-compatibility | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/linker b/external/linker index 305e0f60533..a85abdbaed0 160000 --- a/external/linker +++ b/external/linker @@ -1 +1 @@ -Subproject commit 305e0f60533d164676099c918fa4dd09c718017b +Subproject commit a85abdbaed03a0780ca815283082d457ff19e7d4 diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility index 6fe9b17fcd2..b5a3ae8b516 160000 --- a/external/xamarin-android-api-compatibility +++ b/external/xamarin-android-api-compatibility @@ -1 +1 @@ -Subproject commit 6fe9b17fcd2bc3e15959717e6707ba4b5cee26f5 +Subproject commit b5a3ae8b516ed0dc67f8034baaeea5bac920b50d From bcab75bd9983f0556b7d1d03c32bf864ecde532b Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 7 Aug 2017 18:49:46 +0200 Subject: [PATCH 22/40] bump java.interop --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 6dbd6c05be7..0ff255eccc3 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 6dbd6c05be7dd3612d7141b039c8aa6e44dd13ae +Subproject commit 0ff255eccc35d6e85680a03e67272d16950f350e From b8157eb445289f0bfa0a39d03be3b9a325c61c96 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 7 Aug 2017 18:50:45 +0200 Subject: [PATCH 23/40] bump libzipsharp --- external/LibZipSharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/LibZipSharp b/external/LibZipSharp index 1b217dabdef..d4735cfbcfa 160000 --- a/external/LibZipSharp +++ b/external/LibZipSharp @@ -1 +1 @@ -Subproject commit 1b217dabdefd5cefa0fdd391498f8cc0462575d6 +Subproject commit d4735cfbcfa1049cc012a8dba8ff036b5062d61f From f10d69cc951771e82d23199b27a565ac58266144 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 7 Aug 2017 22:31:47 +0200 Subject: [PATCH 24/40] revert linker changes from 0bf122c7246274fcce1f5dc17cce4d019e4d7b95 --- .../Xamarin.Android.Build.Tasks.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index 6d9446eb7cc..476dad37b30 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -289,18 +289,12 @@ Linker\Mono.Linker\MethodAction.cs - - Linker\Mono.Linker\MethodReferenceExtensions.cs - Linker\Mono.Linker\Pipeline.cs Linker\Mono.Linker\MethodReferenceExtensions.cs - - Linker\Mono.Linker\TypeReferenceExtensions.cs - Linker\Mono.Linker\TypePreserve.cs From ecfbfb36c5d9407af6cbc4d51c4777ce545d9885 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 8 Aug 2017 00:36:32 +0200 Subject: [PATCH 25/40] revert bump of libzipsharp --- external/LibZipSharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/LibZipSharp b/external/LibZipSharp index d4735cfbcfa..1b217dabdef 160000 --- a/external/LibZipSharp +++ b/external/LibZipSharp @@ -1 +1 @@ -Subproject commit d4735cfbcfa1049cc012a8dba8ff036b5062d61f +Subproject commit 1b217dabdefd5cefa0fdd391498f8cc0462575d6 From 3ba036f0361ee18488451e1f7b94855d69b81dca Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 8 Aug 2017 00:41:06 +0200 Subject: [PATCH 26/40] use d15-4 branch for java.interop --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 0ff255eccc3..cfc2ef32ecf 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 0ff255eccc35d6e85680a03e67272d16950f350e +Subproject commit cfc2ef32ecfbd47dc83efd848a079c975ea87745 From 6ade128799889287fae109e23f3ffc0869e22900 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 8 Aug 2017 00:45:16 +0200 Subject: [PATCH 27/40] bump MDK version --- Configuration.props | 2 +- build-tools/dependencies/dependencies.projitems | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Configuration.props b/Configuration.props index 580de4a137b..cf1b9e9c9b5 100644 --- a/Configuration.props +++ b/Configuration.props @@ -53,7 +53,7 @@ $(MSBuildThisFileDirectory)external\llvm $(MSBuildThisFileDirectory)external\mono 5.4.0 - $(MonoRequiredMinimumVersion).56 + $(MonoRequiredMinimumVersion).147 $(MSBuildThisFileDirectory)external\linker $(MSBuildThisFileDirectory)external\opentk $(MSBuildThisFileDirectory)external\libzip diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems index fc283221801..0591100fc43 100644 --- a/build-tools/dependencies/dependencies.projitems +++ b/build-tools/dependencies/dependencies.projitems @@ -1,7 +1,7 @@ - <_DarwinMonoFramework>MonoFramework-MDK-5.4.0.56.macos10.xamarin.universal.pkg + <_DarwinMonoFramework>MonoFramework-MDK-5.4.0.147.macos10.xamarin.universal.pkg <_AptGetInstall>apt-get -f -u install @@ -60,7 +60,7 @@ $(MonoRequiredMinimumVersion) $(MonoRequiredDarwinMinimumVersion) $(MSBuildThisFileDirectory)..\scripts\mono-version - https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-06/64/6471bbd6eff7af265999b15263ab022f1eb3ddc4/$(_DarwinMonoFramework) + https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-06/28/28a417c2c0d1a2d1231d8b0a5beea3201208b57d/$(_DarwinMonoFramework) installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target / From b92d10a9c49245ca643481dbc8736a2efd5ae075 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 8 Aug 2017 00:47:04 +0200 Subject: [PATCH 28/40] bump xamarin-android-api-compatibility --- external/xamarin-android-api-compatibility | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility index b5a3ae8b516..6fe9b17fcd2 160000 --- a/external/xamarin-android-api-compatibility +++ b/external/xamarin-android-api-compatibility @@ -1 +1 @@ -Subproject commit b5a3ae8b516ed0dc67f8034baaeea5bac920b50d +Subproject commit 6fe9b17fcd2bc3e15959717e6707ba4b5cee26f5 From c6a30693ca8f6efba86cf99fc8c78efa5bb93478 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 8 Aug 2017 00:48:19 +0200 Subject: [PATCH 29/40] bump llvm --- external/llvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/llvm b/external/llvm index 5056b9f2bcb..21492ec92e2 160000 --- a/external/llvm +++ b/external/llvm @@ -1 +1 @@ -Subproject commit 5056b9f2bcb45f0a3d1c676b7f06d4b8249754b3 +Subproject commit 21492ec92e255a43bc6b687468f1eb18a635d94e From 52fbfe803604ae24971b69e5a663bc6f075093fc Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 9 Aug 2017 21:22:45 +0200 Subject: [PATCH 30/40] bump xamarin-android-api-compatibility --- external/xamarin-android-api-compatibility | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility index 6fe9b17fcd2..ed8d914d08b 160000 --- a/external/xamarin-android-api-compatibility +++ b/external/xamarin-android-api-compatibility @@ -1 +1 @@ -Subproject commit 6fe9b17fcd2bc3e15959717e6707ba4b5cee26f5 +Subproject commit ed8d914d08b9906cace0db2258686c9353a82ef2 From 83d9b74175d479419043f91efe3df988250aaad2 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Thu, 10 Aug 2017 22:05:42 +0200 Subject: [PATCH 31/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 28a417c2c0d..490cc373e44 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 28a417c2c0d1a2d1231d8b0a5beea3201208b57d +Subproject commit 490cc373e4415469a0412ebed67c8370b1ade629 From 460b62a0f68cab72bf68cb0ad23c3b232bd35dd8 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Thu, 17 Aug 2017 13:04:52 +0200 Subject: [PATCH 32/40] [debug] dump build output context: https://bugzilla.xamarin.com/show_bug.cgi?id=57828 this commit should be reverted. --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index fb579980427..8ab7d73f23e 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -1527,6 +1527,7 @@ public interface OnFooListener using (var builder = CreateDllBuilder (path, false, false)) { try { builder.Build (proj); + Console.WriteLine ("build output:\n<<<>>>\n" + builder.LastBuildOutput + "\n<<<>>>"); if (failureExpected) Assert.Fail ("Build should fail."); if (expectedWarning == null) From 6bbe4f30ada89f0de49ec06f4ebcdc80ba9c793e Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 22 Aug 2017 11:41:40 +0200 Subject: [PATCH 33/40] bump java.interop hopefully fixes https://bugzilla.xamarin.com/show_bug.cgi?id=57828 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 1cd03611859..33436346553 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 1cd03611859007fd7d59d4c91554463b973a00e3 +Subproject commit 33436346553b7ad1b2e3b922f04f1703b9a9ec64 From 52097a1be958a5951704c5055976e3406a475f02 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Thu, 24 Aug 2017 12:18:39 +0200 Subject: [PATCH 34/40] bump linker --- external/linker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/linker b/external/linker index 07b07ef75fa..9fc2a24b5fc 160000 --- a/external/linker +++ b/external/linker @@ -1 +1 @@ -Subproject commit 07b07ef75fa1858253af45af6fe30812a5a1655c +Subproject commit 9fc2a24b5fc389a3bc3bde85efa1e39b43f1fce0 From d89b91fe0c388948318f7b2bfc8bf312dce7645c Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Sun, 27 Aug 2017 09:03:17 +0200 Subject: [PATCH 35/40] bump xamarin-android-api-compatibility to master --- external/xamarin-android-api-compatibility | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility index 64714d845d3..b26743f1624 160000 --- a/external/xamarin-android-api-compatibility +++ b/external/xamarin-android-api-compatibility @@ -1 +1 @@ -Subproject commit 64714d845d3b5dd256b7feb0c0ff1d65f49e652c +Subproject commit b26743f16240ae3cdab4d40ce8826c0d4cdfff3f From d70f3d38098ced316245ef93b368f55a3b33f775 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Thu, 31 Aug 2017 19:38:55 +0200 Subject: [PATCH 36/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index cbeae566210..1d4fc17faac 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit cbeae56621092bbec44cce7d8eec3a0323a6d7ee +Subproject commit 1d4fc17faacec03f160f9104e236ce8205d02155 From 0685f18e20a79ef8fadf7650c1128b039116fa1b Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 4 Sep 2017 12:32:43 +0200 Subject: [PATCH 37/40] bump mono --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 1d4fc17faac..c81fe5e84d1 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 1d4fc17faacec03f160f9104e236ce8205d02155 +Subproject commit c81fe5e84d1f1c4e0c1ccacab57c4bfb4d27ea62 From 1cb5b912788777563d2dc9f3de9543fd2276faf0 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 5 Sep 2017 17:52:59 +0200 Subject: [PATCH 38/40] Revert "[debug] dump build output" This reverts commit 460b62a0f68cab72bf68cb0ad23c3b232bd35dd8. --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index e47dab70898..b8edb54f55a 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -1548,7 +1548,6 @@ public interface OnFooListener using (var builder = CreateDllBuilder (path, false, false)) { try { builder.Build (proj); - Console.WriteLine ("build output:\n<<<>>>\n" + builder.LastBuildOutput + "\n<<<>>>"); if (failureExpected) Assert.Fail ("Build should fail."); if (expectedWarning == null) From f6c3e6351879b77bc355cfae055d4cd29debcf75 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 5 Sep 2017 17:55:43 +0200 Subject: [PATCH 39/40] minimize diff to master --- .../Xamarin.Android.Build.Tasks.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index 4c5e299b4fb..c2425aa89e4 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -289,12 +289,12 @@ Linker\Mono.Linker\MethodAction.cs - - Linker\Mono.Linker\Pipeline.cs - Linker\Mono.Linker\MethodReferenceExtensions.cs + + Linker\Mono.Linker\Pipeline.cs + Linker\Mono.Linker\TypePreserve.cs From fbbe7259c00d5e038a26b4c25113dd93018b86d7 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 5 Sep 2017 18:26:40 +0200 Subject: [PATCH 40/40] .gitmodules: s/d15-4/master/ for xamarin-android-api-compatibility --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6da5c25b7bf..755d45969d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -39,4 +39,4 @@ [submodule "xamarin-android-api-compatibility"] path = external/xamarin-android-api-compatibility url = https://github.com/xamarin/xamarin-android-api-compatibility.git - branch = d15-4 + branch = master