Merge branch 'upstream'

Former-commit-id: 0c8f3429899c3409cd0c1acf2c29d51db0cd26a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-08-23 09:19:54 +00:00
commit 3ef0506c19
47 changed files with 54 additions and 45 deletions

View File

@ -1 +1 @@
8cf7645085ab82d8e3b442d55bbf12055cd9fdeb 2b4ae5f0ef772a473b8836570c3d7d558c41071e

View File

@ -1 +1 @@
cd7b168922c0782c22d787e2bf5702763e633d1e a6d825d4cd54cafea7dd437a62eea6539d5c7d8a

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "6.4.0.173"; public const string MonoVersion = "6.4.0.174";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
3cac0c0b0311b5c6530fbfa54847ac7ef3b06714 d73a738860d343e018192e89b98feb1dea84077c

View File

@ -1 +1 @@
0f5c025ed127058a98d60912766ed6065af338a5 a5a41623ee3d8acaa39098445edb0126727b634f

View File

@ -1 +1 @@
1c31b4fe450fae5b1efd90500d11048787540885 4b297c28744b87271648f90ea350998ed3e1dab4

View File

@ -1 +1 @@
d352c15274b2f932fe586f0467d0c135b87cd593 b15219011ff0eccd3ff081a9e50964b5022d523f

View File

@ -1 +1 @@
6516a842c6ea697f5ce485e6c4780fff411505d7 d3a74269c88c20bb5f8c240a36aa68d792614753

View File

@ -1 +1 @@
511bfbaa05e9e44a924a2880f881f0a03abcc22a 0517b597a666747f37bc638cf1cd56237e572661

View File

@ -1 +1 @@
a27e5a6d6f249f07571d837cb8ff6789a02bb884 b4a75c47ffbe6a64de99aceb0854b51229d310fa

View File

@ -1 +1 @@
3cac0c0b0311b5c6530fbfa54847ac7ef3b06714 d73a738860d343e018192e89b98feb1dea84077c

View File

@ -1 +1 @@
0f5c025ed127058a98d60912766ed6065af338a5 a5a41623ee3d8acaa39098445edb0126727b634f

View File

@ -1 +1 @@
1c31b4fe450fae5b1efd90500d11048787540885 4b297c28744b87271648f90ea350998ed3e1dab4

View File

@ -1 +1 @@
d352c15274b2f932fe586f0467d0c135b87cd593 b15219011ff0eccd3ff081a9e50964b5022d523f

View File

@ -1 +1 @@
6516a842c6ea697f5ce485e6c4780fff411505d7 d3a74269c88c20bb5f8c240a36aa68d792614753

View File

@ -1 +1 @@
511bfbaa05e9e44a924a2880f881f0a03abcc22a 0517b597a666747f37bc638cf1cd56237e572661

View File

@ -1 +1 @@
c1906e782f1aa7b8047ab024f22b8c3aef09eb28 6806103233cb7b40d0aa0d0e9f407cdde636e57d

View File

@ -1 +1 @@
a27e5a6d6f249f07571d837cb8ff6789a02bb884 b4a75c47ffbe6a64de99aceb0854b51229d310fa

View File

@ -1 +1 @@
3cac0c0b0311b5c6530fbfa54847ac7ef3b06714 d73a738860d343e018192e89b98feb1dea84077c

View File

@ -1 +1 @@
0f5c025ed127058a98d60912766ed6065af338a5 a5a41623ee3d8acaa39098445edb0126727b634f

View File

@ -1 +1 @@
1c31b4fe450fae5b1efd90500d11048787540885 4b297c28744b87271648f90ea350998ed3e1dab4

View File

@ -1 +1 @@
d352c15274b2f932fe586f0467d0c135b87cd593 b15219011ff0eccd3ff081a9e50964b5022d523f

View File

@ -1 +1 @@
6516a842c6ea697f5ce485e6c4780fff411505d7 d3a74269c88c20bb5f8c240a36aa68d792614753

View File

@ -1 +1 @@
511bfbaa05e9e44a924a2880f881f0a03abcc22a 0517b597a666747f37bc638cf1cd56237e572661

