From 76cef038dc5159c1211bc3149408f2aa3bc8cbbd Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 5 Jun 2017 18:53:13 -0400 Subject: [PATCH 01/39] 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/39] [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/39] [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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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/39] 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 edfca92f112b63d5278bfff7482ba254594a6d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Thu, 20 Jul 2017 20:57:54 +0200 Subject: [PATCH 20/39] [monodroid] Update to new profiler init symbol name. --- src/monodroid/jni/monodroid-glue.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/monodroid/jni/monodroid-glue.c b/src/monodroid/jni/monodroid-glue.c index 57183905b96..d928b106f85 100644 --- a/src/monodroid/jni/monodroid-glue.c +++ b/src/monodroid/jni/monodroid-glue.c @@ -3423,7 +3423,7 @@ set_trace_options (void) /* Profiler support cribbed from mono/metadata/profiler.c */ typedef void (*ProfilerInitializer) (const char*); -#define INITIALIZER_NAME "mono_profiler_startup" +#define INITIALIZER_NAME "mono_profiler_init" static mono_bool load_profiler (void *handle, const char *desc, const char *symbol) @@ -3467,7 +3467,7 @@ load_embedded_profiler (const char *desc, const char *name) } static mono_bool -load_profiler_from_directory (const char *directory, const char *libname, const char *desc) +load_profiler_from_directory (const char *directory, const char *libname, const char *desc, const char *name) { char *full_name = path_combine (directory, libname); int exists = file_exists (full_name); @@ -3482,7 +3482,9 @@ load_profiler_from_directory (const char *directory, const char *libname, const free (full_name); if (h) { - mono_bool result = load_profiler (h, desc, INITIALIZER_NAME); + char *symbol = monodroid_strdup_printf ("%s_%s", INITIALIZER_NAME, name); + mono_bool result = load_profiler (h, desc, symbol); + free (symbol); if (result) return 1; dlclose (h); @@ -3512,18 +3514,18 @@ monodroid_profiler_load (const char *libmono_path, const char *desc, const char for (oi = 0; oi < MAX_OVERRIDES; ++oi) { if (!directory_exists (override_dirs [oi])) continue; - if ((found = load_profiler_from_directory (override_dirs [oi], libname, desc))) + if ((found = load_profiler_from_directory (override_dirs [oi], libname, desc, mname))) break; } do { if (found) break; - if ((found = load_profiler_from_directory (app_libdir, libname, desc))) + if ((found = load_profiler_from_directory (app_libdir, libname, desc, mname))) break; if ((found = load_embedded_profiler (desc, mname))) break; - if (libmono_path != NULL && (found = load_profiler_from_directory (libmono_path, libname, desc))) + if (libmono_path != NULL && (found = load_profiler_from_directory (libmono_path, libname, desc, mname))) break; } while (0); From 979ab343a8e05936072fcc80fb43f3dd77493839 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 7 Aug 2017 18:48:32 +0200 Subject: [PATCH 21/39] 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 22/39] 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 23/39] 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 24/39] 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 25/39] 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 92d3d7183e1b3a139b8ec9533c22d7fdb633ccd5 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Mon, 7 Aug 2017 10:35:41 -0400 Subject: [PATCH 26/39] Bump mono to 2017-08 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 28a417c2c0d..9417be0f118 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 28a417c2c0d1a2d1231d8b0a5beea3201208b57d +Subproject commit 9417be0f1183e100e7c88953d5944e1a59d5ef5f From 957e4341e9bd62b242701bba49f9b571c8d86175 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Mon, 7 Aug 2017 11:03:45 -0400 Subject: [PATCH 27/39] MonoRequiredMinimumVersion 5.6.0.0 --- Configuration.props | 4 ++-- build-tools/dependencies/dependencies.projitems | 4 ++-- external/LibZipSharp | 2 +- external/xamarin-android-api-compatibility | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Configuration.props b/Configuration.props index 580de4a137b..bc6d3e359a4 100644 --- a/Configuration.props +++ b/Configuration.props @@ -52,8 +52,8 @@ $(MSBuildThisFileDirectory)external\Java.Interop $(MSBuildThisFileDirectory)external\llvm $(MSBuildThisFileDirectory)external\mono - 5.4.0 - $(MonoRequiredMinimumVersion).56 + 5.6.0 + $(MonoRequiredMinimumVersion).0 $(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..731ecae1483 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.6.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-06/64/6471bbd6eff7af265999b15263ab022f1eb3ddc4/$(_DarwinMonoFramework) + https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-08/94/9417be0f1183e100e7c88953d5944e1a59d5ef5f/$(_DarwinMonoFramework) installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target / 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 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 7072bc0576278a8a96e53b9d1ecd45aa42993e5e Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Mon, 7 Aug 2017 16:03:47 -0400 Subject: [PATCH 28/39] Update .gitmodules references --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 755d45969d4..0794a0feee4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "external/mono"] path = external/mono url = https://github.com/mono/mono.git - branch = 2017-06 + branch = 2017-08 [submodule "external/mxe"] path = external/mxe url = https://github.com/xamarin/mxe.git From f14523029a8a60b29d43848e538470c33d3bc1d1 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Mon, 7 Aug 2017 15:47:03 -0400 Subject: [PATCH 29/39] [mono-runtimes] eglib\config.h doesn't exist anymore Mono doesn't use a separate autoconf for eglib anymore --- build-tools/mono-runtimes/mono-runtimes.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets index ea46d000f17..1a931f26136 100644 --- a/build-tools/mono-runtimes/mono-runtimes.targets +++ b/build-tools/mono-runtimes/mono-runtimes.targets @@ -267,11 +267,11 @@ /> <_RuntimeEglibHeaderSource Condition=" '%(_MonoRuntime.DoBuild)' == 'True' " - Include="@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\eglib\config.h');@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\eglib\src\eglib-config.h')" + Include="@(_MonoRuntime->'$(IntermediateOutputPath)\%(Identity)\eglib\src\eglib-config.h')" /> <_RuntimeEglibHeaderOutput Condition=" '%(_MonoRuntime.DoBuild)' == 'True' " - Include="@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\config.h');@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\eglib-config.h')" + Include="@(_MonoRuntime->'$(_OutputIncludeDir)%(Identity)\eglib\eglib-config.h')" /> <_MonoConstsSource Condition=" '%(_MonoRuntime.DoBuild)' == 'True' " From a8393c67492610e0ade0e41a6a424aed520ed738 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Tue, 8 Aug 2017 18:23:14 -0400 Subject: [PATCH 30/39] Bump mono@74a8e56233f Should fix cross compiler build error in goutput.c --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 9417be0f118..74a8e56233f 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 9417be0f1183e100e7c88953d5944e1a59d5ef5f +Subproject commit 74a8e56233f4a1c093b49e650daa3f03febe63b3 From 46603aa8f8ad41c35a9930212bbb7c1bad1eb9e2 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 8 Aug 2017 00:48:19 +0200 Subject: [PATCH 31/39] 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 8f75b7b175feb3929466e946cbb0428b6f807b34 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 9 Aug 2017 21:22:45 +0200 Subject: [PATCH 32/39] 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 b5391128acf89a92e88682078c00dac885d64a7b Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 10 Aug 2017 14:04:13 -0400 Subject: [PATCH 33/39] Bump to Java.Interop/master/1cd03611 (#732) Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=56436 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 0ff255eccc3..1cd03611859 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 0ff255eccc35d6e85680a03e67272d16950f350e +Subproject commit 1cd03611859007fd7d59d4c91554463b973a00e3 From cedcacd2ae7e4ed7e854ce84ea9ca6f6e986ac17 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Fri, 11 Aug 2017 11:24:29 -0400 Subject: [PATCH 34/39] Bump mono/mono@ed0f1b4 This fixes the following test failures: ``` Xamarin.Android.Build.Tests.BuildTest.BuildAotApplication("armeabi-v7a",True,True) Xamarin.Android.Build.Tests.BuildTest.BuildAotApplicationAndBundle("armeabi-v7a",True,True) ``` --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 74a8e56233f..ed0f1b49927 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 74a8e56233f4a1c093b49e650daa3f03febe63b3 +Subproject commit ed0f1b49927b971560762c556570a038408e1a5a From 028c11b2b92f3e874e627eb61e45c29f625d9c73 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Tue, 22 Aug 2017 09:43:58 -0400 Subject: [PATCH 35/39] bump xamarin/java.interop@3343634 Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=57828 These failing tests should be fixed: Xamarin.Android.Build.Tests.BuildTest.GeneratorValidateMultiMethodEventName(False,null," Date: Tue, 12 Sep 2017 16:43:59 -0400 Subject: [PATCH 36/39] Bump mono to 2017-08 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index c843b3f25ff..ad9daeaf581 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit c843b3f25ffa261a36f1ba11e9b0fe65c9fd9af2 +Subproject commit ad9daeaf581c41876815564924c59ee6a239d365 From c28b02026b00d8c1dfe62f1dd534369116669dfa Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 20 Sep 2017 11:41:42 -0400 Subject: [PATCH 37/39] Avoid dumping the content of libmono-profiler-log.so when test in failing --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 77b3499a74e..34ef2e2bd54 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 @@ -1054,9 +1054,11 @@ public void CheckWhichRuntimeIsIncluded (string[] supportedAbi, bool debugSymbol Assert.AreEqual (runtime.Size, inApkRuntime.Size, "expected {0} got {1}", expectedRuntime, inApkRuntime.Runtime); inApk = ZipHelper.ReadFileFromZip (apk, string.Format ("lib/{0}/libmono-profiler-log.so", abi)); if (string.Compare (expectedRuntime, "debug", StringComparison.OrdinalIgnoreCase) == 0) { - Assert.IsNotNull (inApk, "libmono-profiler-log.so should exist in the apk."); + if (inApk == null) + Assert.Fail ("libmono-profiler-log.so should exist in the apk."); } else { - Assert.IsNull (inApk, "libmono-profiler-log.so should not exist in the apk."); + if (inApk != null) + Assert.Fail ("libmono-profiler-log.so should not exist in the apk."); } } } From 1ce74e4677f7706ad7ea71931a10ace0cbe9fc6a Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Mon, 25 Sep 2017 14:37:13 -0400 Subject: [PATCH 38/39] Bump to mono/mono@d5885b19 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index ad9daeaf581..d5885b19969 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit ad9daeaf581c41876815564924c59ee6a239d365 +Subproject commit d5885b1996981be4293106f866a95685b64816e4 From a86a1cd0999538ab1758641f5cdc9c32a4b91866 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Fri, 6 Oct 2017 10:37:46 -0400 Subject: [PATCH 39/39] Bump to mono/mono@b7422c2c --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index d5885b19969..b7422c2c225 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit d5885b1996981be4293106f866a95685b64816e4 +Subproject commit b7422c2c22547cd60d493d6db9cfc2a3f66a04c1