From 4ef9806e20cb3a16065c877ffcd0c1c723583150 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 20 Jun 2019 08:46:44 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.306 Former-commit-id: 58cb7579391a671b2202bbacaa30a8521a188a93 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 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.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/external-only.c | 7 ++++++- mono/mini/version.h | 2 +- mono/profiler/log.c.REMOVED.git-id | 2 +- mono/unit-tests/Makefile.in | 4 ++-- mono/utils/mono-threads-coop.h | 6 +----- mono/utils/mono-threads.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 +- 50 files changed, 49 insertions(+), 48 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index ff1dfa5153..947b413b47 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -31a9498daf6bb155f2123b3ecd7faa579ade4c98 \ No newline at end of file +c48be7e29de6b82f66ccf3bb75aca7896ab3d884 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 0b54d12933..a10d1d50b7 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -e17288b2e852e32474aebf862e6347b06e6cd2a2 \ No newline at end of file +4dec026a8bfffef65a1ed8299e0eb45feb636dfc \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 39bb380bf1..b061133a06 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.302"; + public const string MonoVersion = "6.0.0.306"; 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/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 8c46b9d160..cefaf13ca8 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -707e0df8d36d7e873f6a93d82ff286a0e675825a \ No newline at end of file +404f25458c2c32cfe1450e0a7306093972cefbd2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 4893544c76..171eceb570 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e0cfa451b476ede754a8d5bb0ecaf177b2506b98 \ No newline at end of file +e75ae226aa0e0864a53c5ee44242b8bf9256607e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 6720037e6c..2f12f30559 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -a8e0dec34755f207498bca98116670d810e34bd7 \ No newline at end of file +34073db9a5ef7ccdcc7b6152716b068b2e426bb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index 687c305391eb6acb2afd2605895253b0bfb834b5..bac02bb576f4d852689bb2d54fc62f6f2d74631c 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZF%_Y)fsD0`0W1s<5k`dliUoc|y5FzMFRi!4x5x|uv<3q< Q04kTDeE}-BsS^QLaHt<8 diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 13b196a55c..e3bf4db286 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -00060537c5a7b8b3b1b854dc6199b695e1084f0a \ No newline at end of file +e717f7a8bc6f721bb081fa1abe563dee384724a8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index d30af8b513..02c67a0627 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ef46214686b5696543af92d0c70196ba0b943a6d \ No newline at end of file +23711c4a9b9ec04b46a2db7839293bcae131b6fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index ef3e7c1443..adf46b976f 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -1b047b44ee58aa8a884a47305868b76578a88ff3 \ No newline at end of file +b0a022225d70931c15e24955a4ea32e98c1e3e82 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index b69d60bb7e..bedb307724 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a1d786bde0d6c4c74526dc14a87da6a44f9279ad \ No newline at end of file +4ccdacb28b157affe97addec35459eb8d29694dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 8c46b9d160..cefaf13ca8 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -707e0df8d36d7e873f6a93d82ff286a0e675825a \ No newline at end of file +404f25458c2c32cfe1450e0a7306093972cefbd2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 4893544c76..171eceb570 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e0cfa451b476ede754a8d5bb0ecaf177b2506b98 \ No newline at end of file +e75ae226aa0e0864a53c5ee44242b8bf9256607e \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 6720037e6c..2f12f30559 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -a8e0dec34755f207498bca98116670d810e34bd7 \ No newline at end of file +34073db9a5ef7ccdcc7b6152716b068b2e426bb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index 687c305391eb6acb2afd2605895253b0bfb834b5..bac02bb576f4d852689bb2d54fc62f6f2d74631c 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZF%_Y)fsD0`0W1s<5k`dliUoc|y5FzMFRi!4x5x|uv<3q< Q04kTDeE}-BsS^QLaHt<8 diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 13b196a55c..e3bf4db286 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -00060537c5a7b8b3b1b854dc6199b695e1084f0a \ No newline at end of file +e717f7a8bc6f721bb081fa1abe563dee384724a8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index d30af8b513..02c67a0627 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ef46214686b5696543af92d0c70196ba0b943a6d \ No newline at end of file +23711c4a9b9ec04b46a2db7839293bcae131b6fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index ef3e7c1443..adf46b976f 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -1b047b44ee58aa8a884a47305868b76578a88ff3 \ No newline at end of file +b0a022225d70931c15e24955a4ea32e98c1e3e82 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index b69d60bb7e..bedb307724 100644 --- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a1d786bde0d6c4c74526dc14a87da6a44f9279ad \ No newline at end of file +4ccdacb28b157affe97addec35459eb8d29694dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 8c46b9d160..cefaf13ca8 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -707e0df8d36d7e873f6a93d82ff286a0e675825a \ No newline at end of file +404f25458c2c32cfe1450e0a7306093972cefbd2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 4893544c76..171eceb570 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e0cfa451b476ede754a8d5bb0ecaf177b2506b98 \ No newline at end of file +e75ae226aa0e0864a53c5ee44242b8bf9256607e \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 6720037e6c..2f12f30559 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -a8e0dec34755f207498bca98116670d810e34bd7 \ No newline at end of file +34073db9a5ef7ccdcc7b6152716b068b2e426bb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index 687c305391eb6acb2afd2605895253b0bfb834b5..bac02bb576f4d852689bb2d54fc62f6f2d74631c 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZF%_Y)fsD0`0W1s<5k`dliUoc|y5FzMFRi!4x5x|uv<3q< Q04kTDeE}-BsS^QLaHt<8 diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 13b196a55c..e3bf4db286 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -00060537c5a7b8b3b1b854dc6199b695e1084f0a \ No newline at end of file +e717f7a8bc6f721bb081fa1abe563dee384724a8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index d30af8b513..02c67a0627 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ef46214686b5696543af92d0c70196ba0b943a6d \ No newline at end of file +23711c4a9b9ec04b46a2db7839293bcae131b6fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index ef3e7c1443..adf46b976f 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -1b047b44ee58aa8a884a47305868b76578a88ff3 \ No newline at end of file +b0a022225d70931c15e24955a4ea32e98c1e3e82 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index b69d60bb7e..bedb307724 100644 --- a/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a1d786bde0d6c4c74526dc14a87da6a44f9279ad \ No newline at end of file +4ccdacb28b157affe97addec35459eb8d29694dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 8c46b9d160..cefaf13ca8 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -707e0df8d36d7e873f6a93d82ff286a0e675825a \ No newline at end of file +404f25458c2c32cfe1450e0a7306093972cefbd2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 4893544c76..171eceb570 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e0cfa451b476ede754a8d5bb0ecaf177b2506b98 \ No newline at end of file +e75ae226aa0e0864a53c5ee44242b8bf9256607e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 89dc8dba3a..79a9a1c2a4 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -7fc95be03837f157066d246f3e7ac3f2c7ced403 \ No newline at end of file +a17a0c96ae88165365add3ba94c0903b1572a845 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index 687c305391eb6acb2afd2605895253b0bfb834b5..bac02bb576f4d852689bb2d54fc62f6f2d74631c 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZF%_Y)fsD0`0W1s<5k`dliUoc|y5FzMFRi!4x5x|uv<3q< Q04kTDeE}-BsS^QLaHt<8 diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id index 13b196a55c..e3bf4db286 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -00060537c5a7b8b3b1b854dc6199b695e1084f0a \ No newline at end of file +e717f7a8bc6f721bb081fa1abe563dee384724a8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id index d30af8b513..02c67a0627 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ef46214686b5696543af92d0c70196ba0b943a6d \ No newline at end of file +23711c4a9b9ec04b46a2db7839293bcae131b6fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id index ef3e7c1443..adf46b976f 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -1b047b44ee58aa8a884a47305868b76578a88ff3 \ No newline at end of file +b0a022225d70931c15e24955a4ea32e98c1e3e82 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id index e1e8b70b39..dc8ac52a28 100644 --- a/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -c5c13a9dfb924885908c55b62252c3cd2a543a99 \ No newline at end of file +6e094419447718425554d31f74c0d83013347327 \ No newline at end of file diff --git a/mono/metadata/external-only.c b/mono/metadata/external-only.c index 25d6f3ab2d..2a959fc87f 100644 --- a/mono/metadata/external-only.c +++ b/mono/metadata/external-only.c @@ -92,7 +92,12 @@ mono_gchandle_get_target (uint32_t gchandle) void mono_gchandle_free (uint32_t gchandle) { - MONO_EXTERNAL_ONLY_GC_UNSAFE_VOID (mono_gchandle_free_internal (gchandle)); + /* Xamarin.Mac and Xamarin.iOS can call this from a worker thread + * that's not attached to the runtime. This is okay for SGen because + * the gchandle code is lockfree. SGen calls back into Mono which + * fires a profiler event, so the profiler must be prepared to be + * called from threads that aren't attached to Mono. */ + MONO_EXTERNAL_ONLY_VOID (mono_gchandle_free_internal (gchandle)); } /* GC write barriers support */ diff --git a/mono/mini/version.h b/mono/mini/version.h index 32899223ad..3eaad9bd8e 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/fdf6490" +#define FULL_VERSION "explicit/537654c" diff --git a/mono/profiler/log.c.REMOVED.git-id b/mono/profiler/log.c.REMOVED.git-id index 4a008e6941..53fb50897d 100644 --- a/mono/profiler/log.c.REMOVED.git-id +++ b/mono/profiler/log.c.REMOVED.git-id @@ -1 +1 @@ -66f6acf9cdb8bac60cf62e7562b4e29c0f443623 \ No newline at end of file +300d3839a9130f1dac2a73e34a2a704a1540a0bd \ No newline at end of file diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index c76614316c..47ebd13f51 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1443,10 +1443,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@CROSS_COMPILE_TRUE@clean-local: -@HOST_WIN32_TRUE@clean-local: @CROSS_COMPILE_TRUE@test-local: @HOST_WIN32_TRUE@test-local: +@CROSS_COMPILE_TRUE@clean-local: +@HOST_WIN32_TRUE@clean-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/mono/utils/mono-threads-coop.h b/mono/utils/mono-threads-coop.h index c9a08975d5..4a15830f9a 100644 --- a/mono/utils/mono-threads-coop.h +++ b/mono/utils/mono-threads-coop.h @@ -116,11 +116,7 @@ void mono_threads_suspend_override_policy (MonoThreadsSuspendPolicy new_policy); * runtime assertion error when trying to switch the state of the current thread. */ -G_EXTERN_C // due to THREAD_INFO_TYPE varying -gpointer -mono_threads_enter_gc_safe_region_with_info (THREAD_INFO_TYPE *info, MonoStackData *stackdata); - -G_EXTERN_C // due to THREAD_INFO_TYPE varying +MONO_PROFILER_API gpointer mono_threads_enter_gc_safe_region_with_info (THREAD_INFO_TYPE *info, MonoStackData *stackdata); diff --git a/mono/utils/mono-threads.h b/mono/utils/mono-threads.h index c5ac08e69c..0e08256d01 100644 --- a/mono/utils/mono-threads.h +++ b/mono/utils/mono-threads.h @@ -432,7 +432,7 @@ MONO_API void* mono_thread_info_get_tools_data (void); -THREAD_INFO_TYPE* +MONO_PROFILER_API THREAD_INFO_TYPE* mono_thread_info_current_unchecked (void); MONO_API int diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 53bccd187cefb0f0401369103a1579e8caed7840..117913674ee7f2449f9a293769312953a731b24e 100644 GIT binary patch delta 21 ccmbQIHBW296D|%T0|f&MD?_8rZ@7%O08j@8qW}N^ delta 21 ccmbQIHBW296D|%zQw0MHD+7zoZ@7%O08mo~tN;K2 diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 1d8afc77f1..45a0bf73cf 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -677dc9591de53fcfdbd708940b441191503b3496 \ No newline at end of file +814a42669cfe295824bba461960c5ab84f5da358 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 19ebfa8b6f5999ac03a2ce56f9f89b43540f6b4f..65047f611db7ee26313d9138278852bb6b6bdf4d 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|Et#fr5dBm7&pQQ^hHA09S_w*#H0l delta 21 ccmX?Ef3kjqt|Et_se*xpm4U@(Q^hHA09Vrn;s5{u diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 0bcabf0763..7e995c9e72 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -907ea4e25da95b086f1327c2357ee1e995071bd4 \ No newline at end of file +d5dafd6b5594a762280937ec2c005a92cf61a73b \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index f43a20057cd89d16e5dc1c919f985f0d93eb91c2..4f0c064219c93d3cdf9d5e89b665dbc0610a2e44 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ197YBT1{PL^Mw|K73$y@dZ3i^~ delta 23 ecmeyri1Gg-#trQ19EPR}1{PKZ7MuCi3$y@dxd%P~ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 9f08e1356a..b1dc8afda7 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -5dc06f534ea570b212a34a0f3d4138248208e5dd \ No newline at end of file +1be2d088e7f722075deacf9b0c6c04af8a5aa7b0 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 1452c7ed9f..90d331753f 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.302\n" +"Project-Id-Version: mono 6.0.0.306\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-06-15 08:08+0000\n" +"POT-Creation-Date: 2019-06-20 08:12+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 59ca1cda9a33b307fdc309c410c9b33b1c6dccfd..4e726e81d30e48c61bcf908a9dde5308d0a33863 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}IgAVx3@oe+jW(xFWo!okbtnj{ delta 23 fcmaF1gXP%{mJP8}ISfq|3@oe+EH