From 421ee8b5772f55c17239b9ed9de65011988e12df Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 8 May 2019 08:37:57 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.221 Former-commit-id: 51d0e360a14435bba39a0aadf6d032ba3fef66a8 --- 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/assembly.c.REMOVED.git-id | 2 +- mono/metadata/image.c | 10 ++++++---- mono/mini/mini-arm.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- msvc/Makefile.in | 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 +- 49 files changed, 47 insertions(+), 45 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 17312e496b..8ba13b1eb8 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e7fecd6d85ed09c4d778ce5894a150a3e6beefe5 \ No newline at end of file +d13adbe4169bf27e8634ae420107cc9141b0a644 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index bd4edf682b..ab985256ae 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -a5e0e1a64c1b34fc4724de8b8462484c137861c4 \ No newline at end of file +ce47d9cbf49ddd172353243284d178e025f3f293 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 1de170b307..5f8b3487a4 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.212"; + public const string MonoVersion = "6.0.0.221"; 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/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 074c7793c9..b611f283f8 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 @@ -2d1623bd0afcb8fcd9b19d36c4a64f15b3fde741 \ No newline at end of file +b67c3ba4e01e1a6e905294d845ef64eb5784813b \ 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 c441c3bbf7..717af6a2b1 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 @@ -10c40a59765779eeaa521488281ce00518cfc3b9 \ No newline at end of file +ff1aca0ad14155446712c32cb0f975ee93b9ae10 \ 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 86f56f4977..f9bacf62dc 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 @@ -a1d1b6cca3aa53d7ffc6473ce62e00b5daf2a932 \ No newline at end of file +9d826c18ea8fa65c91dc0f190dbb18ef3025cb6c \ 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 dedeb7a776afda380b95e08110b90cd405ffc951..ada31f950bde24e7eaa859f8ff16a8689d5ca6c5 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ?e(zJfsD0`0W=H{5?opg7wA<+vR$AyPlE`Vx6lj$uLcD& S05Je6m!N$CDz~l^0a9?name); } else { mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Denying load of problematic image %s", image->name); - *status = MONO_IMAGE_IMAGE_INVALID; + if (status) + *status = MONO_IMAGE_IMAGE_INVALID; goto invalid_image; } } @@ -1791,9 +1792,10 @@ mono_image_open_a_lot (const char *fname, MonoImageOpenStatus *status, gboolean g_assert (!image); g_free (absfname); if (status) { - if (last_error == ERROR_BAD_EXE_FORMAT || last_error == STATUS_INVALID_IMAGE_FORMAT) - *status = MONO_IMAGE_IMAGE_INVALID; - else { + if (last_error == ERROR_BAD_EXE_FORMAT || last_error == STATUS_INVALID_IMAGE_FORMAT) { + if (status) + *status = MONO_IMAGE_IMAGE_INVALID; + } else { if (last_error == ERROR_FILE_NOT_FOUND || last_error == ERROR_PATH_NOT_FOUND) mono_set_errno (ENOENT); else diff --git a/mono/mini/mini-arm.c.REMOVED.git-id b/mono/mini/mini-arm.c.REMOVED.git-id index f74d55670b..5548561f89 100644 --- a/mono/mini/mini-arm.c.REMOVED.git-id +++ b/mono/mini/mini-arm.c.REMOVED.git-id @@ -1 +1 @@ -16ef61cb1788ce985f3a13d19fab76617da17a14 \ No newline at end of file +79c538e00bbb01cdff6adda9c79684aa6d0ddc47 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index b380d6fc0c..c9b1ddf0d2 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/cd5f040" +#define FULL_VERSION "explicit/bc3791b" diff --git a/msvc/Makefile.in b/msvc/Makefile.in index f5ae54dbec..fdc1930e45 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -515,8 +515,8 @@ 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." -@ENABLE_MSVC_FALSE@clean-local: @ENABLE_MSVC_FALSE@install-exec-local: +@ENABLE_MSVC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index decdc6e602c3ee8e53263f11b92ecb86227d3e7a..7e112ae4336f6799ae1e5f1b6139781cd9aa1a24 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK31p^B!1Ix{CxQw^}O3Ma+ delta 20 bcmbQIHBW29Q!aLM1p^B!LyOICxQw^}O27tw diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index d1ecd6b316..bdf9180352 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -79a7b3a39327eda15c177887dbe0e1a1e098b2ff \ No newline at end of file +98bbbc3107f9243c96d84b0e421ad62646abfe57 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index aa6be840eaa44959f5dbb08303093807bace46d5..f1a441dbc47ce81c3be6ccefd6d627f117a706dc 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)2f`NsVf#qgX#VK+CQR@b^ delta 20 bcmX?Ef3kjqo+7)sf`NsVp~YrX#VK+CQQ!u& diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index d2aec5776e..1e14f29539 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -fbabf5ee02d75da30ce7500051a08b5a60f18e50 \ No newline at end of file +04306dcff669ae6904be0b7ec0921488f3f84a77 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 7d5551ea25d18351df50b9a715880fe1700261c8..b3f91121e3501fa62bb84a32f80cddf69f7296b6 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>=p_J7FGt9oB7oXv;bi}2N3`O delta 22 dcmeyri1Gg-#tj_m?B)sv7FLE9oB7oXv;bi;2M_=N diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index aa57db44fe..e126333aed 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -943d1051608bc186ef066674b5b441f83cecd53a \ No newline at end of file +81d95d095702faf6e714db9405f996d742aa1b3d \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 0b578bc622..11b1f9ed38 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.212\n" +"Project-Id-Version: mono 6.0.0.221\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-05-07 08:18+0000\n" +"POT-Creation-Date: 2019-05-08 08:09+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 e42f25df8f6e63e6e7a69feb7a1adf60b17229c5..f594395948e22d8c5f9c2d4e69f2f1c8225af0fc 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0?dEUXMHH>XZzYzF{tGzf