Merge branch 'upstream'

Former-commit-id: a7f953dcc1c253fad55f13343b446343a0ff27c4
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-09-27 09:37:02 +00:00
commit 8d35523402
47 changed files with 44 additions and 44 deletions

View File

@ -1 +1 @@
7b0af47166406354079db8b2928ad165a5967c95 6bd4558f248b14a2a82737af0c9b1d2b0b2944d3

View File

@ -1 +1 @@
0cbae372497b7af607d0bee6168c3a347db63458 839127d83c8dfc3cbe1eabd09588a5b57eae1fac

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.6.0.99"; public const string MonoVersion = "6.6.0.102";
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 @@
110bd10827b6c5c1c0c3639f7642d1beea638b77 51372251532be100f5a10fbf3bbc3ddd77ddaa14

View File

@ -1 +1 @@
5bc72b980e3461ec2ad7504d85dcc559b62dfdda 2793ab92b134507d7d8a85615bc63a23b2750359

View File

@ -1 +1 @@
69bf31bb2dc5b9f3fb9f298cf7f6f7e2124dfd74 cab1d0a4f39f9199d221a3825546f9e0bb4cb2de

View File

@ -1 +1 @@
efd5259d8efefb41ecdb2ff2b4dfc7b8e0cd252a a6694cc82436c21501c424b4c279164ce30d2147

View File

@ -1 +1 @@
e47863ea4f12cc73cb298198cdf5aa2f70f4d95c 3371ccf43d2cb10c02ba09d1de5edacb61d6565e

View File

@ -1 +1 @@
1d6a0e4a36b89cff13bd2c205f095ca7d5ff1dcc 54644b539cc9675291076c315786c5954c2f5368

View File

@ -1 +1 @@
cfec3ef01184edb4742249953cb14917be2b85a1 5dc82bce4a906fc8fb135be826d8b98ece1f68e6

View File

@ -1 +1 @@
110bd10827b6c5c1c0c3639f7642d1beea638b77 51372251532be100f5a10fbf3bbc3ddd77ddaa14

View File

@ -1 +1 @@
5bc72b980e3461ec2ad7504d85dcc559b62dfdda 2793ab92b134507d7d8a85615bc63a23b2750359

View File

@ -1 +1 @@
69bf31bb2dc5b9f3fb9f298cf7f6f7e2124dfd74 cab1d0a4f39f9199d221a3825546f9e0bb4cb2de

View File

@ -1 +1 @@
efd5259d8efefb41ecdb2ff2b4dfc7b8e0cd252a a6694cc82436c21501c424b4c279164ce30d2147

View File

@ -1 +1 @@
e47863ea4f12cc73cb298198cdf5aa2f70f4d95c 3371ccf43d2cb10c02ba09d1de5edacb61d6565e

View File

@ -1 +1 @@
1d6a0e4a36b89cff13bd2c205f095ca7d5ff1dcc 54644b539cc9675291076c315786c5954c2f5368

View File

@ -1 +1 @@
dea65471e5d0b03efbda9a345ea08d6f6601acb2 d91e9f2ba309685046e8c0278b5f520245ec8ba4

View File

@ -1 +1 @@
cfec3ef01184edb4742249953cb14917be2b85a1 5dc82bce4a906fc8fb135be826d8b98ece1f68e6

View File

@ -1 +1 @@
110bd10827b6c5c1c0c3639f7642d1beea638b77 51372251532be100f5a10fbf3bbc3ddd77ddaa14

View File

@ -1 +1 @@
5bc72b980e3461ec2ad7504d85dcc559b62dfdda 2793ab92b134507d7d8a85615bc63a23b2750359

View File

@ -1 +1 @@
69bf31bb2dc5b9f3fb9f298cf7f6f7e2124dfd74 cab1d0a4f39f9199d221a3825546f9e0bb4cb2de

View File

@ -1 +1 @@
efd5259d8efefb41ecdb2ff2b4dfc7b8e0cd252a a6694cc82436c21501c424b4c279164ce30d2147

