Merge pull request #1140 from Unity-Technologies/unity-master-dataserializer-fix

Fix serialization issue with DataContractJsonSerializer UseSimpleDictionaryFormat (case 1070667)

Author: mderoy

mcs/class/System.Runtime.Serialization/ReferenceSources/JsonFormatReaderGenerator_static.cs

@@ -508,7 +508,9 @@ void ReadSimpleDictionary (CollectionDataContract collectionContract, Type keyVa
 					var jsonMemberName = XmlObjectSerializerReadContextComplexJson.GetJsonMemberName (xmlReader);
 					object key = null;
 
-					if (keyParseMode == KeyParseMode.UsingParseEnum)
+					if (keyParseMode == KeyParseMode.AsString)
+						key = jsonMemberName;
+					else if (keyParseMode == KeyParseMode.UsingParseEnum)
 						key = Enum.Parse (keyType, jsonMemberName);
 					else if (keyParseMode == KeyParseMode.UsingCustomParse)
 						key = keyDataContract.ParseMethod.Invoke (null, new object [] {jsonMemberName});