Merge branch 'upstream'
Former-commit-id: d9d0f29b4b70374d37c46a93dbae827f8cde9b12
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
e317f7b96e
@ -1 +1 @@
|
||||
0f4a07f6e526eed79077b03a055fe8e03dc66abe
|
||||
cd60dbc711b07a8165a9e2ceb4971485fc99e4b8
|
||||
@ -1 +1 @@
|
||||
9239596563ef2d2fe44a6793a4260bf4a9a325da
|
||||
578c66a0578032c9d0b9458acc537ffacd9ec25f
|
||||
@ -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.307";
|
||||
public const string MonoVersion = "6.0.0.309";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -414,6 +414,10 @@ public class Tests : TestsBase, ITest2
|
||||
unhandled_exception ();
|
||||
return 0;
|
||||
}
|
||||
if (args.Length >0 && args [0] == "unhandled-exception-wrapper") {
|
||||
unhandled_exception_wrapper ();
|
||||
return 0;
|
||||
}
|
||||
if (args.Length >0 && args [0] == "unhandled-exception-endinvoke") {
|
||||
unhandled_exception_endinvoke ();
|
||||
return 0;
|
||||
@ -1483,6 +1487,10 @@ public class Tests : TestsBase, ITest2
|
||||
Thread.Sleep (10000);
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void unhandled_exception_wrapper () {
|
||||
throw new ArgumentException("test");
|
||||
}
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void unhandled_exception_endinvoke_2 () {
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
b0c0de5c832e47168e591f21dfc9a8b6866a32d2
|
||||
6ac1934d3bf36a8694c80b93904eb5ddf2895af3
|
||||
@ -1 +1 @@
|
||||
58d8351822b1482a368c096bf6dd8d83c06ee4dc
|
||||
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2
|
||||
@ -1 +1 @@
|
||||
cba15db7195f95948083a9e6ef564263de0dba81
|
||||
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c
|
||||
@ -1 +1 @@
|
||||
d3a23a05f96b81b6a44f8f221989f063c0b6a3ca
|
||||
09510fbcabe070401af8e00a2be12196fb3dc466
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
cff8ae50e3bd0315463b37b005ca2133d9c37859
|
||||
573517ad47d4e9316b036efe3929d1fb92f16c13
|
||||
@ -1 +1 @@
|
||||
2655f1ce98343bb1bc4b9fa6551c05fda81fcea1
|
||||
20948f52a7247a2c723a1a45d96365024c028f59
|
||||
@ -1 +1 @@
|
||||
2693ef5c1e33d711ed9be1758314758d350490c6
|
||||
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032
|
||||
@ -1 +1 @@
|
||||
70f9b65a932f2c174568ae51ddf0576038feaf4d
|
||||
883e2079791d7a692e256df74168b5bcd0f52dcf
|
||||
@ -1 +1 @@
|
||||
58d8351822b1482a368c096bf6dd8d83c06ee4dc
|
||||
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2
|
||||
@ -1 +1 @@
|
||||
cba15db7195f95948083a9e6ef564263de0dba81
|
||||
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c
|
||||
@ -1 +1 @@
|
||||
d3a23a05f96b81b6a44f8f221989f063c0b6a3ca
|
||||
09510fbcabe070401af8e00a2be12196fb3dc466
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
cff8ae50e3bd0315463b37b005ca2133d9c37859
|
||||
573517ad47d4e9316b036efe3929d1fb92f16c13
|
||||
@ -1 +1 @@
|
||||
2655f1ce98343bb1bc4b9fa6551c05fda81fcea1
|
||||
20948f52a7247a2c723a1a45d96365024c028f59
|
||||
@ -1 +1 @@
|
||||
2693ef5c1e33d711ed9be1758314758d350490c6
|
||||
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032
|
||||
@ -1 +1 @@
|
||||
70f9b65a932f2c174568ae51ddf0576038feaf4d
|
||||
883e2079791d7a692e256df74168b5bcd0f52dcf
|
||||
@ -1 +1 @@
|
||||
58d8351822b1482a368c096bf6dd8d83c06ee4dc
|
||||
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2
|
||||
@ -1 +1 @@
|
||||
cba15db7195f95948083a9e6ef564263de0dba81
|
||||
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c
|
||||
@ -1 +1 @@
|
||||
d3a23a05f96b81b6a44f8f221989f063c0b6a3ca
|
||||
09510fbcabe070401af8e00a2be12196fb3dc466
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
cff8ae50e3bd0315463b37b005ca2133d9c37859
|
||||
573517ad47d4e9316b036efe3929d1fb92f16c13
|
||||
@ -1 +1 @@
|
||||
2655f1ce98343bb1bc4b9fa6551c05fda81fcea1
|
||||
20948f52a7247a2c723a1a45d96365024c028f59
|
||||
@ -1 +1 @@
|
||||
2693ef5c1e33d711ed9be1758314758d350490c6
|
||||
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032
|
||||
@ -1 +1 @@
|
||||
70f9b65a932f2c174568ae51ddf0576038feaf4d
|
||||
883e2079791d7a692e256df74168b5bcd0f52dcf
|
||||
@ -1 +1 @@
|
||||
58d8351822b1482a368c096bf6dd8d83c06ee4dc
|
||||
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2
|
||||
@ -1 +1 @@
|
||||
cba15db7195f95948083a9e6ef564263de0dba81
|
||||
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c
|
||||
@ -1 +1 @@
|
||||
7f2abc6afddaf7def03b26976196c7ff1f95d881
|
||||
bf65bcca67865d552fac4b702588684e7f29ea98
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
cff8ae50e3bd0315463b37b005ca2133d9c37859
|
||||
573517ad47d4e9316b036efe3929d1fb92f16c13
|
||||
@ -1 +1 @@
|
||||
2655f1ce98343bb1bc4b9fa6551c05fda81fcea1
|
||||
20948f52a7247a2c723a1a45d96365024c028f59
|
||||
@ -1 +1 @@
|
||||
2693ef5c1e33d711ed9be1758314758d350490c6
|
||||
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032
|
||||
@ -1 +1 @@
|
||||
e5a661f9f7faf1617828387880639af2f08958ca
|
||||
98ce5406f32e8b5ee884076fa13d647a5cef1d41
|
||||
@ -1 +1 @@
|
||||
a3b722c5a7a6c61307413cfd8ad1935c3375452c
|
||||
2134ac3fc3a3086f68d1046341e517909a656fdc
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/e8836b6"
|
||||
#define FULL_VERSION "explicit/346da98"
|
||||
|
||||
@ -1443,10 +1443,10 @@ 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."
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
||||
@ -516,8 +516,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@install-exec-local:
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
@ENABLE_MSVC_FALSE@install-exec-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
74edf3c9342bb20ea41681775ef1219dee19b85f
|
||||
a89ec654fc134c9afb28590dd2c74092b64d1c32
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
5c2a07bd7afb73af8d4e4227aba79fc52ecc25d2
|
||||
a2efff70bccbcac2f08c1329e06a343eeb51e41d
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c05bc5d73e8ce686bcc0d41e6af4fbf76b4c0e77
|
||||
e8528396c0d03ac590fd8c58de7ba9f55a6c0df0
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.0.0.307\n"
|
||||
"Project-Id-Version: mono 6.0.0.309\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-06-21 08:09+0000\n"
|
||||
"POT-Creation-Date: 2019-06-22 08:09+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
68a808e6662394f41a393ba10c2d30622b22d1ad
|
||||
45044618ef821ffb7acb405168ceeb499898e67a
|
||||
Loading…
x
Reference in New Issue
Block a user