Imported Upstream version 5.12.0.220

Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476

mcs/class/I18N/CJK/CP51932.cs

@@ -33,10 +33,9 @@
 
 /*
 
-	Well, there looks no jis.table source. Thus, it seems like it is 
-	generated from text files from Unicode Home Page such like
-	ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0208.TXT
-	However, it is non-normative and in Japan it is contains many problem.
+	jis.table is generated from uni2tab.c, which requires CP932.TXT and
+	Unihan.txt as input files. However, it is non-normative and in Japan it is
+	contains many problem.
 
 	FIXME:  Some characters such as 0xFF0B (wide "plus") are missing in
 		that table.

mcs/class/I18N/CJK/Test/I18N.CJK.Test.cs

@@ -161,6 +161,15 @@ namespace MonoTests.I18N.CJK
 			AssertDecode ("Test/texts/japanese-utf8.txt", "Test/texts/japanese-932.txt", 932);
 		}
 
+		[Test]
+		public void Bug28321 ()
+		{
+			var expected = "\u00D7\u00B4\u00B1\u00F7\u00B6\u00B0\u00A8\u00A7";
+			var text = Manager.GetEncoding ("shift_jis").GetString (Convert.FromBase64String ("gX6BTIF9gYCB94GLgU6BmA=="));
+
+			Assert.AreEqual (expected, text);
+		}
+
 		// EUC-JP
 
 		[Test]