Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

mcs/class/corlib/Mono/ChangeLog

@@ -1,68 +0,0 @@
-2010-06-17  Miguel de Icaza  <miguel@novell.com>
-
-	* DataConverter.cs: On bracketed cases, save the position as well,
-	like we do in the repeat case without brackets.  Fixes #595929
-
-2010-03-07  Rodrigo Kumpera  <rkumpera@novell.com>
-
-	* Runtime.cs: Document how NewObject() is meant to be used.
-
-2010-03-04  Geoff Norton  <gnorton@novell.com>
-
-	* Runtime.cs: Add a new private internal icall to construct
-	an object from its type without running the ctor.
-
-2008-11-17  Chris Howie  <cdhowie@gmail.com>
-
-	* DataConverter.cs: Fix alignment for strings when the
-	natural-alignment parameter is used '!'.   
-
-	Disables CLS errors when not compiling with the CLS flag.
-	
-	Fixes #445867
-
-2008-03-12  Miguel de Icaza  <miguel@novell.com>
-
-	* DataConverter.cs: Fencepost bug fix from Kenneth D. Weinert
-	<kenw@quarter-flash.com>
-
-	Fix from Kenneth as well to avoid getting stuck on a loop on
-	repeat patterns (example: _6C!i!i), it would loop inside the '6'
-	never continuing the decoding of the format string.
-	
-2008-02-10  Miguel de Icaza  <miguel@novell.com>
-
-	* DataConverter.cs: Apply fix from Cliff Brake
-	<cliff.brake@gmail.com>, we were incrementing b.i in two places. 
-
-2007-05-30  Miguel de Icaza  <miguel@novell.com>
-
-	* DataConverter.cs: Fix the PutBytesLE and PutByteBE, they were
-	overwriting memory that was out of range.    
-
-	Fix based on patch from Luis Gomes.
-
-	A couple of fixes to compile with MS.NET 2.0 (from Luis as well). 
-
-2007-04-06  Miguel de Icaza  <miguel@novell.com>
-
-	* a.cs: Test this stuff.
-
-	* DataConverter.cs: Implement Paolo's suggestion: provide a
-	PutBytes interface that stores data into an existing byte array
-	and make the GetBytes operations be wrappers around PutBytes. 
-
-2005-06-05  Kornél Pál <kornelpal@hotmail.com>
-
-	* Runtime.cs: Added GetDisplayName:
-	Returns the name and version of the runtime for reporting.
-	This method is intended for public use using reflection.
-
-2004-05-22  Todd Berman  <tberman@sevenl.net>
-
-	* Runtime.cs: Add this back, gnome# needs it. Mark everything internal.
-
-2002-10-08  Miguel de Icaza  <miguel@ximian.com>
-
-	* Runtime.cs: New file.
-

mcs/class/corlib/Mono/DataConverter.cs

@@ -683,7 +683,11 @@ namespace Mono {
 						n = 2;
 						break;
 					case '7':
+#if PCL
+						e = Encoding.GetEncoding ("utf-7");
+#else
 						e = Encoding.UTF7;
+#endif
 						n = 1;
 						break;
 					case 'b':
@@ -691,11 +695,19 @@ namespace Mono {
 						n = 2;
 						break;
 					case '3':
+#if PCL
+						e = Encoding.GetEncoding ("utf-32");
+#else
 						e = Encoding.GetEncoding (12000);
+#endif
 						n = 4;
 						break;
 					case '4':
+#if PCL
+						e = Encoding.GetEncoding ("utf-32BE");
+#else
 						e = Encoding.GetEncoding (12001);
+#endif
 						n = 4;
 						break;