From 7dadb6c21ec395259e64d36bd690d8d05f582a08 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 28 Mar 2018 08:49:17 +0000 Subject: [PATCH] Imported Upstream version 5.10.1.16 Former-commit-id: ad5d313fc615898cbcf0c026529cef78090d072a --- 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 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 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 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 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 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/threads.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/utils/mono-threads.c | 3 +++ 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 +- 36 files changed, 35 insertions(+), 32 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 2961fdb05b..1857962e9b 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -38b7f4a6fda7fa17e8a8bbce89df0de1f0de5860 \ No newline at end of file +a5c0065103184fbaa7231339255466d293eb6cb4 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 73cb61d07b..8e9f775c75 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -9aeec1ff175809aa81fc0adbe224562b2435e5df \ No newline at end of file +5d294b134504dc52fee1b91f42902f1c90acbf4b \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index c7f1435226..8ab4ada781 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.10.1.15"; + public const string MonoVersion = "5.10.1.16"; 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-darwin/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id index 544859d53f..2652615f55 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2a998d078ba3fd44b3bcd4bb2ae0bb8efc78b0c2 \ No newline at end of file +f2f96f9bda35eb2afd682c6662ed6806eec87a2b \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id index b5a74647ca..de225ece01 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -9e69e79903c5aa862ff996357e8ab1daaccf80d0 \ No newline at end of file +a1a358ddd05a21727290fb24567d3aa2db41f89d \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id index c4a84beb1f..ee8de0bbfa 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -21cd6f5a5a783c9bbbacacd41fa8aec8c4033983 \ No newline at end of file +17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id index 022cf1f760..0990ccedcc 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -de6f89bff71f22b5ce4eed0b9da24d9c62337fd2 \ No newline at end of file +559d120991ef0e0340236244798c245608383081 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id index e098840ff4..6bd24d9054 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ad83d75376c27b7cef099ffafd3916507394e052 \ No newline at end of file +79211fe5cf0a63d090b3d93be588eab06e3e4634 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id index 95a2b7e49f..8f742534f7 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -7568eb058964df45636634138f1cf64410797c91 \ No newline at end of file +37e6920b265b3c9d89380a0bc0d1417aed391332 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id index f24b384cf1..ea65a0f586 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -47a527d529054751029b7aa3f0e18459c9b0a89f \ No newline at end of file +ef652b72c7cf1aead77b7090c689b662fae6699a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id index 544859d53f..2652615f55 100644 --- a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2a998d078ba3fd44b3bcd4bb2ae0bb8efc78b0c2 \ No newline at end of file +f2f96f9bda35eb2afd682c6662ed6806eec87a2b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id index b5a74647ca..de225ece01 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -9e69e79903c5aa862ff996357e8ab1daaccf80d0 \ No newline at end of file +a1a358ddd05a21727290fb24567d3aa2db41f89d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id index c4a84beb1f..ee8de0bbfa 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -21cd6f5a5a783c9bbbacacd41fa8aec8c4033983 \ No newline at end of file +17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id index 022cf1f760..0990ccedcc 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -de6f89bff71f22b5ce4eed0b9da24d9c62337fd2 \ No newline at end of file +559d120991ef0e0340236244798c245608383081 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id index e098840ff4..6bd24d9054 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ad83d75376c27b7cef099ffafd3916507394e052 \ No newline at end of file +79211fe5cf0a63d090b3d93be588eab06e3e4634 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id index 95a2b7e49f..8f742534f7 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -7568eb058964df45636634138f1cf64410797c91 \ No newline at end of file +37e6920b265b3c9d89380a0bc0d1417aed391332 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id index f24b384cf1..ea65a0f586 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -47a527d529054751029b7aa3f0e18459c9b0a89f \ No newline at end of file +ef652b72c7cf1aead77b7090c689b662fae6699a \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id index 544859d53f..2652615f55 100644 --- a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2a998d078ba3fd44b3bcd4bb2ae0bb8efc78b0c2 \ No newline at end of file +f2f96f9bda35eb2afd682c6662ed6806eec87a2b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id index b5a74647ca..de225ece01 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -9e69e79903c5aa862ff996357e8ab1daaccf80d0 \ No newline at end of file +a1a358ddd05a21727290fb24567d3aa2db41f89d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id index c4a84beb1f..ee8de0bbfa 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -21cd6f5a5a783c9bbbacacd41fa8aec8c4033983 \ No newline at end of file +17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id index 022cf1f760..0990ccedcc 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -de6f89bff71f22b5ce4eed0b9da24d9c62337fd2 \ No newline at end of file +559d120991ef0e0340236244798c245608383081 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id index e098840ff4..6bd24d9054 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -ad83d75376c27b7cef099ffafd3916507394e052 \ No newline at end of file +79211fe5cf0a63d090b3d93be588eab06e3e4634 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id index 95a2b7e49f..8f742534f7 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -7568eb058964df45636634138f1cf64410797c91 \ No newline at end of file +37e6920b265b3c9d89380a0bc0d1417aed391332 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id index f24b384cf1..ea65a0f586 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -47a527d529054751029b7aa3f0e18459c9b0a89f \ No newline at end of file +ef652b72c7cf1aead77b7090c689b662fae6699a \ No newline at end of file diff --git a/mono/metadata/threads.c.REMOVED.git-id b/mono/metadata/threads.c.REMOVED.git-id index 4e81b1321b..1849d782c4 100644 --- a/mono/metadata/threads.c.REMOVED.git-id +++ b/mono/metadata/threads.c.REMOVED.git-id @@ -1 +1 @@ -5bca4f0ab73b354fb6ea1f4b4fea6c9a28fd077b \ No newline at end of file +e5ab853cd3c68b19321c1f59cc7c08e00e1bcd9b \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 1216da8041..fd3c8d973f 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/4e27697" +#define FULL_VERSION "explicit/bf27e25" diff --git a/mono/utils/mono-threads.c b/mono/utils/mono-threads.c index d41724d7a6..4e77d0d558 100644 --- a/mono/utils/mono-threads.c +++ b/mono/utils/mono-threads.c @@ -685,6 +685,7 @@ gboolean mono_thread_info_try_get_internal_thread_gchandle (MonoThreadInfo *info, guint32 *gchandle) { g_assert (info); + g_assert (mono_thread_info_is_current (info)); if (info->internal_thread_gchandle == G_MAXUINT32) return FALSE; @@ -697,6 +698,7 @@ void mono_thread_info_set_internal_thread_gchandle (MonoThreadInfo *info, guint32 gchandle) { g_assert (info); + g_assert (mono_thread_info_is_current (info)); g_assert (gchandle != G_MAXUINT32); info->internal_thread_gchandle = gchandle; } @@ -705,6 +707,7 @@ void mono_thread_info_unset_internal_thread_gchandle (THREAD_INFO_TYPE *info) { g_assert (info); + g_assert (mono_thread_info_is_current (info)); info->internal_thread_gchandle = G_MAXUINT32; } diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 84523f2cc7e5138da70d9ce9a20775fa3523fd4f..22037f5cf03bee791a73d18b9f6cc0657f3938ff 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK31p^B!Ba_WO@j#VK+CQLzTC diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index aeab69ff9a..f980c59156 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -0dbc7fb0a8873f3d94365913cc3e4f5becb8e64c \ No newline at end of file +7481e68f34207388d86528e13af4f23cb34d74d9 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 8f7d3ec961a7d75ad7a4b3d149f586f87564de48..99f5330ae3aeeccb67e7630e099dd06e6e059f72 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>=p_J7FI?koB7oXv;bi(2Mz!L delta 22 dcmeyri1Gg-#tj_m>}CoE7FI@voB7oXv;biP2MGWG diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index e379048fa6..a320f9094d 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -1ed713d8b393d31879df0bc22a9ddb0ccd19a046 \ No newline at end of file +11c2a8b9b62b957355744562fed3bbf9813e4fb8 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 215bb5e487..061c615593 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.10.1.15\n" +"Project-Id-Version: mono 5.10.1.16\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-03-26 08:21+0000\n" +"POT-Creation-Date: 2018-03-28 08:24+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 034917862ff59aa0aa03da8a823aeed1770b12af..e741a79d207bad82a29c9b271604b55ae8f3ed65 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0?dEUb)7Hm6QyYzF{tBnX56 delta 22 ecmaF1gXP%{mJM-J+07ITEUb(SH>XZzYzF{s`Urmj diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 771781c92b..a9d3fdcbae 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -84c495d92f41e5f9a9afdb5a9eb1c856f182ce7c \ No newline at end of file +4877001d3b254cb1229617274452316b370cd69d \ No newline at end of file