Revert "[corlib] Restore UTF8 as the default encoding for XI and XM [#29928]"
authorSebastien Pouliot <sebastien@xamarin.com>
Wed, 27 May 2015 17:34:33 +0000 (13:34 -0400)
committerSebastien Pouliot <sebastien@xamarin.com>
Wed, 27 May 2015 17:34:33 +0000 (13:34 -0400)
This reverts commit 605192528de1a9c9c95a97bc5a2de7d3c85b322d.

Using EncodingHelper.UTF8Unmarked cause regressions in System and
System.Net.Http unit tests

mcs/class/corlib/System.Text/EncodingHelper.cs

index d4a33612c581df9fb97b17c5faa96bce71a062f8..f077e44e254a78f4f836c0b1d5f68e64d5f0bc14 100644 (file)
@@ -74,9 +74,6 @@ internal static class EncodingHelper
        internal static Encoding GetDefaultEncoding ()
        {
                Encoding enc = null;
-#if (MONOTOUCH || XAMMAC)
-               enc = EncodingHelper.UTF8Unmarked;
-#else
                                                // See if the underlying system knows what
                                                // code page handler we should be using.
                                                int code_page = 1;
@@ -106,7 +103,6 @@ internal static class EncodingHelper
                                                        // not supported by underlying OS
                                                        enc = EncodingHelper.UTF8Unmarked;
                                                }
-#endif
                return enc;
        }