Merge pull request #1156 from felfert/master

[mono.git] / mcs / class / System.XML / System.Xml.Serialization / XmlSerializer.cs

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
index fe502d04d60ab1b8eb35fa0006cc1f624a8a8c8e..b0009f5390243fd36b6f2a03464a8e75bd467ac4 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
@@ -37,7 +37,7 @@ using System.Reflection;
 using System.Xml;
 using System.Xml.Schema;
 using System.Text;
-#if !TARGET_JVM && !NET_2_1
+#if !NET_2_1
 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 TARGET_JVM || NET_2_1
+#if NET_2_1
                        string db = null;
                        string th = null;
                        generationThreshold = -1;
@@ -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);
@@ -521,7 +514,7 @@ namespace System.Xml.Serialization
                        throw new NotImplementedException ();
                }
 
-#if !TARGET_JVM && !MOBILE
+#if !MOBILE
                public static Assembly GenerateSerializer (Type[] types, XmlMapping[] mappings)
                {
                        return GenerateSerializer (types, mappings, null);
@@ -630,7 +623,7 @@ namespace System.Xml.Serialization
                        return new XmlSerializationReaderInterpreter (typeMapping);
                }
                
-#if TARGET_JVM || NET_2_1
+#if NET_2_1
                void CheckGeneratedTypes (XmlMapping typeMapping)
                {
                        throw new NotImplementedException();
@@ -804,17 +797,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
        }