mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.18.0.142

Browse Source 
Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-09 08:20:59 +00:00
parent e52655b4dc
commit 0abdbe5a7d
1547 changed files with 93792 additions and 47893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/System.Runtime.Serialization/ReferenceSources/JsonFormatReaderGenerator_static.cs
View File

@ -508,7 +508,9 @@ namespace System.Runtime.Serialization.Json
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});