From 6ac8a5d4694adbb815aeac7bfca4e6e55706c1e9 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 26 Jul 2017 18:08:48 +0000 Subject: [PATCH] Imported Upstream version 5.2.0.213 Former-commit-id: 3adbb6bbe36bc00dc3a543d831eda2180e06da85 --- 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.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1050200001/System.Xml.dll.REMOVED.git-id | 2 +- .../1050200001/mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/gc.c | 4 ++++ .../metadata/w32process-unix.c.REMOVED.git-id | 2 +- mono/metadata/w32process-win32.c | 5 +++++ mono/metadata/w32process.h | 3 +++ 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 73161 -> 73161 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 23 files changed, 29 insertions(+), 17 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 2e4a2dfc36..0db0e9490d 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -892cb9f8372fb5febc0b19e0794706d083602e8d \ No newline at end of file +76fc0d5e83172c81a43fa1a2c19db1efae3c451f \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index a116d3f065..4c599af71c 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -765647b5b903bc28d1fef9b380033c7e97a449a1 \ No newline at end of file +a5a979a4130c7729f5f56544fff26be703304e7c \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 2a9260f3ed..1044570dcb 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.2.0.209"; + public const string MonoVersion = "5.2.0.213"; 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/1050200001/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050200001/Mono.Security.dll.REMOVED.git-id index 8b7567b4f5..c721552228 100644 --- a/mcs/class/lib/monolite/1050200001/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/1050200001/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -1ca3fde1b1b4c254fcb5eab73ff76e53342c705c \ No newline at end of file +59e630c66cada43b60d22ac289804d6135e3cf1d \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050200001/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050200001/System.Configuration.dll.REMOVED.git-id index d733b5f90e..c66054c72f 100644 --- a/mcs/class/lib/monolite/1050200001/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/1050200001/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -ce3d07f7ec1645e24655704e780af2c167ec2228 \ No newline at end of file +30417504eec1df093c1741d5c7e835d6651043ca \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050200001/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050200001/System.Numerics.dll.REMOVED.git-id index 3a2efdb9b2..ed8006b685 100644 --- a/mcs/class/lib/monolite/1050200001/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/1050200001/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -e06237966e578465031c9b5b75fda2646c22d3b8 \ No newline at end of file +c54e5671364815ae4e6f6c5eb00a88d246a85453 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050200001/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050200001/System.Security.dll.REMOVED.git-id index 0dbceb402a..42661ade96 100644 --- a/mcs/class/lib/monolite/1050200001/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/1050200001/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e5df4b091b873c156c670e852104e4fc3e8c0471 \ No newline at end of file +54ed7a2adc92f8c5f738ed3c638c624ba7b16991 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050200001/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050200001/System.Xml.dll.REMOVED.git-id index f1b8318228..73a7bafceb 100644 --- a/mcs/class/lib/monolite/1050200001/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/1050200001/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5d90e89d6a858e59e8cc2236e8cc8c2123078544 \ No newline at end of file +7e64338d66c3b3306aec960b8744c09c978ca411 \ No newline at end of file diff --git a/mcs/class/lib/monolite/1050200001/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/1050200001/mscorlib.dll.REMOVED.git-id index 65a1934021..6bb3adf4a5 100644 --- a/mcs/class/lib/monolite/1050200001/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/1050200001/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d2881996900ded8e0a91bd974814b5bceb32a3f8 \ No newline at end of file +96e95e2e3f977f33f442e49def55a56208001b3e \ No newline at end of file diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c index ffe47f32cc..467146cc0a 100644 --- a/mono/metadata/gc.c +++ b/mono/metadata/gc.c @@ -32,6 +32,7 @@ #include /* for mono_delegate_free_ftnptr () */ #include #include +#include #include #include #include @@ -711,6 +712,7 @@ static volatile gboolean finished; * * Notify the finalizer thread that finalizers etc. * are available to be processed. + * This is async signal safe. */ void mono_gc_finalize_notify (void) @@ -888,6 +890,8 @@ finalizer_thread (gpointer unused) reference_queue_proccess_all (); + mono_w32process_signal_finished (); + hazard_free_queue_pump (); /* Avoid posting the pending done event until there are pending finalizers */ diff --git a/mono/metadata/w32process-unix.c.REMOVED.git-id b/mono/metadata/w32process-unix.c.REMOVED.git-id index 386f67d7fc..ba06106ec0 100644 --- a/mono/metadata/w32process-unix.c.REMOVED.git-id +++ b/mono/metadata/w32process-unix.c.REMOVED.git-id @@ -1 +1 @@ -596af9b321d07ae1945e3e4d46e55a52c5b4d8fb \ No newline at end of file +c2a1615c92a19d5028f141b87a4a6261dd3782f3 \ No newline at end of file diff --git a/mono/metadata/w32process-win32.c b/mono/metadata/w32process-win32.c index 53cf95bc35..24fb97ce4d 100644 --- a/mono/metadata/w32process-win32.c +++ b/mono/metadata/w32process-win32.c @@ -48,6 +48,11 @@ mono_w32process_cleanup (void) { } +void +mono_w32process_signal_finished (void) +{ +} + #if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) HANDLE ves_icall_System_Diagnostics_Process_GetProcess_internal (guint32 pid) diff --git a/mono/metadata/w32process.h b/mono/metadata/w32process.h index 7a33f2a6c6..0565ac1eb6 100644 --- a/mono/metadata/w32process.h +++ b/mono/metadata/w32process.h @@ -76,6 +76,9 @@ mono_w32process_init (void); void mono_w32process_cleanup (void); +void +mono_w32process_signal_finished (void); + #ifndef HOST_WIN32 void diff --git a/mono/mini/version.h b/mono/mini/version.h index 2d31a96056..820ad89eba 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/3d531ba" +#define FULL_VERSION "explicit/ef39d08" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 26822462799075d93d180c85e08a3762e88ef8b9..d1721e0ba395e7802d3a7f4e6f1a4bf0c3426410 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKh1w(TyQ}Cpv=2oUAoB7oXv;bi%2M+)M delta 22 dcmeyri1Gg-#tj_m>?R6^rdCGAoB7oXv;bh{2L}KE diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 949d190ab1..84887074a7 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -372406d6d85830f3d29d7fc05582226359765f09 \ No newline at end of file +f90d7afacb4dc11277a1d2a0b40054e5b64a405a \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 60b599193e..29fc6c0fab 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.2.0.209\n" +"Project-Id-Version: mono 5.2.0.213\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2017-07-24 15:23+0000\n" +"POT-Creation-Date: 2017-07-26 17:54+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 de8a26c9e21062293a0ae0f8bee274ceba50ff6d..2f67aa80d9ba6b05b4ac8f5d0d9bc3749d4f9894 100644 GIT binary patch delta 22 ecmX@Po8{zgmJL$V*v%9S&8