From 03112dc19c2cfa933df4df0b0bdcf4c66c0d22d2 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 24 May 2019 08:31:04 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.255 Former-commit-id: a809b61efe270682042e308f31b142c7df27f1ca --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- mcs/build/tests.make | 7 ++++--- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/custom-attrs.c | 6 +++++- mono/metadata/loader.c | 14 +++++++++++++- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 ++-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- runtime/Makefile.am | 1 - runtime/Makefile.in | 1 - 50 files changed, 60 insertions(+), 45 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 852d5d495e..6fcfb4e11c 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -b7a19436bc6ba92737945e204fbddc95ba281d6e \ No newline at end of file +74abfccb776ba324a0275fcc0ddb2897bdf001d5 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 43104083fc..b621cb8d36 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -2fb685bad934e0f5daf1a4afa62c5447831979d1 \ No newline at end of file +445ee57c4662662a46c91f4416ed9da910fad8c3 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 596dec74bf..fe4ddee45e 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.0.0.250"; + public const string MonoVersion = "6.0.0.255"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/build/tests.make b/mcs/build/tests.make index c6c8b9548c..eb1de1c0e8 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -329,7 +329,7 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P endif check: run-xunit-test-local -xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt $(test_lib_dir)/Xunit.NetCore.Extensions.dll +xunit-test-local: $(xtest_lib_output) $(test_lib_dir)/xunit-excludes.txt $(test_lib_dir)/Xunit.NetCore.Extensions.dll $(test_lib_dir)/xunit.execution.dotnet.dll run-xunit-test-local: run-xunit-test-lib $(test_lib_dir)/xunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir) @@ -338,14 +338,15 @@ $(test_lib_dir)/xunit-excludes.txt: $(topdir)/build/tests.make | $(test_lib_dir) $(test_lib_dir)/Xunit.NetCore.Extensions.dll: $(topdir)/build/tests.make $(topdir)/../external/xunit-binaries/Xunit.NetCore.Extensions.dll | $(test_lib_dir) @cp -f $(topdir)/../external/xunit-binaries/Xunit.NetCore.Extensions.dll $@ +$(test_lib_dir)/xunit.execution.dotnet.dll: $(topdir)/build/tests.make $(topdir)/../external/xunit-binaries/xunit.execution.dotnet.dll | $(test_lib_dir) + @cp -f $(topdir)/../external/xunit-binaries/xunit.execution.dotnet.dll $@ + # cp -rf is a HACK for xunit runner to require xunit.execution.dOTNET.dll file in local folder on .net only run-xunit-test-lib: xunit-test-local - @cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll $(test_lib_dir)/xunit.execution.dotnet.dll ok=:; \ PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR="$(XTEST_REMOTE_EXECUTOR_ABSPATH)" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xtest_lib_output) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \ if [ -n "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE" ]; then echo "$(abspath $(XTEST_RESULT_FILE))" >> "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE"; fi; \ $$ok - @rm -f $(test_lib_dir)/xunit.execution.dotnet.dll # Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase) $(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs | $(test_lib_dir) diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index 06cb11524d..69d920bf06 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bba1f46f4aa1a182adb7fae0ad835d43103205be \ No newline at end of file +1645b18a9d8dda6529e3cdae726e1c21a2227ba7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 4742a07db3..ab26013cfd 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -9c57ec0f725aa176ef4cf96f981fad5a05dea602 \ No newline at end of file +7a576bb41bd21859526feae7b08e48e9b31fa50c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 7edc279164..f7d8b128f0 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -e3114509056352eca32bb98052f87ff63ed78cfc \ No newline at end of file +be39720ce0c5b32ef632aa70f2e4559d7c10b573 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 7455cd7becbc97416faa6ace6ee9b6e108deb355..54172d1086b378b3c2a4ef2b9acda976129caf54 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ>|OSNfsD0`0W=H{&Y$D?;iMNyu4B5`fSuGcx6lj$u?7P* Q04kTDeE}-Bt`h-La2tmiQvd(} delta 58 zcmV-A0LA}+hz5X&29SsZe9E(kfsD0`0W=H{-Ws0ElSj!)yzvA<+nU<)x6lj$u?7P$ Q04kTDeE}-Bt`h-LaQBHAoB#j- diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index 897c22ad59..e8f846265e 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7609b7638cf30c5dc14ac3a4d3219393d5660cd9 \ No newline at end of file +5594789749490508283bf82b09672da5f4310d25 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 82a5448cf0..5dc0f32e3b 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d4608bcc96e9e2117d3f4ecc19bb20af4826f17e \ No newline at end of file +3793ea7f306407ceac890e0dc1f0048946374e59 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 989190d822..2cf60eb3a8 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ab7ea80519c4dbad0c6366395afdd14302f6eb3b \ No newline at end of file +5dcca253494d6da57816a6e9c9702b3a3a4723e4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 71c94c6590..85b31600a8 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -c46338c204644399b8e25c5f868445c74c51965c \ No newline at end of file +042d381ea6d1a6bc1d3ca453f46804a982a2bdbf \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index 06cb11524d..69d920bf06 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bba1f46f4aa1a182adb7fae0ad835d43103205be \ No newline at end of file +1645b18a9d8dda6529e3cdae726e1c21a2227ba7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 4742a07db3..ab26013cfd 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -9c57ec0f725aa176ef4cf96f981fad5a05dea602 \ No newline at end of file +7a576bb41bd21859526feae7b08e48e9b31fa50c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 7edc279164..f7d8b128f0 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -e3114509056352eca32bb98052f87ff63ed78cfc \ No newline at end of file +be39720ce0c5b32ef632aa70f2e4559d7c10b573 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 7455cd7becbc97416faa6ace6ee9b6e108deb355..54172d1086b378b3c2a4ef2b9acda976129caf54 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ>|OSNfsD0`0W=H{&Y$D?;iMNyu4B5`fSuGcx6lj$u?7P* Q04kTDeE}-Bt`h-La2tmiQvd(} delta 58 zcmV-A0LA}+hz5X&29SsZe9E(kfsD0`0W=H{-Ws0ElSj!)yzvA<+nU<)x6lj$u?7P$ Q04kTDeE}-Bt`h-LaQBHAoB#j- diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index 897c22ad59..e8f846265e 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7609b7638cf30c5dc14ac3a4d3219393d5660cd9 \ No newline at end of file +5594789749490508283bf82b09672da5f4310d25 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 82a5448cf0..5dc0f32e3b 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d4608bcc96e9e2117d3f4ecc19bb20af4826f17e \ No newline at end of file +3793ea7f306407ceac890e0dc1f0048946374e59 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 989190d822..2cf60eb3a8 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ab7ea80519c4dbad0c6366395afdd14302f6eb3b \ No newline at end of file +5dcca253494d6da57816a6e9c9702b3a3a4723e4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 71c94c6590..85b31600a8 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -c46338c204644399b8e25c5f868445c74c51965c \ No newline at end of file +042d381ea6d1a6bc1d3ca453f46804a982a2bdbf \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index 06cb11524d..69d920bf06 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bba1f46f4aa1a182adb7fae0ad835d43103205be \ No newline at end of file +1645b18a9d8dda6529e3cdae726e1c21a2227ba7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 4742a07db3..ab26013cfd 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -9c57ec0f725aa176ef4cf96f981fad5a05dea602 \ No newline at end of file +7a576bb41bd21859526feae7b08e48e9b31fa50c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 7edc279164..f7d8b128f0 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -e3114509056352eca32bb98052f87ff63ed78cfc \ No newline at end of file +be39720ce0c5b32ef632aa70f2e4559d7c10b573 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 7455cd7becbc97416faa6ace6ee9b6e108deb355..54172d1086b378b3c2a4ef2b9acda976129caf54 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ>|OSNfsD0`0W=H{&Y$D?;iMNyu4B5`fSuGcx6lj$u?7P* Q04kTDeE}-Bt`h-La2tmiQvd(} delta 58 zcmV-A0LA}+hz5X&29SsZe9E(kfsD0`0W=H{-Ws0ElSj!)yzvA<+nU<)x6lj$u?7P$ Q04kTDeE}-Bt`h-LaQBHAoB#j- diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index 897c22ad59..e8f846265e 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7609b7638cf30c5dc14ac3a4d3219393d5660cd9 \ No newline at end of file +5594789749490508283bf82b09672da5f4310d25 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 82a5448cf0..5dc0f32e3b 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d4608bcc96e9e2117d3f4ecc19bb20af4826f17e \ No newline at end of file +3793ea7f306407ceac890e0dc1f0048946374e59 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 989190d822..2cf60eb3a8 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ab7ea80519c4dbad0c6366395afdd14302f6eb3b \ No newline at end of file +5dcca253494d6da57816a6e9c9702b3a3a4723e4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 71c94c6590..85b31600a8 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -c46338c204644399b8e25c5f868445c74c51965c \ No newline at end of file +042d381ea6d1a6bc1d3ca453f46804a982a2bdbf \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index 06cb11524d..69d920bf06 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bba1f46f4aa1a182adb7fae0ad835d43103205be \ No newline at end of file +1645b18a9d8dda6529e3cdae726e1c21a2227ba7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index 4742a07db3..ab26013cfd 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -9c57ec0f725aa176ef4cf96f981fad5a05dea602 \ No newline at end of file +7a576bb41bd21859526feae7b08e48e9b31fa50c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index dfe024bff5..fb4fc05d4b 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -a02d6fdb948a5fb6664bf1838df101b48446e3ab \ No newline at end of file +83238e18a66e32663b31dfe6d990d92ee6e3315b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index 7455cd7becbc97416faa6ace6ee9b6e108deb355..54172d1086b378b3c2a4ef2b9acda976129caf54 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ>|OSNfsD0`0W=H{&Y$D?;iMNyu4B5`fSuGcx6lj$u?7P* Q04kTDeE}-Bt`h-La2tmiQvd(} delta 58 zcmV-A0LA}+hz5X&29SsZe9E(kfsD0`0W=H{-Ws0ElSj!)yzvA<+nU<)x6lj$u?7P$ Q04kTDeE}-Bt`h-LaQBHAoB#j- diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index 897c22ad59..e8f846265e 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7609b7638cf30c5dc14ac3a4d3219393d5660cd9 \ No newline at end of file +5594789749490508283bf82b09672da5f4310d25 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 82a5448cf0..5dc0f32e3b 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d4608bcc96e9e2117d3f4ecc19bb20af4826f17e \ No newline at end of file +3793ea7f306407ceac890e0dc1f0048946374e59 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 989190d822..2cf60eb3a8 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ab7ea80519c4dbad0c6366395afdd14302f6eb3b \ No newline at end of file +5dcca253494d6da57816a6e9c9702b3a3a4723e4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 593c76f262..f15a7d4a33 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b10645ffc16347748b34c442ecaaac3b6ad5381f \ No newline at end of file +f7c944f681aba0e422c9307d78ccf79af7486a16 \ No newline at end of file diff --git a/mono/metadata/custom-attrs.c b/mono/metadata/custom-attrs.c index 35504b3c8e..a7d5664045 100644 --- a/mono/metadata/custom-attrs.c +++ b/mono/metadata/custom-attrs.c @@ -980,15 +980,19 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const guchar *data, gu mono_property_set_value_handle (prop, attr, pparams, error); goto_if_nok (error, fail); } + + g_free (name); + name = NULL; } goto exit; fail: + g_free (name); + name = NULL; attr = mono_new_null (); exit: if (field && !type_is_reference (field->type)) g_free (val); - g_free (name); if (prop_type && !type_is_reference (prop_type)) g_free (pparams [0]); if (params) { diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index 0259582ed9..7d5b7d1749 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -1382,8 +1382,20 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char base = g_path_get_dirname (resolvedname); newbase = g_path_get_dirname(base); - mdirname = g_strdup_printf ("%s/lib", newbase); + // On Android the executable for the application is going to be /system/bin/app_process{32,64} depending on + // the application's architecture. However, libraries for the different architectures live in different + // subdirectories of `/system`: `lib` for 32-bit apps and `lib64` for 64-bit ones. Thus appending `/lib` below + // will fail to load the DSO for a 64-bit app, even if it exists there, because it will have a different + // architecture. This is the cause of https://github.com/xamarin/xamarin-android/issues/2780 and the ifdef + // below is the fix. + mdirname = g_strdup_printf ( +#if defined(TARGET_ANDROID) && (defined(TARGET_ARM64) || defined(TARGET_AMD64)) + "%s/lib64", +#else + "%s/lib", +#endif + newbase); g_free (resolvedname); g_free (base); g_free (newbase); diff --git a/mono/mini/version.h b/mono/mini/version.h index b88768c0a0..1ffb95cee8 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/f7ad4b2" +#define FULL_VERSION "explicit/3dc72cf" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index bbe3c305164ff7eb180bc44432830d3f35a656d7..fa9895eb82bc07396feae05b5ddf5210cad01c13 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKB1p^B!1LMtaxQw^}N_Pfz delta 20 bcmbQIHBW29Q!aL61p^B!1EbAvxQw^}N@WIf diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index fab441a6bb..79da5775a9 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -b53812eacfd987d781ffdd4fbc6d8dcb29839e82 \ No newline at end of file +47c5a3a0dc1ec2a89eef681d8673760a7de8b2e9 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index a3f9df6a89cfde0311e5767f71b9244201242772..aa9b935bfdfc4203f211c63fd899b6fbc85bcb66 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)6f`NsVf$?Tj#VK+CQI`g* delta 20 bcmX?Ef3kjqo+7)kf`NsVfzf7D#VK+CQH2Jn diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 420e0beea0..c22d9bc714 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -574d892128f6da2b8a7240c7968cb0c29c3ed6ad \ No newline at end of file +b01c6bed94f3c20d2d50a14aa169f1f0d426960b \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 0afa7d279e04d2bc6e91d760f6418003eaf4ce3d..808dcc9bf53f8047c251ed9c36eb4526a5f92d2f 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>?R5Z7FGtvoB7oXv;bh~2L}KE delta 22 dcmeyri1Gg-#tj_m?8XWP7FGsEoB7oXv;bh&2L%8C diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 51e2805722..241dc47cd2 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -8da70e9a9cc41ab7eebadb274e5413617d1e7193 \ No newline at end of file +9f73d81c97f48dac3ba0b234a9b334ceef540bee \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index b0d255752e..b269a4601f 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.0.0.250\n" +"Project-Id-Version: mono 6.0.0.255\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-05-23 08:02+0000\n" +"POT-Creation-Date: 2019-05-24 08:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 12a60a076111b42fec65cc5001bdb4230adc681f..19b9a64b5ee4832e6b66a8c24201a2c8f705afae 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*-aD-EUXNSH>XZzYzF{s;0S#H delta 22 ecmaF1gXP%{mJM-J*^LzpEUXNSHm6QyYzF{s&Io$| diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 62c5519a40..42a62136bf 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -98a02b68f4306d15ac19f263c93fb9fcd0ef8771 \ No newline at end of file +167beee473f717211b3d25f8f73968c2fbe1cba1 \ No newline at end of file diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 22c0f61b97..5cc6a2897e 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -170,7 +170,6 @@ test-bundle-local: cp -L -R $(mcs_topdir)/class/lib/$$profile $(TEST_BUNDLE_PATH); \ done cp -L $(top_srcdir)/external/xunit-binaries/*.dll $(top_srcdir)/external/xunit-binaries/*.exe $(top_srcdir)/external/xunit-binaries/*.config $(TEST_BUNDLE_PATH)/net_4_x/ - cp -L $(top_srcdir)/external/xunit-binaries/xunit.execution.dotnet.dll $(TEST_BUNDLE_PATH)/net_4_x/tests/ $(MAKE) -C $(mcs_topdir)/tests test-bundle $(MAKE) -C $(mcs_topdir)/errors test-bundle $(MAKE) -C $(mcs_topdir)/packages test-bundle diff --git a/runtime/Makefile.in b/runtime/Makefile.in index f93bd45f07..362d388d89 100644 --- a/runtime/Makefile.in +++ b/runtime/Makefile.in @@ -718,7 +718,6 @@ test-bundle-local: cp -L -R $(mcs_topdir)/class/lib/$$profile $(TEST_BUNDLE_PATH); \ done cp -L $(top_srcdir)/external/xunit-binaries/*.dll $(top_srcdir)/external/xunit-binaries/*.exe $(top_srcdir)/external/xunit-binaries/*.config $(TEST_BUNDLE_PATH)/net_4_x/ - cp -L $(top_srcdir)/external/xunit-binaries/xunit.execution.dotnet.dll $(TEST_BUNDLE_PATH)/net_4_x/tests/ $(MAKE) -C $(mcs_topdir)/tests test-bundle $(MAKE) -C $(mcs_topdir)/errors test-bundle $(MAKE) -C $(mcs_topdir)/packages test-bundle