[bcl] Remove NET_4_0 defines from class libs.

9 files changed, 0 insertions, 34 deletions

diff --git a/mcs/class/System.XML/System.Xml/DtdProcessing.cs b/mcs/class/System.XML/System.Xml/DtdProcessing.cs
index 1b31f888086..4480c051e74 100644
--- a/mcs/class/System.XML/System.Xml/DtdProcessing.cs
+++ b/mcs/class/System.XML/System.Xml/DtdProcessing.cs
@@ -28,12 +28,10 @@
 
 
 namespace System.Xml {
-#if NET_4_0
 	public enum DtdProcessing 
 	{
 		Prohibit = 0,
 		Ignore = 1,
 		Parse = 2
 	}
-#endif
 }
diff --git a/mcs/class/System.XML/System.Xml/NamespaceHandling.cs b/mcs/class/System.XML/System.Xml/NamespaceHandling.cs
index 0b2b0818e3b..2adf034e98d 100644
--- a/mcs/class/System.XML/System.Xml/NamespaceHandling.cs
+++ b/mcs/class/System.XML/System.Xml/NamespaceHandling.cs
@@ -24,11 +24,7 @@
 namespace System.Xml {
 
 	[Flags]
-#if NET_4_0
 	public
-#else
-	internal
-#endif
 	enum NamespaceHandling {
 		Default,
 		OmitDuplicates = 1,
diff --git a/mcs/class/System.XML/System.Xml/XmlConvert.cs b/mcs/class/System.XML/System.Xml/XmlConvert.cs
index 640ee7b1c69..a73e593c871 100644
--- a/mcs/class/System.XML/System.Xml/XmlConvert.cs
+++ b/mcs/class/System.XML/System.Xml/XmlConvert.cs
@@ -812,7 +812,6 @@ namespace System.Xml {
 
 #endif
 
-#if NET_4_0
 		public static bool IsNCNameChar (char ch)
 		{
 			return XmlChar.IsNCNameChar (ch);
@@ -870,6 +869,5 @@ namespace System.Xml {
 				return content;
 			throw new XmlException (string.Format ("Invalid XML character was found in the content, at index {0}.", idx));
 		}
-#endif
 	}
 }
diff --git a/mcs/class/System.XML/System.Xml/XmlDocument.cs b/mcs/class/System.XML/System.Xml/XmlDocument.cs
index af1a9c7a1b5..dd130686ef3 100644
--- a/mcs/class/System.XML/System.Xml/XmlDocument.cs
+++ b/mcs/class/System.XML/System.Xml/XmlDocument.cs
@@ -175,11 +175,9 @@ namespace System.Xml
 			get { return implementation; }
 		}
 
-#if NET_4_0
 		public override string InnerText {
 			set { throw new InvalidOperationException (); }
 		}
-#endif
 
 		public override string InnerXml {
 			get {
diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs
index 4833cbdc293..ef90b40e5d4 100644
--- a/mcs/class/System.XML/System.Xml/XmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlReader.cs
@@ -109,7 +109,6 @@ namespace System.Xml
 			get { return AttributeCount > 0; }
 		}
 
-#if NET_4_0
 		public virtual bool HasValue {
 			get {
 				switch (NodeType) {
@@ -126,9 +125,6 @@ namespace System.Xml
 				return false;
 			}
 		}
-#else
-		public abstract bool HasValue { get; }
-#endif
 
 		public abstract bool IsEmptyElement { get; }
 
@@ -445,11 +441,7 @@ namespace System.Xml
 			return xvr != null ? xvr : reader;
 		}
 
-#if NET_4_0
 		public void Dispose ()
-#else
-		void IDisposable.Dispose() 
-#endif
 		{
 			Dispose (true);
 		}
diff --git a/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs b/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs
index cb029083af5..767d057d1ae 100644
--- a/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs
+++ b/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs
@@ -54,9 +54,7 @@ namespace System.Xml
 		private XsValidationFlags validationFlags;
 		private ValidationType validationType;
 		private XmlResolver xmlResolver;
-#if NET_4_0
 		private DtdProcessing dtdProcessing;
-#endif
 		private long maxCharactersFromEntities;
 		private long maxCharactersInDocument;
 
@@ -118,7 +116,6 @@ namespace System.Xml
 			get { return conformance; }
 			set { conformance = value; }
 		}
-#if NET_4_0
 		public DtdProcessing DtdProcessing {
 			get { return dtdProcessing; }
 			set {
@@ -126,7 +123,6 @@ namespace System.Xml
 				prohibitDtd = (value == DtdProcessing.Prohibit);
 			}
 		}
-#endif
 		public long MaxCharactersFromEntities {
 			get { return maxCharactersFromEntities; }
 			set { maxCharactersFromEntities = value; }
@@ -163,9 +159,7 @@ namespace System.Xml
 			set { linePositionOffset = value; }
 		}
 
-#if NET_4_0
 		[ObsoleteAttribute("Use DtdProcessing property instead")]
-#endif
 		public bool ProhibitDtd {
 			get { return prohibitDtd; }
 			set { prohibitDtd = value; }
diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
index 15d081f8acb..a7c85b8d006 100644
--- a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
@@ -253,10 +253,8 @@ namespace System.Xml
 			get { return entity != null ? ReadState.Interactive : source.ReadState; }
 		}
 
-#if NET_4_0
 		[MonoTODO]
 		public DtdProcessing DtdProcessing { get; set; }
-#endif
 
 #if !NET_4_5
 		public override XmlReaderSettings Settings {
diff --git a/mcs/class/System.XML/System.Xml/XmlWriter.cs b/mcs/class/System.XML/System.Xml/XmlWriter.cs
index 0309709cfdc..29d196686eb 100755
--- a/mcs/class/System.XML/System.Xml/XmlWriter.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriter.cs
@@ -189,11 +189,7 @@ namespace System.Xml
 			Close ();
 		}
 
-#if NET_4_0
 		public void Dispose ()
-#else
-		void IDisposable.Dispose() 
-#endif
 		{
 			Dispose (false);
 		}
diff --git a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
index b90079bb6d8..e79b7d366ca 100644
--- a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
@@ -161,11 +161,7 @@ namespace System.Xml
 			//set { outputMethod = value; }
 		}
 
-#if NET_4_0
 		public
-#else
-		internal
-#endif
 		NamespaceHandling NamespaceHandling { get; set; }
 
 #if NET_4_5