View File

@ -1 +1 @@
e47863ea4f12cc73cb298198cdf5aa2f70f4d95c 3371ccf43d2cb10c02ba09d1de5edacb61d6565e

View File

@ -1 +1 @@
1d6a0e4a36b89cff13bd2c205f095ca7d5ff1dcc 54644b539cc9675291076c315786c5954c2f5368

View File

@ -1 +1 @@
dea65471e5d0b03efbda9a345ea08d6f6601acb2 d91e9f2ba309685046e8c0278b5f520245ec8ba4

View File

@ -1 +1 @@
cfec3ef01184edb4742249953cb14917be2b85a1 5dc82bce4a906fc8fb135be826d8b98ece1f68e6

View File

@ -1 +1 @@
110bd10827b6c5c1c0c3639f7642d1beea638b77 51372251532be100f5a10fbf3bbc3ddd77ddaa14

View File

@ -1 +1 @@
5bc72b980e3461ec2ad7504d85dcc559b62dfdda 2793ab92b134507d7d8a85615bc63a23b2750359

View File

@ -1 +1 @@
ec189eed4c94bf7019dc11edfe3808a4fa7e79e4 ed3d7b2f62629386d2f075b759c4338f9b9a0bb6

View File

@ -1 +1 @@
efd5259d8efefb41ecdb2ff2b4dfc7b8e0cd252a a6694cc82436c21501c424b4c279164ce30d2147

View File

@ -1 +1 @@
e47863ea4f12cc73cb298198cdf5aa2f70f4d95c 3371ccf43d2cb10c02ba09d1de5edacb61d6565e

View File

@ -1 +1 @@
1d6a0e4a36b89cff13bd2c205f095ca7d5ff1dcc 54644b539cc9675291076c315786c5954c2f5368

View File

@ -1 +1 @@
dea65471e5d0b03efbda9a345ea08d6f6601acb2 d91e9f2ba309685046e8c0278b5f520245ec8ba4

View File

@ -1 +1 @@
809c683af8af8b9a3584e196259fcee3eaeede98 7eda1257bb7379dc71d06dce3c1201ed81cd3f0b

View File

@ -589,7 +589,7 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
mono_fixup_exe_image (exe_image); mono_fixup_exe_image (exe_image);
#endif #endif
} else if (runtime_version != NULL) { } else if (runtime_version != NULL) {
runtimes = g_slist_prepend (runtimes, (gpointer)get_runtime_by_version (DEFAULT_RUNTIME_VERSION)); runtimes = g_slist_prepend (runtimes, (gpointer)get_runtime_by_version (runtime_version));
} }
if (runtimes == NULL) { if (runtimes == NULL) {

View File

@ -1 +1 @@
5009c2410ad11a3c1f2dbde86cd70bb05e273adc 34c15229bce6bafc3e110e964be20dda8afb4330

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/c99adb9" #define FULL_VERSION "explicit/d8441de"

View File

@ -525,8 +525,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@clean-local:
@ENABLE_MSVC_FALSE@install-exec-local: @ENABLE_MSVC_FALSE@install-exec-local:
@ENABLE_MSVC_FALSE@clean-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 @@
d42ba1bec1d8c811ce7daf126822bf801ba26ace 22836cf4aaad797479c8ce1812d597180405f3e4

Binary file not shown.

View File

@ -1 +1 @@
f744fd4737c003096656c35ac83ab537fe59adfb 4ca83106df207b50c5e5310bcbdde9fd72e77295

Binary file not shown.

View File

@ -1 +1 @@
b9b79b2c4dff5c5c172bde43d1c787238344ef3d 588b607c4e4812dcf7c9fda74bf270b251289401

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 6.6.0.99\n" "Project-Id-Version: mono 6.6.0.102\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-09-26 08:31+0000\n" "POT-Creation-Date: 2019-09-27 08:30+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 @@
90f72557a8d50013cf98a0c639201261b89c3732 0b3067267bd1ad9cbbeaf0bbef9a27dcc27b5c40