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

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,6 @@ namespace System.Xml.Serialization
get { return typeMapping; }
}
#if NET_2_0
[MonoTODO]
public XmlSerializer (Type type,
@ -244,7 +243,6 @@ namespace System.Xml.Serialization
Evidence evidence)
{
}
#endif
#endregion // Constructors
@ -467,13 +465,8 @@ namespace System.Xml.Serialization
if (namespaces == null || namespaces.Count == 0) {
namespaces = new XmlSerializerNamespaces ();
#if NET_2_0
namespaces.Add ("xsi", XmlSchema.InstanceNamespace);
namespaces.Add ("xsd", XmlSchema.Namespace);
#else
namespaces.Add ("xsd", XmlSchema.Namespace);
namespaces.Add ("xsi", XmlSchema.InstanceNamespace);
#endif
}
xsWriter.Initialize (xmlWriter, namespaces);
@ -769,6 +762,8 @@ namespace System.Xml.Serialization
cp.ReferencedAssemblies.Add ("System.Xml");
if (!cp.ReferencedAssemblies.Contains ("System.Data"))
cp.ReferencedAssemblies.Add ("System.Data");
if (!cp.ReferencedAssemblies.Contains ("System.Web.Services"))
cp.ReferencedAssemblies.Add ("System.Web.Services");
CompilerResults res = comp.CompileAssemblyFromFile (cp, file);
if (res.Errors.HasErrors || res.CompiledAssembly == null) {
@ -804,17 +799,10 @@ namespace System.Xml.Serialization
}
#endif
#if NET_2_0
GenerationBatch LoadFromSatelliteAssembly (GenerationBatch batch)
{
return batch;
}
#else
GenerationBatch LoadFromSatelliteAssembly (GenerationBatch batch)
{
return batch;
}
#endif
#endregion // Methods
}