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

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
View File

@ -37,7 +37,7 @@ using System.Reflection;
using System.Xml;
using System.Xml.Schema;
using System.Text;
#if !NET_2_1
#if !MOBILE
using System.CodeDom;
using System.CodeDom.Compiler;
using Microsoft.CSharp;
@ -121,7 +121,7 @@ namespace System.Xml.Serialization
// debugging pourposes by adding the "nofallback" option.
// For example: MONO_XMLSERIALIZER_THS=0,nofallback
#if NET_2_1
#if MOBILE
string db = null;
string th = null;
generationThreshold = -1;
@ -150,7 +150,7 @@ namespace System.Xml.Serialization
}
#endif
deleteTempFiles = (db == null || db == "no");
#if !NET_2_1 && CONFIGURATION_DEP
#if !MOBILE && CONFIGURATION_DEP
// DiagnosticsSection
ConfigurationSection table = (ConfigurationSection) ConfigurationSettings.GetConfig("system.diagnostics");
var bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
@ -204,6 +204,11 @@ namespace System.Xml.Serialization
{
}
public XmlSerializer (Type type, XmlAttributeOverrides overrides, Type[] extraTypes, XmlRootAttribute root, string defaultNamespace, string location)
: this (type, overrides, extraTypes, root, defaultNamespace, location, null)
{
}
public XmlSerializer (Type type, XmlAttributeOverrides overrides)
: this (type, overrides, null, null, null)
{
@ -579,7 +584,7 @@ namespace System.Xml.Serialization
}
}
#if !NET_2_1
#if !MOBILE
if (!typeMapping.Source.CanBeGenerated || generationThreshold == -1)
return new XmlSerializationWriterInterpreter (typeMapping);
@ -600,7 +605,7 @@ namespace System.Xml.Serialization
XmlSerializationReader CreateReader (XmlMapping typeMapping)
{
#if !NET_2_1
#if !MOBILE
XmlSerializationReader reader;
lock (this) {
@ -630,7 +635,7 @@ namespace System.Xml.Serialization
return new XmlSerializationReaderInterpreter (typeMapping);
}
#if NET_2_1
#if MOBILE
void CheckGeneratedTypes (XmlMapping typeMapping)
{
throw new NotImplementedException();