From dd9307c8da599704271512476fc0e876cb071505 Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed Date: Thu, 6 Apr 2017 12:58:17 -0700 Subject: [PATCH] Make Encoding.Default return UTF8 without BOM emission (#10747) * Make Encoding.Default return UTF8 without BOM emission * Remove SL reference in the code * Remove the static cache --- src/mscorlib/src/System/Text/Encoding.cs | 6 ++---- src/mscorlib/src/System/Text/UTF8Encoding.cs | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mscorlib/src/System/Text/Encoding.cs b/src/mscorlib/src/System/Text/Encoding.cs index a4fdc79..aab9b4a 100644 --- a/src/mscorlib/src/System/Text/Encoding.cs +++ b/src/mscorlib/src/System/Text/Encoding.cs @@ -1230,10 +1230,8 @@ namespace System.Text Encoding enc; - - // For silverlight we use UTF8 since ANSI isn't available - enc = UTF8; - + // For netcore we use UTF8 since ANSI isn't available + enc = new UTF8Encoding.UTF8EncodingSealed(encoderShouldEmitUTF8Identifier: false); // This method should only ever return one Encoding instance return Interlocked.CompareExchange(ref defaultEncoding, enc, null) ?? enc; diff --git a/src/mscorlib/src/System/Text/UTF8Encoding.cs b/src/mscorlib/src/System/Text/UTF8Encoding.cs index d321c7c..078fb46 100644 --- a/src/mscorlib/src/System/Text/UTF8Encoding.cs +++ b/src/mscorlib/src/System/Text/UTF8Encoding.cs @@ -58,6 +58,7 @@ namespace System.Text internal sealed class UTF8EncodingSealed : UTF8Encoding { public UTF8EncodingSealed() : base(encoderShouldEmitUTF8Identifier: true) { } + public UTF8EncodingSealed(bool encoderShouldEmitUTF8Identifier) : base(encoderShouldEmitUTF8Identifier) { } } // Used by Encoding.UTF8 for lazy initialization -- 2.7.4