diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id
index 691ceed8a5..4db7e1ab3a 100644
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@@ -1 +1 @@
-afc8adebe2352d6191fca605225335ce94d20147
\ No newline at end of file
+44bb9ef8be292590b1345e1b063f35c47984beb6
\ No newline at end of file
diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id
index 28954addd0..a438913da2 100644
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@@ -1 +1 @@
-1173fab747cf32f1dc1c2402cf0bc21b14ec2593
\ No newline at end of file
+d7231c8451f4a944be911e452a7f91eb175aee32
\ No newline at end of file
diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs
index 7251251486..368f5778ee 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.14.0.167";
+ public const string MonoVersion = "5.14.0.169";
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/1051400005/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id
index b4f4c690aa..8425bf2c5d 100644
--- a/mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-5c10de7d48d164a17e1dad0f6467408bd0f8f637
\ No newline at end of file
+2fcbe56723621a979e86eaa0ad5807441a761245
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id
index 26bb9c0445..d2d19d95a6 100644
--- a/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-f07257db6941e1fdafe4f941f3da778554cb4d81
\ No newline at end of file
+dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id
index 533d0eec10..c7902defb5 100644
--- a/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-ccef0bd061d4ec909d6582e2b37afb7f74c86ad8
\ No newline at end of file
+1ef91ffc452772177c253c998467896aa69100e2
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id
index 01e2769101..f1c9ae688f 100644
--- a/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-716b25011cbac633b4b75b51f53bc385611ec1b3
\ No newline at end of file
+ce795997d46c0de20180488048bcfc3e5a5065bf
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id
index 2750084b2b..34c13bf153 100644
--- a/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-505eb89186ae2caabe6abebbf3a1e5726ce54a1c
\ No newline at end of file
+590bbb19b4bc6a7f03707dc93734100396ed05fd
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id
index ca33afc8a0..fe081ca1e4 100644
--- a/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-3f1c39ead22bb5442917f8cd9146442ee175443e
\ No newline at end of file
+600664f240ac863b38f05a9ccb8b10179f411c21
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id
index 1600ea0b39..12546d9992 100644
--- a/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-942c0427e74c0f75623f76538d97413b653014d3
\ No newline at end of file
+8a8b05eb926d03af52574c5d37f0fbf203f76480
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id
index b4f4c690aa..8425bf2c5d 100644
--- a/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-5c10de7d48d164a17e1dad0f6467408bd0f8f637
\ No newline at end of file
+2fcbe56723621a979e86eaa0ad5807441a761245
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id
index 26bb9c0445..d2d19d95a6 100644
--- a/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-f07257db6941e1fdafe4f941f3da778554cb4d81
\ No newline at end of file
+dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id
index 533d0eec10..c7902defb5 100644
--- a/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-ccef0bd061d4ec909d6582e2b37afb7f74c86ad8
\ No newline at end of file
+1ef91ffc452772177c253c998467896aa69100e2
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id
index 01e2769101..f1c9ae688f 100644
--- a/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-716b25011cbac633b4b75b51f53bc385611ec1b3
\ No newline at end of file
+ce795997d46c0de20180488048bcfc3e5a5065bf
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id
index 2750084b2b..34c13bf153 100644
--- a/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-505eb89186ae2caabe6abebbf3a1e5726ce54a1c
\ No newline at end of file
+590bbb19b4bc6a7f03707dc93734100396ed05fd
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id
index ca33afc8a0..fe081ca1e4 100644
--- a/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-3f1c39ead22bb5442917f8cd9146442ee175443e
\ No newline at end of file
+600664f240ac863b38f05a9ccb8b10179f411c21
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id
index 1600ea0b39..12546d9992 100644
--- a/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-942c0427e74c0f75623f76538d97413b653014d3
\ No newline at end of file
+8a8b05eb926d03af52574c5d37f0fbf203f76480
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id
index b4f4c690aa..8425bf2c5d 100644
--- a/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-5c10de7d48d164a17e1dad0f6467408bd0f8f637
\ No newline at end of file
+2fcbe56723621a979e86eaa0ad5807441a761245
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id
index 26bb9c0445..d2d19d95a6 100644
--- a/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-f07257db6941e1fdafe4f941f3da778554cb4d81
\ No newline at end of file
+dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051400005/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/System.Numerics.dll.REMOVED.git-id
index 533d0eec10..c7902defb5 100644
--- a/mcs/class/lib/monolite-win32/1051400005/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-ccef0bd061d4ec909d6582e2b37afb7f74c86ad8
\ No newline at end of file
+1ef91ffc452772177c253c998467896aa69100e2
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051400005/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/System.Security.dll.REMOVED.git-id
index 01e2769101..f1c9ae688f 100644
--- a/mcs/class/lib/monolite-win32/1051400005/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/System.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-716b25011cbac633b4b75b51f53bc385611ec1b3
\ No newline at end of file
+ce795997d46c0de20180488048bcfc3e5a5065bf
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051400005/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/System.Xml.dll.REMOVED.git-id
index 2750084b2b..34c13bf153 100644
--- a/mcs/class/lib/monolite-win32/1051400005/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-505eb89186ae2caabe6abebbf3a1e5726ce54a1c
\ No newline at end of file
+590bbb19b4bc6a7f03707dc93734100396ed05fd
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051400005/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/mcs.exe.REMOVED.git-id
index ca33afc8a0..fe081ca1e4 100644
--- a/mcs/class/lib/monolite-win32/1051400005/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-3f1c39ead22bb5442917f8cd9146442ee175443e
\ No newline at end of file
+600664f240ac863b38f05a9ccb8b10179f411c21
\ No newline at end of file
diff --git a/mcs/class/lib/monolite-win32/1051400005/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/mscorlib.dll.REMOVED.git-id
index 1600ea0b39..12546d9992 100644
--- a/mcs/class/lib/monolite-win32/1051400005/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-942c0427e74c0f75623f76538d97413b653014d3
\ No newline at end of file
+8a8b05eb926d03af52574c5d37f0fbf203f76480
\ No newline at end of file
diff --git a/mono/metadata/icall.c.REMOVED.git-id b/mono/metadata/icall.c.REMOVED.git-id
index c8a9f09206..a9af52bdf8 100644
--- a/mono/metadata/icall.c.REMOVED.git-id
+++ b/mono/metadata/icall.c.REMOVED.git-id
@@ -1 +1 @@
-cf79fed54a94a4b74b5743dfed575f703f93661b
\ No newline at end of file
+04ba00b20c2911983269f81cd4aa51083f09d43e
\ No newline at end of file
diff --git a/mono/mini/mini-posix.c b/mono/mini/mini-posix.c
index 7fe8d78c00..d338553745 100644
--- a/mono/mini/mini-posix.c
+++ b/mono/mini/mini-posix.c
@@ -227,12 +227,20 @@ MONO_SIG_HANDLER_FUNC (static, sigterm_signal_handler)
// die. The dump ends with the exit(1) below
MonoContext mctx;
gchar *output = NULL;
+ MonoStackHash hashes;
mono_sigctx_to_monoctx (ctx, &mctx);
- if (!mono_threads_summarize (&mctx, &output, NULL))
+ if (!mono_threads_summarize (&mctx, &output, &hashes))
g_assert_not_reached ();
- // Only the dumping-supervisor thread exits mono_thread_summarize
- MOSTLY_ASYNC_SAFE_PRINTF("Unhandled exception dump: \n######\n%s\n######\n", output);
+ if (mono_merp_enabled ()) {
+ pid_t crashed_pid = getpid ();
+ char *full_version = mono_get_runtime_build_info ();
+ mono_merp_invoke (crashed_pid, "SIGTERM", output, &hashes, full_version);
+ } else {
+ // Only the dumping-supervisor thread exits mono_thread_summarize
+ MOSTLY_ASYNC_SAFE_PRINTF("Unhandled exception dump: \n######\n%s\n######\n", output);
+ sleep (3);
+ }
mono_chain_signal (MONO_SIG_HANDLER_PARAMS);
exit (1);
diff --git a/mono/mini/version.h b/mono/mini/version.h
index e93557112e..fc51c4d39d 100644
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@@ -1 +1 @@
-#define FULL_VERSION "explicit/d4a680b"
+#define FULL_VERSION "explicit/ebc0c7c"
diff --git a/mono/utils/mono-merp.c b/mono/utils/mono-merp.c
index 23b3b8f0ff..29d6fed4a9 100644
--- a/mono/utils/mono-merp.c
+++ b/mono/utils/mono-merp.c
@@ -173,8 +173,8 @@ get_merp_exctype (MERPExcType exc)
case MERP_EXC_HANG:
return "0x02000000";
case MERP_EXC_NONE:
- // Exception type is optional
- return "";
+ // Exception type documented as optional, not optional
+ g_assert_not_reached ();
default:
g_assert_not_reached ();
}
@@ -195,6 +195,11 @@ parse_exception_type (const char *signal)
if (!strcmp (signal, "SIGABRT"))
return MERP_EXC_SIGABRT;
+ // Force quit == hang?
+ // We need a default for this
+ if (!strcmp (signal, "SIGTERM"))
+ return MERP_EXC_HANG;
+
// FIXME: There are no other such signal
// strings passed to mono_handle_native_crash at the
// time of writing this
diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo
index 653ab4fb4f..74683d35dc 100644
Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ
diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id
index ba5af09f5a..67d400ab77 100644
--- a/po/mcs/de.po.REMOVED.git-id
+++ b/po/mcs/de.po.REMOVED.git-id
@@ -1 +1 @@
-03af8465c361c3f6b6271608b1c5ecce72b607ac
\ No newline at end of file
+18a58f9e10682a9706336d0df16db2fd1b4f4af7
\ No newline at end of file
diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo
index cdeabf74b9..f05ebd382e 100644
Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ
diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id
index 8e19097c0c..43bfcd379f 100644
--- a/po/mcs/es.po.REMOVED.git-id
+++ b/po/mcs/es.po.REMOVED.git-id
@@ -1 +1 @@
-eacefc4206489e9d8e81e90f4a8c45f06b869bf7
\ No newline at end of file
+8f8f041fd02a5ad94291e9002e34c3baeabb2f98
\ No newline at end of file
diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo
index 499c855013..d1e50637f9 100644
Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ
diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id
index 1b40f58dbc..026d30ed45 100644
--- a/po/mcs/ja.po.REMOVED.git-id
+++ b/po/mcs/ja.po.REMOVED.git-id
@@ -1 +1 @@
-14279d8c2629b93897078a7f064a9492fe531cfa
\ No newline at end of file
+2cdba5ed4b3f2d84c1027b95299562b1bcb12de0
\ No newline at end of file
diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot
index ba8a8f63b4..f4c9e7339c 100644
--- a/po/mcs/mcs.pot
+++ b/po/mcs/mcs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: mono 5.14.0.167\n"
+"Project-Id-Version: mono 5.14.0.169\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2018-07-15 08:04+0000\n"
+"POT-Creation-Date: 2018-07-19 08:01+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"
diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo
index 85ce479650..314d742650 100644
Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ
diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id
index e44ed535f9..e3b79d2655 100644
--- a/po/mcs/pt_BR.po.REMOVED.git-id
+++ b/po/mcs/pt_BR.po.REMOVED.git-id
@@ -1 +1 @@
-178ef4c9adabd058119fc3f89a7a81656d3c7ef0
\ No newline at end of file
+de5bacdd2e5597c9fa5aa91b0af9393e949e6cbe
\ No newline at end of file