From f28a5c0eb4859688e3b20283a021bbc54371c398 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 29 Nov 2018 08:35:58 +0000 Subject: [PATCH] Imported Upstream version 5.18.0.215 Former-commit-id: 77919a0dc17b44051617ced65a58ca041d915216 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- .../monodroid/mscorlib.cs.REMOVED.git-id | 2 +- .../monotouch/mscorlib.cs.REMOVED.git-id | 2 +- .../net_4_x/mscorlib.cs.REMOVED.git-id | 2 +- .../System/Text/DecoderReplacementFallback.cs | 15 ++++++++- .../System/Text/EncoderReplacementFallback.cs | 15 ++++++++- mcs/build/common/Consts.cs | 2 +- .../corlib/Test/System.Text/EncodingTest.cs | 30 +++++++++++++++++- .../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/mini/version.h | 2 +- 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 +- 51 files changed, 98 insertions(+), 44 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 7547920d80..e386a1e8a5 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -5c6f8d6dc0d542cee94e9530a7fc5faae045c79b \ No newline at end of file +31951a093f764dd311481af300adba346e4e72b0 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index b7511972f8..c6be499ac0 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -b96c849a337dca4509ff250334a832afd8271256 \ No newline at end of file +53c157fa25c8da26edde2a279c8a28a8ae32559d \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id index 25074efbef..fbe1182957 100644 --- a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -938175296af476579141f78cdb7065a2b5e8c282 \ No newline at end of file +0966d02146233778bc2bff5c642a72b4db22341e \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id index 4fe823f242..9339e0f4fc 100644 --- a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -159974bcdc047e01eead76b3c2d1e87b01f73ebf \ No newline at end of file +2ae9ab2e8d1f583ad2c036454fb3b79ecbc39035 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id index 56aea66ebb..9ee1faf0ec 100644 --- a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -3fc7686da8fa77fe19257d65c6feb6dffef07bae \ No newline at end of file +0fc46f55fa06c9cc6efd0610c0aca16bae0936d0 \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/DecoderReplacementFallback.cs b/external/corefx/src/Common/src/CoreLib/System/Text/DecoderReplacementFallback.cs index 1dc41d8d22..7147b3ea0a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/DecoderReplacementFallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/DecoderReplacementFallback.cs @@ -3,13 +3,16 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Runtime.Serialization; namespace System.Text { #if MONO [System.Serializable] -#endif + public sealed class DecoderReplacementFallback : DecoderFallback, ISerializable +#else public sealed class DecoderReplacementFallback : DecoderFallback +#endif { // Our variables private String _strDefault; @@ -19,6 +22,16 @@ namespace System.Text { } +#if MONO + internal DecoderReplacementFallback(SerializationInfo info, StreamingContext context) + { + try { _strDefault = info.GetString("strDefault"); } // for old mono and .NET 4.x + catch { _strDefault = info.GetString("_strDefault"); } + } + + void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context) => info.AddValue("strDefault", _strDefault); +#endif + public DecoderReplacementFallback(String replacement) { if (replacement == null) diff --git a/external/corefx/src/Common/src/CoreLib/System/Text/EncoderReplacementFallback.cs b/external/corefx/src/Common/src/CoreLib/System/Text/EncoderReplacementFallback.cs index ff97fbaf41..eac4c9e3a8 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Text/EncoderReplacementFallback.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Text/EncoderReplacementFallback.cs @@ -5,13 +5,16 @@ using System; using System.Runtime; using System.Diagnostics; +using System.Runtime.Serialization; namespace System.Text { #if MONO [Serializable] -#endif + public sealed class EncoderReplacementFallback : EncoderFallback, ISerializable +#else public sealed class EncoderReplacementFallback : EncoderFallback +#endif { // Our variables private String _strDefault; @@ -21,6 +24,16 @@ namespace System.Text { } +#if MONO + internal EncoderReplacementFallback(SerializationInfo info, StreamingContext context) + { + try { _strDefault = info.GetString("strDefault"); } // for old mono and .NET 4.x + catch { _strDefault = info.GetString("_strDefault"); } + } + + void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context) => info.AddValue("strDefault", _strDefault); +#endif + public EncoderReplacementFallback(String replacement) { // Must not be null diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 1d21ddff4d..3ce097be0c 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.214"; + public const string MonoVersion = "5.18.0.215"; 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.Text/EncodingTest.cs b/mcs/class/corlib/Test/System.Text/EncodingTest.cs index c5b932be3b..f51739ae23 100644 --- a/mcs/class/corlib/Test/System.Text/EncodingTest.cs +++ b/mcs/class/corlib/Test/System.Text/EncodingTest.cs @@ -27,8 +27,10 @@ // using System; +using System.IO; using System.Text; - +using System.Linq; +using System.Runtime.Serialization.Formatters.Binary; using NUnit.Framework; namespace MonoTests.System.Text @@ -128,5 +130,31 @@ namespace MonoTests.System.Text { Assert.AreEqual ("Unicode (UTF-8)", Encoding.UTF8.EncodingName); } + + [Test] // https://github.com/mono/mono/issues/11663 + public void EncodingIsBinaryCompatible () + { + const string serializedEncoding = + "AAEAAAD/////AQAAAAAAAAAEAQAAABlTeXN0ZW0uVGV4dC5BU0NJSUVuY29kaW5nCQAAAAptX2NvZGVQYWdlCGRhdGFJdGVtD2VuY29kZXJGYWxsY" + + "mFjaw9kZWNvZGVyRmFsbGJhY2sTRW5jb2RpbmcrbV9jb2RlUGFnZRFFbmNvZGluZytkYXRhSXRlbRVFbmNvZGluZyttX2lzUmVhZE9ubHkYRW5jb2R" + + "pbmcrZW5jb2RlckZhbGxiYWNrGEVuY29kaW5nK2RlY29kZXJGYWxsYmFjawADAwMAAwADAwglU3lzdGVtLkdsb2JhbGl6YXRpb24uQ29kZVBhZ2VEY" + + "XRhSXRlbSZTeXN0ZW0uVGV4dC5FbmNvZGVyUmVwbGFjZW1lbnRGYWxsYmFjayZTeXN0ZW0uVGV4dC5EZWNvZGVyUmVwbGFjZW1lbnRGYWxsYmFjawg" + + "lU3lzdGVtLkdsb2JhbGl6YXRpb24uQ29kZVBhZ2VEYXRhSXRlbQEmU3lzdGVtLlRleHQuRW5jb2RlclJlcGxhY2VtZW50RmFsbGJhY2smU3lzdGVtL" + + "lRleHQuRGVjb2RlclJlcGxhY2VtZW50RmFsbGJhY2ufTgAACgkCAAAACQMAAACfTgAACgEJAgAAAAkDAAAABAIAAAAmU3lzdGVtLlRleHQuRW5jb2R" + + "lclJlcGxhY2VtZW50RmFsbGJhY2sDAAAACnN0ckRlZmF1bHQbYklzTWljcm9zb2Z0QmVzdEZpdEZhbGxiYWNrK0VuY29kZXJGYWxsYmFjaytiSXNNa" + + "WNyb3NvZnRCZXN0Rml0RmFsbGJhY2sBAAABAQYGAAAAAT8AAAQDAAAAJlN5c3RlbS5UZXh0LkRlY29kZXJSZXBsYWNlbWVudEZhbGxiYWNrAwAAAAp" + + "zdHJEZWZhdWx0G2JJc01pY3Jvc29mdEJlc3RGaXRGYWxsYmFjaytEZWNvZGVyRmFsbGJhY2srYklzTWljcm9zb2Z0QmVzdEZpdEZhbGxiYWNrAQAAA" + + "QEJBgAAAAAACw=="; + using (var ms = new MemoryStream (Convert.FromBase64String (serializedEncoding))) + { + var serializer = new BinaryFormatter (); + var e = (Encoding) serializer.Deserialize (ms); + Assert.IsTrue (e.EncoderFallback.GetHashCode () != 0); + Assert.IsTrue (e.DecoderFallback.GetHashCode () != 0); + Assert.IsTrue (e.GetDecoder ().GetHashCode () != 0); + Assert.IsTrue (e.GetEncoder ().GetHashCode () != 0); + Assert.IsTrue (e.GetHashCode () != 0); + } + } } } 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 5f4ae92ab8..446bd94c50 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 @@ -141b59904d9f2413d9c7ef8b5e6a4e0376454917 \ No newline at end of file +e49dd86c1aedd272e87548f3e73c04a05c077f62 \ 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 b23255bb52..1d65e19217 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 @@ -59ceae5a2843f01d4f721c6adadf21e85f4ca8a4 \ No newline at end of file +59facca75f0abaceab60a7313bc3e0e188b094d2 \ 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 0c3621dbb1..a5979b1f9d 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 @@ -c423edda15d24c7a582074a0bdfc1b837e71f7fa \ No newline at end of file +248b0372552658cf528f862077122bead9f5a5b0 \ 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 57b099733f45037fc77c3b0bb5a8eefc162298e3..4e64e482fd423ea3b85bced98057f6e974573538 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZir=V(fsD0`0W=H{X2n0_CD@~ delta 58 zcmV-A0LA}+hz5X&29SsZr6g$ffsD0`0W=H{`Q1x{<|B7Wfit;Vm<~Kpx6lj$Y6b%| Q04kTDeE}-BXA=RLaIyIn@~ delta 58 zcmV-A0LA}+hz5X&29SsZr6g$ffsD0`0W=H{`Q1x{<|B7Wfit;Vm<~Kpx6lj$Y6b%| Q04kTDeE}-BXA=RLaIyIn@~ delta 58 zcmV-A0LA}+hz5X&29SsZr6g$ffsD0`0W=H{`Q1x{<|B7Wfit;Vm<~Kpx6lj$Y6b%| Q04kTDeE}-BXA=RLaIyIn@~ delta 58 zcmV-A0LA}+hz5X&29SsZr6g$ffsD0`0W=H{`Q1x{<|B7Wfit;Vm<~Kpx6lj$Y6b%| Q04kTDeE}-BXA=RLaIyIn=p_J7FGskoB7oXv;bi%2Mz!L diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 7283e4d7db..4e66f3d0c1 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -cc3ad03c848c3407513c4caae60f023d217c3dc0 \ No newline at end of file +4a0fbb145643956da7236b74a5555552fdcfe104 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 6a94a5e66e..b55c62ee3b 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.214\n" +"Project-Id-Version: mono 5.18.0.215\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-11-28 08:06+0000\n" +"POT-Creation-Date: 2018-11-29 08:14+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 962f7f87b1711609a3c4d5ef700817b0afb419fa..d92dee745cf01dd723428d34f9b492a2390caf29 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0_eEUXMoHm6QyYzF{tDF}oB delta 22 ecmaF1gXP%{mJM-J*)0?dEUXO7Hm6QyYzF{tA_#;4 diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 97bb60c71f..b06a155870 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -66f07da666920faa81bfaef5bdf19c9a2cff3970 \ No newline at end of file +7995bb70c919a9f1b7f43dac56fb59fcf3478296 \ No newline at end of file