diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2014-09-26 16:43:36 +0400 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-01-17 07:45:39 +0300 |
| commit | 746650d1b93114b60feb155c2ee778a9e16ccb6d (patch) | |
| tree | f8e1eb791640ba6fd887da5e64cde3a1139b42b0 /mcs/class/System.XML/System.Xml.Serialization | |
| parent | 7d1cd56c5d97683f6dae35cb9143d8789b71c2de (diff) | |
[bcl] Remove more NET_2_0 checks from class libs
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Serialization')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs index 1b6e3f68487..6338a8dc14f 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs @@ -1086,10 +1086,6 @@ namespace System.Xml.Serialization { bool CanBeNull (TypeData type) { -#if !NET_2_0 // idiotic compatibility - if (type.Type == typeof (XmlQualifiedName)) - return false; -#endif return !type.Type.IsValueType || type.IsNullable; } diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs index 9fe70aace54..892c5c9efee 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs @@ -36,7 +36,7 @@ using System.CodeDom.Compiler; using System.Xml.Schema; using System.Collections; using System.Collections.Generic; -#if NET_2_0 && CONFIGURATION_DEP +#if CONFIGURATION_DEP using System.Configuration; using System.Xml.Serialization.Configuration; #endif @@ -44,7 +44,7 @@ using System.Xml.Serialization.Configuration; namespace System.Xml.Serialization { public class XmlSchemaImporter -#if NET_2_0 && !MOBILE +#if !MOBILE : SchemaImporter #endif { @@ -161,7 +161,7 @@ namespace System.Xml.Serialization void InitializeExtensions () { -#if NET_2_0 && CONFIGURATION_DEP +#if CONFIGURATION_DEP SerializationSectionGroup root = ConfigurationManager.GetSection ("system.xml.serialization") as SerializationSectionGroup; if (root == null) return; |