From dc263d177c684dd3d04ba3adff10049250b1a8c1 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 1 Dec 2018 08:24:18 +0000 Subject: [PATCH] Imported Upstream version 5.18.0.216 Former-commit-id: 4033cecd01f7c507c6c237b8ffb6e36dec21ca85 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- mcs/class/corlib/Test/System/ExceptionTest.cs | 1 + .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/metadata/threads-types.h | 2 ++ mono/mini/mini-exceptions.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/utils/mono-state.c | 7 +++++++ po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 ++-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 49 files changed, 49 insertions(+), 39 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index e386a1e8a5..9cebf7a06e 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -31951a093f764dd311481af300adba346e4e72b0 \ No newline at end of file +fb71c452ac1142d82460721918a380abacf24928 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index c6be499ac0..b092c120f7 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -53c157fa25c8da26edde2a279c8a28a8ae32559d \ No newline at end of file +9e1ea283eb07091ed3871045c7bc2b332e21ac30 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 3ce097be0c..25359c6f8e 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.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"; diff --git a/mcs/class/corlib/Test/System/ExceptionTest.cs b/mcs/class/corlib/Test/System/ExceptionTest.cs index 97123e9ab2..ee0f6ea3cb 100644 --- a/mcs/class/corlib/Test/System/ExceptionTest.cs +++ b/mcs/class/corlib/Test/System/ExceptionTest.cs @@ -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", diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index 446bd94c50..8ef8e27540 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e49dd86c1aedd272e87548f3e73c04a05c077f62 \ No newline at end of file +ed109d47a69d291e7fcbbdbc62b7ecd65cdb637f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index 1d65e19217..b80be3e748 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -59facca75f0abaceab60a7313bc3e0e188b094d2 \ No newline at end of file +79289cf3ffe4313a0d74efbcc6c88d8e18377ecb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index a5979b1f9d..4ef6ea13b1 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -248b0372552658cf528f862077122bead9f5a5b0 \ No newline at end of file +9f1bd1d6d187f2023e716aa54a42c33d28438a50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 4e64e482fd423ea3b85bced98057f6e974573538..0e04c0fbad41fc4b2f572ed2aebdeb5b8b7a81bc 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZdLj6RfsD0`0W=H{O04Hd?qVuQu8WZEB*S+ax6lj$Y6b%~ Q04kTDeE}-BXA=RLaJ&T;hyVZp delta 58 zcmV-A0LA}+hz5X&29SsZir=V(fsD0`0W=H{X2n0_CD@~ diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id index 71465ddb96..8a3970b7bd 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7163a8d1262caeb89162d816e9dd75f8f57c1717 \ No newline at end of file +3bae68e0c372bbafe3df07c05baa738fe0b2da6f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id index 1faf775056..ce8766cb75 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -accb634b47f5f8a6ca1e2ea59c31c882ee0d4c7f \ No newline at end of file +cb5ad4878b31058bfc729605188dfcccf00213d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id index a3ef38898e..1838e4217c 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -35af2dc0652382ec10829d2a0a6e68e9dc6d2982 \ No newline at end of file +fc4868ddcb03f09d6ae15010fff2cec77fe78275 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id index 5e676ad8f9..3a9f346232 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d6e1c470b2057d2bf7e2ac22172e386a7b01212f \ No newline at end of file +8fd86e0eb52e38e8dfbf6c84f834c7d2ce0d9762 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index 446bd94c50..8ef8e27540 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e49dd86c1aedd272e87548f3e73c04a05c077f62 \ No newline at end of file +ed109d47a69d291e7fcbbdbc62b7ecd65cdb637f \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index 1d65e19217..b80be3e748 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -59facca75f0abaceab60a7313bc3e0e188b094d2 \ No newline at end of file +79289cf3ffe4313a0d74efbcc6c88d8e18377ecb \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index a5979b1f9d..4ef6ea13b1 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -248b0372552658cf528f862077122bead9f5a5b0 \ No newline at end of file +9f1bd1d6d187f2023e716aa54a42c33d28438a50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 4e64e482fd423ea3b85bced98057f6e974573538..0e04c0fbad41fc4b2f572ed2aebdeb5b8b7a81bc 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZdLj6RfsD0`0W=H{O04Hd?qVuQu8WZEB*S+ax6lj$Y6b%~ Q04kTDeE}-BXA=RLaJ&T;hyVZp delta 58 zcmV-A0LA}+hz5X&29SsZir=V(fsD0`0W=H{X2n0_CD@~ diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id index 71465ddb96..8a3970b7bd 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7163a8d1262caeb89162d816e9dd75f8f57c1717 \ No newline at end of file +3bae68e0c372bbafe3df07c05baa738fe0b2da6f \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id index 1faf775056..ce8766cb75 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -accb634b47f5f8a6ca1e2ea59c31c882ee0d4c7f \ No newline at end of file +cb5ad4878b31058bfc729605188dfcccf00213d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id index a3ef38898e..1838e4217c 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -35af2dc0652382ec10829d2a0a6e68e9dc6d2982 \ No newline at end of file +fc4868ddcb03f09d6ae15010fff2cec77fe78275 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id index 5e676ad8f9..3a9f346232 100644 --- a/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d6e1c470b2057d2bf7e2ac22172e386a7b01212f \ No newline at end of file +8fd86e0eb52e38e8dfbf6c84f834c7d2ce0d9762 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index 446bd94c50..8ef8e27540 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e49dd86c1aedd272e87548f3e73c04a05c077f62 \ No newline at end of file +ed109d47a69d291e7fcbbdbc62b7ecd65cdb637f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index 1d65e19217..b80be3e748 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -59facca75f0abaceab60a7313bc3e0e188b094d2 \ No newline at end of file +79289cf3ffe4313a0d74efbcc6c88d8e18377ecb \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index a5979b1f9d..4ef6ea13b1 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -248b0372552658cf528f862077122bead9f5a5b0 \ No newline at end of file +9f1bd1d6d187f2023e716aa54a42c33d28438a50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 4e64e482fd423ea3b85bced98057f6e974573538..0e04c0fbad41fc4b2f572ed2aebdeb5b8b7a81bc 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZdLj6RfsD0`0W=H{O04Hd?qVuQu8WZEB*S+ax6lj$Y6b%~ Q04kTDeE}-BXA=RLaJ&T;hyVZp delta 58 zcmV-A0LA}+hz5X&29SsZir=V(fsD0`0W=H{X2n0_CD@~ diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id index 71465ddb96..8a3970b7bd 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7163a8d1262caeb89162d816e9dd75f8f57c1717 \ No newline at end of file +3bae68e0c372bbafe3df07c05baa738fe0b2da6f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id index 1faf775056..ce8766cb75 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -accb634b47f5f8a6ca1e2ea59c31c882ee0d4c7f \ No newline at end of file +cb5ad4878b31058bfc729605188dfcccf00213d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id index a3ef38898e..1838e4217c 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -35af2dc0652382ec10829d2a0a6e68e9dc6d2982 \ No newline at end of file +fc4868ddcb03f09d6ae15010fff2cec77fe78275 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id index 5e676ad8f9..3a9f346232 100644 --- a/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d6e1c470b2057d2bf7e2ac22172e386a7b01212f \ No newline at end of file +8fd86e0eb52e38e8dfbf6c84f834c7d2ce0d9762 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index 446bd94c50..8ef8e27540 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e49dd86c1aedd272e87548f3e73c04a05c077f62 \ No newline at end of file +ed109d47a69d291e7fcbbdbc62b7ecd65cdb637f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index 1d65e19217..b80be3e748 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -59facca75f0abaceab60a7313bc3e0e188b094d2 \ No newline at end of file +79289cf3ffe4313a0d74efbcc6c88d8e18377ecb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index a5979b1f9d..4ef6ea13b1 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -248b0372552658cf528f862077122bead9f5a5b0 \ No newline at end of file +9f1bd1d6d187f2023e716aa54a42c33d28438a50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 4e64e482fd423ea3b85bced98057f6e974573538..0e04c0fbad41fc4b2f572ed2aebdeb5b8b7a81bc 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZdLj6RfsD0`0W=H{O04Hd?qVuQu8WZEB*S+ax6lj$Y6b%~ Q04kTDeE}-BXA=RLaJ&T;hyVZp delta 58 zcmV-A0LA}+hz5X&29SsZir=V(fsD0`0W=H{X2n0_CD@~ diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id index 71465ddb96..8a3970b7bd 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -7163a8d1262caeb89162d816e9dd75f8f57c1717 \ No newline at end of file +3bae68e0c372bbafe3df07c05baa738fe0b2da6f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id index 1faf775056..ce8766cb75 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -accb634b47f5f8a6ca1e2ea59c31c882ee0d4c7f \ No newline at end of file +cb5ad4878b31058bfc729605188dfcccf00213d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id index a3ef38898e..1838e4217c 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -35af2dc0652382ec10829d2a0a6e68e9dc6d2982 \ No newline at end of file +fc4868ddcb03f09d6ae15010fff2cec77fe78275 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id index 5e676ad8f9..3a9f346232 100644 --- a/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d6e1c470b2057d2bf7e2ac22172e386a7b01212f \ No newline at end of file +8fd86e0eb52e38e8dfbf6c84f834c7d2ce0d9762 \ No newline at end of file diff --git a/mono/metadata/threads-types.h b/mono/metadata/threads-types.h index 53ef5386ce..e3206ef8a7 100644 --- a/mono/metadata/threads-types.h +++ b/mono/metadata/threads-types.h @@ -563,6 +563,8 @@ typedef struct { MonoContext *ctx; MonoContext ctx_mem; + + MonoClass *managed_exc_type; } MonoThreadSummary; gboolean diff --git a/mono/mini/mini-exceptions.c.REMOVED.git-id b/mono/mini/mini-exceptions.c.REMOVED.git-id index 78a3f583f9..0cb29b424e 100644 --- a/mono/mini/mini-exceptions.c.REMOVED.git-id +++ b/mono/mini/mini-exceptions.c.REMOVED.git-id @@ -1 +1 @@ -f4c6b411e34be56a1172f461738b6605e2ddb7e1 \ No newline at end of file +fa267c8a71940e33451604f8704b53e6b81735b6 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 5b1df42b56..eb2b5ea4ff 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/23f2024" +#define FULL_VERSION "explicit/f0e4666" diff --git a/mono/utils/mono-state.c b/mono/utils/mono-state.c index 6ce9ae8531..6ec7d28b15 100644 --- a/mono/utils/mono-state.c +++ b/mono/utils/mono-state.c @@ -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); diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 050e5b24d5dbc7ab2ae1325aedf13d1b5da93e17..81ad7bfafd704a4106bf3bfe8c91aa0ae899f6d2 100644 GIT binary patch delta 23 ecmbQIHBW29BQ7o@T?0b}0}Cqy^UZI#jJN<>-UkH$ delta 23 ecmbQIHBW29BQ7pOT_Z~c0}Crdlg)3qjJNPEh6)B2RtDyq`PB=w0Cg+}mjD0& delta 25 gcmeyri1Gg-#tp3MT!y+vmI?+IR)!{<`PB=w0CkK9o&W#< diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 4e66f3d0c1..8dac9b34e6 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -4a0fbb145643956da7236b74a5555552fdcfe104 \ No newline at end of file +ec831d5579d7e2af0d15195892e647dee93ea8f5 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index b55c62ee3b..98b8548586 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -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 \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index d92dee745cf01dd723428d34f9b492a2390caf29..05b5dd75d5062673d8d6446009a28f3c0fa1f8f6 100644 GIT binary patch delta 25 hcmaF1gXP%{mJQKUxr}rT3>6G4tPIRIr%q*T2LOa`2@L=M delta 25 hcmaF1gXP%{mJQKUxeRrUEENnatPD*yr%q*T2LOc62^0VT diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index b06a155870..deca03da50 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -7995bb70c919a9f1b7f43dac56fb59fcf3478296 \ No newline at end of file +724dac8820d1ea41ded41f83d32965eb5fdc07a7 \ No newline at end of file