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

Imported Upstream version 4.8.0.344

Browse Source 
Former-commit-id: 609085c14e6ad2a66429d180056034e93c0547d2
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-16 13:31:47 +00:00
parent 94b2861243
commit 62edeef69b
89 changed files with 4558 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mcs/class/System.XML/System.Xml.Serialization/TypeData.cs
View File

@ -135,10 +135,16 @@ namespace System.Xml.Serialization
void LookupTypeConvertor ()
{
// We only need this for System.Xml.Linq.
var convertor = type.GetCustomAttribute<XmlTypeConvertorAttribute> ();
if (convertor != null)
typeConvertor = type.GetMethod (convertor.Method, BindingFlags.Static | BindingFlags.NonPublic);
// We only need this for System.Xml.Linq
var t = type;
// HACK: because interpreter array handling is so bad
if (t.IsArray)
t = t.GetElementType ();
var convertor = t.GetCustomAttribute<XmlTypeConvertorAttribute> ();
if (convertor != null) {
typeConvertor = t.GetMethod (convertor.Method, BindingFlags.Static | BindingFlags.NonPublic);
}
}
internal void ConvertForAssignment (ref object value)

3
mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReaderInterpreter.cs
View File

@ -737,7 +737,8 @@ namespace System.Xml.Serialization
Type type = listType.Type;
if (type.IsArray)
{
list = EnsureArrayIndex ((Array)list, index, type.GetElementType());
list = EnsureArrayIndex ((Array)list, index, type.GetElementType ());
listType.ConvertForAssignment (ref value);
((Array)list).SetValue (value, index);
}
else // Must be IEnumerable