Imported Upstream version 3.12.0

Former-commit-id: cf92446697332992ec36726e78eb8703e1f259d7
2015-01-13 10:44:36 +00:00
parent 8b9b85e7f5
commit 181b81b4a4
659 changed files with 12743 additions and 16300 deletions
--- a/mcs/class/System.Web.Extensions/System.Web.Script.Services/LogicalTypeInfo.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Script.Services/LogicalTypeInfo.cs
@ -411,7 +411,7 @@ if (typeof({0}) === 'undefined') {{", className);
 				var ret = new Dictionary <string, object> ();

 				for (int i = nvc.Count - 1; i >= 0; i--)
-					ret.Add (nvc.GetKey (i), JavaScriptSerializer.DefaultSerializer.DeserializeObjectInternal (nvc.Get (i)));
+					ret.Add (nvc.GetKey (i), nvc.Get (i));

 				return ret;
 			}