Merge pull request #292 from ellismg/remove-unix-specific-encoding-workaround

Remove Unix specific hack in Encoding.GetEncoding

src/mscorlib/src/System/Text/Encoding.cs

@@ -413,11 +413,6 @@ namespace System.Text
 #endif
         public static Encoding GetEncoding(int codepage)
         {
-// TODO: Remove the PLATFOM_UNIX specific code in favor of there regular path.  Right the regular path causes exceptions to be thrown
-//       which hangs the runtime on Unix.
-#if PLATFORM_UNIX            
-            return UTF8;
-#else
             Encoding result = EncodingProvider.GetEncodingFromProvider(codepage);
             if (result != null)
                 return result;
@@ -552,7 +547,6 @@ namespace System.Text
 
             }
             return result;
-#endif
         }
 
         [Pure]