View File

@ -1 +1 @@
c1906e782f1aa7b8047ab024f22b8c3aef09eb28 6806103233cb7b40d0aa0d0e9f407cdde636e57d

View File

@ -1 +1 @@
a27e5a6d6f249f07571d837cb8ff6789a02bb884 b4a75c47ffbe6a64de99aceb0854b51229d310fa

View File

@ -1 +1 @@
3cac0c0b0311b5c6530fbfa54847ac7ef3b06714 d73a738860d343e018192e89b98feb1dea84077c

View File

@ -1 +1 @@
0f5c025ed127058a98d60912766ed6065af338a5 a5a41623ee3d8acaa39098445edb0126727b634f

View File

@ -1 +1 @@
07f4a578c468141998662bb6012cfeb47b61949f c50c327db77a9e7ad02449b00dab76c7d9783689

View File

@ -1 +1 @@
d352c15274b2f932fe586f0467d0c135b87cd593 b15219011ff0eccd3ff081a9e50964b5022d523f

View File

@ -1 +1 @@
6516a842c6ea697f5ce485e6c4780fff411505d7 d3a74269c88c20bb5f8c240a36aa68d792614753

View File

@ -1 +1 @@
511bfbaa05e9e44a924a2880f881f0a03abcc22a 0517b597a666747f37bc638cf1cd56237e572661

View File

@ -1 +1 @@
c1906e782f1aa7b8047ab024f22b8c3aef09eb28 6806103233cb7b40d0aa0d0e9f407cdde636e57d

View File

@ -1 +1 @@
6a5f983aba6497d36727d8a3dec8846063df0ea4 f95c7767d4606021eb0e186becb55ded3da7a453

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/cc0632e" #define FULL_VERSION "explicit/6434153"

View File

@ -1491,10 +1491,10 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @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: @CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local: @HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
clean: clean-am clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

View File

@ -69,7 +69,16 @@ mono_dl_open_file (const char *file, int flags)
/* Bionic doesn't support NULL filenames */ /* Bionic doesn't support NULL filenames */
if (!file) if (!file)
return NULL; return NULL;
if (!g_file_test (file, G_FILE_TEST_EXISTS)) /* The intention of calling `g_file_test (file, G_FILE_TEST_EXISTS)` is
* to speed up probing for non-existent libraries. The problem is that
* if file is just a simple "libdl.so" then `dlopen (file)` doesn't just
* look for it in the current working directory, it will probe some
* other paths too. (For example on desktop linux you'd also look in
* all the directories in LD_LIBRARY_PATH). So the g_file_test() call
* is not a robust way to avoid calling dlopen if the filename is
* relative.
*/
if (g_path_is_absolute (file) && !g_file_test (file, G_FILE_TEST_EXISTS))
return NULL; return NULL;
#endif #endif
#if defined(_AIX) #if defined(_AIX)

View File

@ -520,8 +520,8 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@ENABLE_MSVC_FALSE@install-exec-local:
@ENABLE_MSVC_FALSE@clean-local: @ENABLE_MSVC_FALSE@clean-local:
@ENABLE_MSVC_FALSE@install-exec-local:
clean: clean-am clean: clean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am

Binary file not shown.

View File

@ -1 +1 @@
08494c360b8dfb72e3c4083caa712ce92a6a75bd d73a98a3e4e55ba06506af017f084cf6d53b450f

Binary file not shown.

View File

@ -1 +1 @@
da9b91b3b0ae9725db077960502d523e09082328 ce2acc032b386d49216820b20e4d6204e8eda8c1

Binary file not shown.

View File

@ -1 +1 @@
4a9db897d633f54f57e5520261f75e8e4b1a22b0 1ff467cfc4ea4c9b7c12dc7cae41bea3014e1d77

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 6.4.0.173\n" "Project-Id-Version: mono 6.4.0.174\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-08-21 08:05+0000\n" "POT-Creation-Date: 2019-08-23 08:20+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
a22b26bd9a21d03a0193f7919b315f90afd7c30b 76b65254f1d88cbb2709130fd03182940b9c4d48