[bcl] Remove NET_4_0 defines from class libs.

7 files changed, 0 insertions, 26 deletions

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/ReaderOptions.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/ReaderOptions.cs
index 8fb7362f5ec..378cb5e6dca 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/ReaderOptions.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/ReaderOptions.cs
@@ -21,7 +21,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_4_0
 using System;
 
 namespace System.Xml.Linq
@@ -33,4 +32,3 @@ namespace System.Xml.Linq
 		OmitDuplicateNamespaces = 1
 	}
 }
-#endif
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/SaveOptions.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/SaveOptions.cs
index f2753fc07cf..18bdeb43ec4 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/SaveOptions.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/SaveOptions.cs
@@ -33,8 +33,6 @@ namespace System.Xml.Linq
 	{
 		None = 0,
 		DisableFormatting = 1,
-#if NET_4_0
 		OmitDuplicateNamespaces = 2
-#endif
 	}
 }
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs
index a285e0ab8ba..2b30918ebf1 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs
@@ -196,10 +196,8 @@ namespace System.Xml.Linq
 			XmlWriterSettings s = new XmlWriterSettings ();
 			if ((options & SaveOptions.DisableFormatting) == SaveOptions.None)
 				s.Indent = true;
-#if NET_4_0
 			if ((options & SaveOptions.OmitDuplicateNamespaces) == SaveOptions.OmitDuplicateNamespaces)
 				s.NamespaceHandling |= NamespaceHandling.OmitDuplicates;
-#endif
 			
 			using (XmlWriter w = XmlWriter.Create (fileName, s)) {
 				Save (w);
@@ -216,10 +214,8 @@ namespace System.Xml.Linq
 			XmlWriterSettings s = new XmlWriterSettings ();
 			if ((options & SaveOptions.DisableFormatting) == SaveOptions.None)
 				s.Indent = true;
-#if NET_4_0
 			if ((options & SaveOptions.OmitDuplicateNamespaces) == SaveOptions.OmitDuplicateNamespaces)
 				s.NamespaceHandling |= NamespaceHandling.OmitDuplicates;
-#endif
 			using (XmlWriter w = XmlWriter.Create (textWriter, s)) {
 				Save (w);
 			}
@@ -268,7 +264,6 @@ namespace System.Xml.Linq
 					throw new InvalidOperationException ("An element cannot be added before the document type declaration");
 			}
 		}
-#if NET_4_0
 		public void Save (Stream stream)
 		{
 			Save (stream, SaveOptions.None);
@@ -287,6 +282,5 @@ namespace System.Xml.Linq
 			}
 		}
 
-#endif
 	}
 }
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs
index 4fa7889633c..52a8be506e1 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs
@@ -472,7 +472,6 @@ namespace System.Xml.Linq
 			}
 		}
 
-#if NET_4_0
 		public static XElement Load (Stream stream)
 		{
 			return Load (stream, LoadOptions.None);
@@ -487,7 +486,6 @@ namespace System.Xml.Linq
 				return LoadCore (r, options);
 			}
 		}
-#endif
 
 		internal static XElement LoadCore (XmlReader r, LoadOptions options)
 		{
@@ -554,10 +552,8 @@ namespace System.Xml.Linq
 
 			if ((options & SaveOptions.DisableFormatting) == SaveOptions.None)
 				s.Indent = true;
-#if NET_4_0
 			if ((options & SaveOptions.OmitDuplicateNamespaces) == SaveOptions.OmitDuplicateNamespaces)
 				s.NamespaceHandling |= NamespaceHandling.OmitDuplicates;
-#endif
 			using (XmlWriter w = XmlWriter.Create (fileName, s)) {
 				Save (w);
 			}
@@ -574,10 +570,8 @@ namespace System.Xml.Linq
 			
 			if ((options & SaveOptions.DisableFormatting) == SaveOptions.None)
 				s.Indent = true;
-#if NET_4_0
 			if ((options & SaveOptions.OmitDuplicateNamespaces) == SaveOptions.OmitDuplicateNamespaces)
 				s.NamespaceHandling |= NamespaceHandling.OmitDuplicates;
-#endif
 			using (XmlWriter w = XmlWriter.Create (textWriter, s)) {
 				Save (w);
 			}
@@ -588,7 +582,6 @@ namespace System.Xml.Linq
 			WriteTo (writer);
 		}
 
-#if NET_4_0
 		public void Save (Stream stream)
 		{
 			Save (stream, SaveOptions.None);
@@ -606,7 +599,6 @@ namespace System.Xml.Linq
 				Save (writer);
 			}
 		}
-#endif
 		public IEnumerable <XElement> AncestorsAndSelf ()
 		{
 			return GetAncestorList (null, true);
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/XNode.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/XNode.cs
index e98811ed434..06d3e5df2b3 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XNode.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XNode.cs
@@ -243,7 +243,6 @@ namespace System.Xml.Linq
 			return new XNodeReader (this);
 		}
 
-#if NET_4_0
 		public XmlReader CreateReader (ReaderOptions readerOptions)
 		{
 			var r = new XNodeReader (this);
@@ -252,7 +251,6 @@ namespace System.Xml.Linq
 			
 			return r;
 		}
-#endif
 
 		public IEnumerable<XElement> ElementsAfterSelf ()
 		{
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/XNodeReader.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/XNodeReader.cs
index 95631f1bbaa..076125bd1d1 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XNodeReader.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XNodeReader.cs
@@ -47,9 +47,7 @@ namespace System.Xml.Linq
 			start = node;
 		}
 		
-#if NET_4_0
 		internal bool OmitDuplicateNamespaces { get; set; }
-#endif
 
 		int IXmlLineInfo.LineNumber {
 			get {
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/XStreamingElement.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/XStreamingElement.cs
index 1c45409b4ae..adffc9f8e15 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XStreamingElement.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XStreamingElement.cs
@@ -104,15 +104,12 @@ namespace System.Xml.Linq
 			
 			if ((options & SaveOptions.DisableFormatting) == SaveOptions.None)
 				s.Indent = true;
-#if NET_4_0
 			if ((options & SaveOptions.OmitDuplicateNamespaces) == SaveOptions.OmitDuplicateNamespaces)
 				s.NamespaceHandling |= NamespaceHandling.OmitDuplicates;
-#endif
 			using (XmlWriter w = XmlWriter.Create (textWriter, s))
 				WriteTo (w);
 		}
 
-#if NET_4_0
 		public void Save (Stream stream)
 		{
 			Save (stream, SaveOptions.None);
@@ -130,7 +127,6 @@ namespace System.Xml.Linq
 				WriteTo (writer);
 			}
 		}
-#endif
 
 		public override string ToString ()
 		{