Merge branch 'upstream'
Former-commit-id: 3fdbd4a7caf5c3660cc842e095ce4c1bc9cab173
This commit is contained in:
commit
d797a6da21
@ -1 +1 @@
|
||||
31951a093f764dd311481af300adba346e4e72b0
|
||||
fb71c452ac1142d82460721918a380abacf24928
|
@ -1 +1 @@
|
||||
53c157fa25c8da26edde2a279c8a28a8ae32559d
|
||||
9e1ea283eb07091ed3871045c7bc2b332e21ac30
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.18.0.215";
|
||||
public const string MonoVersion = "5.18.0.216";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -461,6 +461,7 @@ namespace MonoTests.System
|
||||
// "managed_thread_ptr" : "0x0",
|
||||
// "thread_info_addr" : "0x0",
|
||||
// "native_thread_id" : "0x0",
|
||||
// "managed_exception_type" : "System.Exception",
|
||||
// "managed_frames" : [
|
||||
// {
|
||||
// "is_managed" : "true",
|
||||
|
@ -1 +1 @@
|
||||
e49dd86c1aedd272e87548f3e73c04a05c077f62
|
||||
ed109d47a69d291e7fcbbdbc62b7ecd65cdb637f
|
@ -1 +1 @@
|
||||
59facca75f0abaceab60a7313bc3e0e188b094d2
|
||||
79289cf3ffe4313a0d74efbcc6c88d8e18377ecb
|
@ -1 +1 @@
|
||||
248b0372552658cf528f862077122bead9f5a5b0
|
||||
9f1bd1d6d187f2023e716aa54a42c33d28438a50
|
Binary file not shown.
@ -1 +1 @@
|
||||
7163a8d1262caeb89162d816e9dd75f8f57c1717
|
||||
3bae68e0c372bbafe3df07c05baa738fe0b2da6f
|
@ -1 +1 @@
|
||||
accb634b47f5f8a6ca1e2ea59c31c882ee0d4c7f
|
||||
cb5ad4878b31058bfc729605188dfcccf00213d7
|
@ -1 +1 @@
|
||||
35af2dc0652382ec10829d2a0a6e68e9dc6d2982
|
||||
fc4868ddcb03f09d6ae15010fff2cec77fe78275
|
@ -1 +1 @@
|
||||
d6e1c470b2057d2bf7e2ac22172e386a7b01212f
|
||||
8fd86e0eb52e38e8dfbf6c84f834c7d2ce0d9762
|
@ -1 +1 @@
|
||||
e49dd86c1aedd272e87548f3e73c04a05c077f62
|
||||
ed109d47a69d291e7fcbbdbc62b7ecd65cdb637f
|
@ -1 +1 @@
|
||||
59facca75f0abaceab60a7313bc3e0e188b094d2
|
||||
79289cf3ffe4313a0d74efbcc6c88d8e18377ecb
|
@ -1 +1 @@
|
||||
248b0372552658cf528f862077122bead9f5a5b0
|
||||
9f1bd1d6d187f2023e716aa54a42c33d28438a50
|
Binary file not shown.
@ -1 +1 @@
|
||||
7163a8d1262caeb89162d816e9dd75f8f57c1717
|
||||
3bae68e0c372bbafe3df07c05baa738fe0b2da6f
|
@ -1 +1 @@
|
||||
accb634b47f5f8a6ca1e2ea59c31c882ee0d4c7f
|
||||
cb5ad4878b31058bfc729605188dfcccf00213d7
|
@ -1 +1 @@
|
||||
35af2dc0652382ec10829d2a0a6e68e9dc6d2982
|
||||
fc4868ddcb03f09d6ae15010fff2cec77fe78275
|
@ -1 +1 @@
|
||||
d6e1c470b2057d2bf7e2ac22172e386a7b01212f
|
||||
8fd86e0eb52e38e8dfbf6c84f834c7d2ce0d9762
|
@ -1 +1 @@
|
||||
e49dd86c1aedd272e87548f3e73c04a05c077f62
|
||||
ed109d47a69d291e7fcbbdbc62b7ecd65cdb637f
|
@ -1 +1 @@
|
||||
59facca75f0abaceab60a7313bc3e0e188b094d2
|
||||
79289cf3ffe4313a0d74efbcc6c88d8e18377ecb
|
@ -1 +1 @@
|
||||
248b0372552658cf528f862077122bead9f5a5b0
|
||||
9f1bd1d6d187f2023e716aa54a42c33d28438a50
|
Binary file not shown.
@ -1 +1 @@
|
||||
7163a8d1262caeb89162d816e9dd75f8f57c1717
|
||||
3bae68e0c372bbafe3df07c05baa738fe0b2da6f
|
@ -1 +1 @@
|
||||
accb634b47f5f8a6ca1e2ea59c31c882ee0d4c7f
|
||||
cb5ad4878b31058bfc729605188dfcccf00213d7
|
@ -1 +1 @@
|
||||
35af2dc0652382ec10829d2a0a6e68e9dc6d2982
|
||||
fc4868ddcb03f09d6ae15010fff2cec77fe78275
|
@ -1 +1 @@
|
||||
d6e1c470b2057d2bf7e2ac22172e386a7b01212f
|
||||
8fd86e0eb52e38e8dfbf6c84f834c7d2ce0d9762
|
@ -1 +1 @@
|
||||
e49dd86c1aedd272e87548f3e73c04a05c077f62
|
||||
ed109d47a69d291e7fcbbdbc62b7ecd65cdb637f
|
@ -1 +1 @@
|
||||
59facca75f0abaceab60a7313bc3e0e188b094d2
|
||||
79289cf3ffe4313a0d74efbcc6c88d8e18377ecb
|
@ -1 +1 @@
|
||||
248b0372552658cf528f862077122bead9f5a5b0
|
||||
9f1bd1d6d187f2023e716aa54a42c33d28438a50
|
Binary file not shown.
@ -1 +1 @@
|
||||
7163a8d1262caeb89162d816e9dd75f8f57c1717
|
||||
3bae68e0c372bbafe3df07c05baa738fe0b2da6f
|
@ -1 +1 @@
|
||||
accb634b47f5f8a6ca1e2ea59c31c882ee0d4c7f
|
||||
cb5ad4878b31058bfc729605188dfcccf00213d7
|
@ -1 +1 @@
|
||||
35af2dc0652382ec10829d2a0a6e68e9dc6d2982
|
||||
fc4868ddcb03f09d6ae15010fff2cec77fe78275
|
@ -1 +1 @@
|
||||
d6e1c470b2057d2bf7e2ac22172e386a7b01212f
|
||||
8fd86e0eb52e38e8dfbf6c84f834c7d2ce0d9762
|
@ -563,6 +563,8 @@ typedef struct {
|
||||
|
||||
MonoContext *ctx;
|
||||
MonoContext ctx_mem;
|
||||
|
||||
MonoClass *managed_exc_type;
|
||||
} MonoThreadSummary;
|
||||
|
||||
gboolean
|
||||
|
@ -1 +1 @@
|
||||
f4c6b411e34be56a1172f461738b6605e2ddb7e1
|
||||
fa267c8a71940e33451604f8704b53e6b81735b6
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/23f2024"
|
||||
#define FULL_VERSION "explicit/f0e4666"
|
||||
|
@ -253,6 +253,13 @@ mono_native_state_add_thread (JsonWriter *writer, MonoThreadSummary *thread, Mon
|
||||
mono_json_writer_object_key(writer, "native_thread_id");
|
||||
mono_json_writer_printf (writer, "\"0x%x\",\n", (gpointer) thread->native_thread_id);
|
||||
|
||||
if (thread->managed_exc_type) {
|
||||
assert_has_space ();
|
||||
mono_json_writer_indent (writer);
|
||||
mono_json_writer_object_key(writer, "managed_exception_type");
|
||||
mono_json_writer_printf (writer, "\"%s.%s\",\n", m_class_get_name_space (thread->managed_exc_type), m_class_get_name (thread->managed_exc_type));
|
||||
}
|
||||
|
||||
if (ctx)
|
||||
mono_native_state_add_ctx (writer, ctx);
|
||||
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
0cade38f0eda565815fc761e173b5792916b3601
|
||||
b8186c530e110e80c57674a333d6ad88b99e723b
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
1902d0a0ed9b33ddcb0f96bd72fb7909c9ced9c1
|
||||
77ddb622e16362d979b2dee235844a5d44013cb7
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4a0fbb145643956da7236b74a5555552fdcfe104
|
||||
ec831d5579d7e2af0d15195892e647dee93ea8f5
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.18.0.215\n"
|
||||
"Project-Id-Version: mono 5.18.0.216\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-11-29 08:14+0000\n"
|
||||
"POT-Creation-Date: 2018-12-01 08:07+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 @@
|
||||
7995bb70c919a9f1b7f43dac56fb59fcf3478296
|
||||
724dac8820d1ea41ded41f83d32965eb5fdc07a7
|
Loading…
x
Reference in New Issue
Block a user