Imported Upstream version 4.4.2.11

Former-commit-id: f298c60ab6b9c5431949284d6d35f1c54044c859

mcs/class/Facades/System.Text.Encoding.CodePages/CodePagesEncodingProvider.cs

@@ -22,16 +22,32 @@
 
 namespace System.Text
 {
-	public sealed partial class CodePagesEncodingProvider
+	public sealed partial class CodePagesEncodingProvider : EncodingProvider
 	{
+		static CodePagesEncodingProvider instance = new CodePagesEncodingProvider ();
+
 		private CodePagesEncodingProvider ()
 		{
 		}
 		
 		public static System.Text.EncodingProvider Instance { 
 			get {
-				throw new NotImplementedException ();
+				return instance;
 			}
 		}
+
+		public override Encoding GetEncoding (string name)
+		{
+			// MSDN: "if name is not the name of an encoding that you support, the method should return null."
+			// We do this here since all our encodings are already supported by the main Encoding class
+			return null;
+		}
+
+		public override Encoding GetEncoding (int codepage)
+		{
+			// MSDN: "if codepage is not the code page identifier of an encoding that you support, the method should return null."
+			// We do this here since all our encodings are already supported by the main Encoding class
+			return null;
+		}
 	}
 }