Clean up some NET_2_0

33 files changed, 28 insertions, 322 deletions

diff --git a/mcs/class/System.XML/System.Xml.XPath/Expression.cs b/mcs/class/System.XML/System.Xml.XPath/Expression.cs
index f61dda0c369..72d17d65a00 100644
--- a/mcs/class/System.XML/System.Xml.XPath/Expression.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/Expression.cs
@@ -36,11 +36,7 @@ using System.Xml.Xsl;
 using System.Globalization;
 using Mono.Xml.XPath;
 
-#if NET_2_0
 using NSResolver = System.Xml.IXmlNamespaceResolver;
-#else
-using NSResolver = System.Xml.XmlNamespaceManager;
-#endif
 
 namespace System.Xml.XPath
 {
@@ -128,12 +124,10 @@ namespace System.Xml.XPath
 			_nsm = nsManager;
 		}
 
-#if NET_2_0
 		public override void SetContext (IXmlNamespaceResolver nsResolver)
 		{
 			_nsm = nsResolver;
 		}
-#endif
 
 		internal NSResolver NamespaceManager { get { return _nsm; } }
 		public override String Expression { get { return rawExpression; }}
@@ -1695,14 +1689,7 @@ namespace System.Xml.XPath
 				if (resolvedName)
 					strURI1 = _name.Namespace;
 				else if (nsm != null)
-// We still need to have such tricky switch, because the behavior is 
-// inconsistent between .NET 1.x and 2.0 when the argument is not
-// atomic string.
-#if NET_2_0
 					strURI1 = nsm.LookupNamespace (_name.Namespace);
-#else
-					strURI1 = nsm.LookupNamespace (_name.Namespace, false);
-#endif
 				if (strURI1 == null)
 					throw new XPathException ("Invalid namespace prefix: "+_name.Namespace);
 			}
@@ -1725,14 +1712,7 @@ namespace System.Xml.XPath
 				if (resolvedName)
 					ns = _name.Namespace;
 				else
-// We still need to have such tricky switch, because the behavior is 
-// inconsistent between .NET 1.x and 2.0 when the argument is not
-// atomic string.
-#if NET_2_0
 					ns = nsm.LookupNamespace (_name.Namespace);	// TODO: check to see if this returns null or ""
-#else
-					ns = nsm.LookupNamespace (_name.Namespace, false);	// TODO: check to see if this returns null or ""
-#endif
 				if (ns == null)
 					throw new XPathException ("Invalid namespace prefix: "+_name.Namespace);
 			}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs b/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs
index ba025a69640..b509dba7a87 100644
--- a/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs
@@ -32,11 +32,7 @@ using System.Collections;
 using Mono.Xml.XPath;
 using System.Xml.Xsl;
 
-#if NET_2_0
 using NSResolver = System.Xml.IXmlNamespaceResolver;
-#else
-using NSResolver = System.Xml.XmlNamespaceManager;
-#endif
 
 namespace System.Xml.XPath
 {
@@ -74,23 +70,15 @@ namespace System.Xml.XPath
 
 		public abstract void SetContext (XmlNamespaceManager nsManager);
 
-#if NET_2_0
-		public
-#else
-		internal
-#endif
-		static XPathExpression Compile (string xpath)
+		public static XPathExpression Compile (string xpath)
 		{
 			return Compile (xpath, null, null);
 		}
 
-#if NET_2_0
-		public static XPathExpression Compile (
-			string xpath, NSResolver nsResolver)
+		public static XPathExpression Compile (string xpath, NSResolver nsResolver)
 		{
 			return Compile (xpath, nsResolver, null);
 		}
-#endif
 
 		internal static XPathExpression Compile (string xpath,
 			NSResolver nsResolver, IStaticXsltContext ctx)
@@ -101,9 +89,7 @@ namespace System.Xml.XPath
 			return x;
 		}
 
-#if NET_2_0
 		public abstract void SetContext (IXmlNamespaceResolver nsResolver);
-#endif
 		#endregion
 	}
 }
diff --git a/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs b/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs
index e8248627d8e..efe7a6cf2d7 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System;
 using System.CodeDom.Compiler;
 using System.Collections;
@@ -257,4 +255,3 @@ namespace System.Xml.Xsl
 */
 		}
 }
-#endif
diff --git a/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs b/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
index 1d2e0d9f7a6..a3c2c5a70d3 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
@@ -64,9 +64,7 @@ namespace System.Xml.Xsl {
 		}

 	}

 

-#if NET_2_0

 	[Obsolete]

-#endif

 	public sealed class XslTransform {

 

 		internal static readonly bool TemplateStackFrameError;

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltArgumentList.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltArgumentList.cs
index 3f65437f1b2..db01ad9f5e5 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XsltArgumentList.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltArgumentList.cs
@@ -30,9 +30,6 @@ using System.Xml.XPath;
 

 namespace System.Xml.Xsl

 {

-#if !NET_2_0

-	sealed

-#endif

 	public class XsltArgumentList

 	{

 		#region Fields

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltCompileException.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltCompileException.cs
index c739bc9a23e..c24b21d8a89 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XsltCompileException.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltCompileException.cs
@@ -40,7 +40,6 @@ namespace System.Xml.Xsl
 	{

 		#region Constructors

 

-#if NET_2_0

 		public XsltCompileException ()

 		{

 		}

@@ -54,7 +53,6 @@ namespace System.Xml.Xsl
 			: base (message, innerException)

 		{

 		}

-#endif

 

 		protected XsltCompileException (SerializationInfo info, StreamingContext context )

 			: base (info, context)

@@ -62,12 +60,8 @@ namespace System.Xml.Xsl
 		}

 

 		public XsltCompileException (Exception inner, String sourceUri, int lineNumber, int linePosition)

-#if NET_2_0

 			: base (lineNumber != 0 ? "{0} at {1}({2},{3}). See InnerException for details." : "{0}.",

 				"XSLT compile error", inner, lineNumber, linePosition, sourceUri)

-#else

-			: base ("{0}{1}({2},{3}) :\n", string.Empty, inner, lineNumber, linePosition, sourceUri)

-#endif

 		{

 		}

 

@@ -77,17 +71,6 @@ namespace System.Xml.Xsl
 		}

 		#endregion

 

-		#region Properties

-

-#if NET_2_0

-#else

-		public override string Message {

-			get { return base.Message; }

-		}

-#endif

-

-		#endregion

-

 		#region Methods

 

 		[SecurityPermission (SecurityAction.Demand, SerializationFormatter = true)]

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs
index 6b110ceb3d0..fea825ac41f 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs
@@ -33,22 +33,12 @@ namespace System.Xml.Xsl
 	public abstract class XsltContext : XmlNamespaceManager

 	{

 		#region Constructors

-#if NET_2_0

-		protected

-#else

-		public

-#endif

-		XsltContext ()

+		protected 	XsltContext ()

 			: base (new NameTable ())

 		{

 		}

 

-#if NET_2_0

-		protected

-#else

-		public

-#endif

-		XsltContext (NameTable table)

+		protected XsltContext (NameTable table)

 			: base (table)

 		{

 		}

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltException.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltException.cs
index f8b44a6e174..6645dae2b4b 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XsltException.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltException.cs
@@ -70,7 +70,6 @@ namespace System.Xml.Xsl
 

 		#region Constructors

 

-#if NET_2_0

 		public XsltException ()

 			: this (string.Empty, (Exception) null)

 		{

@@ -80,7 +79,6 @@ namespace System.Xml.Xsl
 			: this (message, (Exception) null)

 		{

 		}

-#endif

 

 		public XsltException (string message, Exception innerException)

 			: this ("{0}", message, innerException, 0, 0, (string) null)

@@ -116,19 +114,11 @@ namespace System.Xml.Xsl
 

 		#region Properties

 

-#if NET_2_0

 		public virtual int LineNumber {

-#else

-		public int LineNumber {

-#endif

 			get { return lineNumber; }

 		}

 

-#if NET_2_0

 		public virtual int LinePosition {

-#else

-		public int LinePosition {

-#endif

 			get { return linePosition; }

 		}

 

@@ -138,11 +128,7 @@ namespace System.Xml.Xsl
 			}

 		}

 

-#if NET_2_0

 		public virtual string SourceUri {

-#else

-		public string SourceUri {

-#endif

 			get { return sourceUri; }

 		}

 

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltMessageEncounteredEventArgs.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltMessageEncounteredEventArgs.cs
index ea82f63915d..2d2345ba0ef 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XsltMessageEncounteredEventArgs.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltMessageEncounteredEventArgs.cs
@@ -27,7 +27,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_2_0
 
 using System;
 
@@ -42,4 +41,3 @@ namespace System.Xml.Xsl
 		}
 	}
 }
-#endif
diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltMessageEncounteredEventHandler.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltMessageEncounteredEventHandler.cs
index 5ba123ec9bf..021d9542778 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XsltMessageEncounteredEventHandler.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltMessageEncounteredEventHandler.cs
@@ -27,10 +27,9 @@
 // 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_2_0
+
 namespace System.Xml.Xsl
 {
 	public delegate void XsltMessageEncounteredEventHandler (
 		Object sender, XsltMessageEncounteredEventArgs e);
 }
-#endif
diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltSettings.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltSettings.cs
index cb4b741f605..86838e4b1e0 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XsltSettings.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltSettings.cs
@@ -27,7 +27,7 @@
 // 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_2_0
+
 namespace System.Xml.Xsl
 {
 	public sealed class XsltSettings
@@ -90,4 +90,3 @@ namespace System.Xml.Xsl
 		}
 	}
 }
-#endif
diff --git a/mcs/class/System.XML/System.Xml/ConformanceLevel.cs b/mcs/class/System.XML/System.Xml/ConformanceLevel.cs
index d54a6cb5d21..6c21dc49596 100644
--- a/mcs/class/System.XML/System.Xml/ConformanceLevel.cs
+++ b/mcs/class/System.XML/System.Xml/ConformanceLevel.cs
@@ -25,7 +25,7 @@
 // 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_2_0
+
 namespace System.Xml
 {
 	public enum ConformanceLevel
@@ -35,4 +35,3 @@ namespace System.Xml
 		Document
 	}
 }
-#endif
diff --git a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
index 2f7fb8c31d6..9fb6e6fb583 100644
--- a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
@@ -26,9 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System.Collections.Generic;
-#endif
 using System;
 using System.Globalization;
 using System.IO;
@@ -40,10 +38,7 @@ using System.Xml;
 namespace Mono.Xml
 {
 	[PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)]
-	internal class EntityResolvingXmlReader : XmlReader,
-#if NET_2_0
-		IXmlNamespaceResolver,
-#endif
+	internal class EntityResolvingXmlReader : XmlReader, IXmlNamespaceResolver,
 		IXmlLineInfo, IHasXmlParserContext
 	{
 		EntityResolvingXmlReader entity;
@@ -78,21 +73,6 @@ namespace Mono.Xml
 			get { return entity != null && entity.ReadState != ReadState.Initial ? (XmlReader) entity : source; }
 		}
 
-#if NET_2_0
-#else
-		public override string this [int i] {
-			get { return GetAttribute (i); }
-		}
-
-		public override string this [string name] {
-			get { return GetAttribute (name); }
-		}
-
-		public override string this [string localName, string namespaceName] {
-			get { return GetAttribute (localName, namespaceName); }
-		}
-#endif
-
 		public override int AttributeCount {
 			get { return Current.AttributeCount; }
 		}
@@ -264,7 +244,6 @@ namespace Mono.Xml
 			return Current.GetAttribute (localName, namespaceURI);
 		}
 
-#if NET_2_0
 		public IDictionary<string, string> GetNamespacesInScope (XmlNamespaceScope scope)
 		{
 			return ((IXmlNamespaceResolver) Current).GetNamespacesInScope (scope);
@@ -279,7 +258,6 @@ namespace Mono.Xml
 		{
 			return ((IXmlNamespaceResolver) Current).LookupPrefix (ns);
 		}
-#endif
 
 		public override string LookupNamespace (string prefix)
 		{
@@ -421,14 +399,9 @@ namespace Mono.Xml
 			return base.ReadString ();
 		}
 
-		public override
-		void ResolveEntity ()
+		public override void ResolveEntity ()
 		{
-#if NET_2_0
 			DoResolveEntity ();
-#else
-			do_resolve = true;
-#endif
 		}
 
 		void DoResolveEntity ()
diff --git a/mcs/class/System.XML/System.Xml/XmlElement.cs b/mcs/class/System.XML/System.Xml/XmlElement.cs
index 9fc0ce9d74d..120355f5843 100644
--- a/mcs/class/System.XML/System.Xml/XmlElement.cs
+++ b/mcs/class/System.XML/System.Xml/XmlElement.cs
@@ -36,9 +36,7 @@ using System.Xml.XPath;
 using System.IO;
 using System.Text;
 using Mono.Xml;
-#if NET_2_0
 using System.Xml.Schema;
-#endif
 
 namespace System.Xml
 {
@@ -51,9 +49,7 @@ namespace System.Xml
 		XmlLinkedNode lastLinkedChild;
 
 		private bool isNotEmpty;
-#if NET_2_0
 		IXmlSchemaInfo schemaInfo;
-#endif
 
 		#endregion
 
@@ -218,11 +214,7 @@ namespace System.Xml
 				if (IsReadOnly)
 					throw new ArgumentException ("This node is readonly.");
 				if (value == null) {
-#if NET_2_0
 					value = string.Empty;
-#else
-					throw new ArgumentNullException ("Prefix value is null.");
-#endif
 				}
 				if ((!String.Empty.Equals(value))&&(!XmlChar.IsNCName (value)))
 					throw new ArgumentException ("Specified name is not a valid NCName: " + value);
@@ -233,7 +225,6 @@ namespace System.Xml
 			}
 		}
 
-#if NET_2_0
 		public override XmlNode ParentNode {
 			get { return base.ParentNode; }
 		}
@@ -242,7 +233,6 @@ namespace System.Xml
 			get { return schemaInfo; }
 			internal set { schemaInfo = value; }
 		}
-#endif
 
 		#endregion
 
diff --git a/mcs/class/System.XML/System.Xml/XmlNode.cs b/mcs/class/System.XML/System.Xml/XmlNode.cs
index 47532bc2555..2ec0f1bb12d 100644
--- a/mcs/class/System.XML/System.Xml/XmlNode.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNode.cs
@@ -36,10 +36,8 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Xml.XPath;
-#if NET_2_0
 using System.Diagnostics;
 using System.Xml.Schema;
-#endif
 
 namespace System.Xml
 {
@@ -339,12 +337,10 @@ namespace System.Xml
 			}
 		}
 
-#if NET_2_0
 		public virtual IXmlSchemaInfo SchemaInfo {
 			get { return null; }
 			internal set { }
 		}
-#endif
 
 		#endregion
 
@@ -369,21 +365,12 @@ namespace System.Xml
 
 		public abstract XmlNode CloneNode (bool deep);
 
-#if NET_2_0
 		public virtual XPathNavigator CreateNavigator ()
 		{
 			// XmlDocument has overriden definition, so it is safe
 			// to use OwnerDocument here.
 			return OwnerDocument.CreateNavigator (this);
 		}
-#else
-		public XPathNavigator CreateNavigator ()
-		{
-			XmlDocument document = this.NodeType == XmlNodeType.Document ?
-				this as XmlDocument : this.ownerDocument;
-			return document.CreateNavigator (this);
-		}
-#endif
 
 		public IEnumerator GetEnumerator ()
 		{
@@ -395,12 +382,10 @@ namespace System.Xml
 			switch (prefix) {
 			case null:
 				throw new ArgumentNullException ("prefix");
-#if NET_2_0
 			case "xml":
 				return XmlNamespaceManager.XmlnsXml;
 			case "xmlns":
 				return XmlNamespaceManager.XmlnsXmlns;
-#endif
 			}
 
 			XmlNode node;
@@ -438,14 +423,12 @@ namespace System.Xml
 
 		public virtual string GetPrefixOfNamespace (string namespaceURI)
 		{
-#if NET_2_0
 			switch (namespaceURI) {
 			case XmlNamespaceManager.XmlnsXml:
 				return XmlNamespaceManager.PrefixXml;
 			case XmlNamespaceManager.XmlnsXmlns:
 				return XmlNamespaceManager.PrefixXmlns;
 			}
-#endif
 
 			XmlNode node;
 			switch (NodeType) {
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeOrder.cs b/mcs/class/System.XML/System.Xml/XmlNodeOrder.cs
index 033db077a86..84e7ba4fbe1 100644
--- a/mcs/class/System.XML/System.Xml/XmlNodeOrder.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNodeOrder.cs
@@ -29,10 +29,6 @@
 
 namespace System.Xml
 {
-#if NET_2_0
-#else
-	[Serializable]
-#endif
 	public enum XmlNodeOrder
 	{
 		Before = 0,
diff --git a/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs b/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs
index fb67f99329c..ba07ba5695d 100644
--- a/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs
+++ b/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs
@@ -69,11 +69,9 @@ namespace System.Xml
 			}
 		}
 
-#if NET_2_0
 		public override XmlNode ParentNode {
 			get { return base.ParentNode; }
 		}
-#endif
 
 		// Methods
 		public override XmlNode CloneNode (bool deep)
diff --git a/mcs/class/System.XML/System.Xml/XmlText.cs b/mcs/class/System.XML/System.Xml/XmlText.cs
index 21fbd3cc775..710fb6112c5 100644
--- a/mcs/class/System.XML/System.Xml/XmlText.cs
+++ b/mcs/class/System.XML/System.Xml/XmlText.cs
@@ -69,11 +69,10 @@ namespace System.Xml
 			set { Data = value; }
 		}
 
-#if NET_2_0
 		public override XmlNode ParentNode {
 			get { return base.ParentNode; }
 		}
-#endif
+
 		#endregion
 
 		#region Methods
diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
index ae54a23518d..d50d8954cbd 100644
--- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
@@ -41,32 +41,19 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
 using System.Collections.Generic;
-#endif
 using System.Globalization;
 using System.IO;
 using System.Security.Permissions;
 using System.Text;
 using System.Xml.Schema;
 using Mono.Xml;
-
-#if NET_2_0
 using System.Xml;
 
 namespace Mono.Xml2
-#else
-namespace System.Xml
-#endif
 {
-
-#if NET_2_0
-	internal class XmlTextReader : XmlReader,
+	class XmlTextReader : XmlReader,
 		IXmlLineInfo, IXmlNamespaceResolver, IHasXmlParserContext
-#else
-	[PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)]
-	public class XmlTextReader : XmlReader, IXmlLineInfo, IHasXmlParserContext
-#endif
 	{
 		#region Constructors
 
@@ -213,7 +200,6 @@ namespace System.Xml
 			get { return parserContext.BaseURI; }
 		}
 
-#if NET_2_0
 		public override bool CanReadBinaryContent {
 			get { return true; }
 		}
@@ -221,15 +207,6 @@ namespace System.Xml
 		public override bool CanReadValueChunk {
 			get { return true; }
 		}
-#else
-		internal override bool CanReadBinaryContent {
-			get { return true; }
-		}
-
-		internal override bool CanReadValueChunk {
-			get { return true; }
-		}
-#endif
 
 		internal bool CharacterChecking {
 			get { return checkCharacters; }
@@ -258,12 +235,11 @@ namespace System.Xml
 		{
 			get { return parserContext.Encoding; }
 		}
-#if NET_2_0
+
 		public EntityHandling EntityHandling {
 			get { return entityHandling; }
 			set { entityHandling = value; }
 		}
-#endif
 
 		public override bool EOF {
 			get { return readState == ReadState.EndOfFile; }
@@ -282,21 +258,6 @@ namespace System.Xml
 			get { return cursorToken.IsEmptyElement; }
 		}
 
-#if NET_2_0
-#else
-		public override string this [int i] {
-			get { return GetAttribute (i); }
-		}
-
-		public override string this [string name] {
-			get { return GetAttribute (name); }
-		}
-
-		public override string this [string localName, string namespaceName] {
-			get { return GetAttribute (localName, namespaceName); }
-		}
-#endif
-
 		public int LineNumber {
 			get {
 				if (useProceedingLineInfo)
@@ -366,11 +327,9 @@ namespace System.Xml
 			get { return readState; }
 		}
 
-#if NET_2_0
 		public override XmlReaderSettings Settings {
 			get { return base.Settings; }
 		}
-#endif
 
 		public override string Value {
 			get { return cursorToken.Value != null ? cursorToken.Value : String.Empty; }
@@ -451,7 +410,6 @@ namespace System.Xml
 			return attributeTokens [idx].Value;
 		}
 
-#if NET_2_0
 		public IDictionary<string, string> GetNamespacesInScope (XmlNamespaceScope scope)
 		{
 			return nsmgr.GetNamespacesInScope (scope);
@@ -461,7 +419,6 @@ namespace System.Xml
 		{
 			return GetNamespacesInScope (scope);
 		}
-#endif
 
 		public TextReader GetRemainder ()
 		{
@@ -470,11 +427,7 @@ namespace System.Xml
 			return new StringReader (new string (peekChars, peekCharsIndex, peekCharsLength - peekCharsIndex) + reader.ReadToEnd ());
 		}
 
-#if NET_2_0
 		public bool HasLineInfo ()
-#else
-		bool IXmlLineInfo.HasLineInfo ()
-#endif
 		{
 			return true;
 		}
@@ -491,7 +444,6 @@ namespace System.Xml
 			return s == String.Empty ? null : s;
 		}
 
-#if NET_2_0
 		string IXmlNamespaceResolver.LookupPrefix (string ns)
 		{
 			return LookupPrefix (ns, false);
@@ -501,7 +453,6 @@ namespace System.Xml
 		{
 			return nsmgr.LookupPrefix (ns, atomizedName);
 		}
-#endif
 
 		public override void MoveToAttribute (int i)
 		{
@@ -720,13 +671,11 @@ namespace System.Xml
 			throw new InvalidOperationException ("XmlTextReader cannot resolve external entities.");
 		}
 
-#if NET_2_0
 		[MonoTODO] // FIXME: Implement, for performance improvement
 		public override void Skip ()
 		{
 			base.Skip ();
 		}
-#endif
 		#endregion
 
 		#region Internals
@@ -997,10 +946,8 @@ namespace System.Xml
 #endif
 
 			checkCharacters = true;
-#if NET_2_0
 			if (Settings != null)
 				checkCharacters = Settings.CheckCharacters;
-#endif
 			prohibitDtd = false;
 			closeInput = true;
 			entityHandling = EntityHandling.ExpandCharEntities;
@@ -1073,11 +1020,7 @@ namespace System.Xml
 #else
 				Uri uri = null;
 				try {
-#if NET_2_0
 					uri = new Uri (url, UriKind.RelativeOrAbsolute);
-#else
-					uri = new Uri (url);
-#endif
 				} catch (Exception) {
 					string path = Path.GetFullPath ("./a");
 					uri = new Uri (new Uri (path), url);
@@ -1105,7 +1048,6 @@ namespace System.Xml
 			}
 		}
 
-#if NET_2_0
 		internal ConformanceLevel Conformance {
 			get { return allowMultipleRoot ? ConformanceLevel.Fragment : ConformanceLevel.Document; }
 			set {
@@ -1126,7 +1068,6 @@ namespace System.Xml
 		{
 			parserContext.NameTable = nameTable;
 		}
-#endif
 
 		// Use this method rather than setting the properties
 		// directly so that all the necessary properties can
@@ -1625,7 +1566,7 @@ namespace System.Xml
 					break;
 				if (whitespacePool == null)
 					whitespacePool = new NameTable ();
-#if NET_2_0 && !NET_2_1
+#if !NET_2_1
 				valueBuffer.CopyTo (0, whitespaceCache, 0, len);
 #else
 				for (int i = 0; i < len; i++)
@@ -1974,14 +1915,11 @@ namespace System.Xml
 					int predefined = XmlChar.GetPredefinedEntity (entName);
 					if (predefined < 0) {
 						CheckAttributeEntityReferenceWFC (entName);
-#if NET_2_0
 						if (entityHandling == EntityHandling.ExpandEntities) {
 							string value = DTD.GenerateEntityAttributeText (entName);
 							foreach (char c in (IEnumerable<char>) value)
 								AppendValueChar (c);
-						} else
-#endif
-						{
+						} else {
 							currentAttributeValueToken.ValueBufferEnd = valueBuffer.Length;
 							currentAttributeValueToken.NodeType = XmlNodeType.Text;
 							if (!isNewToken)
@@ -2272,13 +2210,11 @@ namespace System.Xml
 				}
 				// Encoding value should be checked inside XmlInputStream.
 			}
-#if NET_2_0
 			// this condition is to check if this instance is
 			// not created by XmlReader.Create() (which just
 			// omits strict text declaration check).
 			else if (Conformance == ConformanceLevel.Auto)
 				throw NotWFError ("Encoding declaration is mandatory in text declaration.");
-#endif
 
 			Expect ("?>");
 
diff --git a/mcs/class/System.XML/System.Xml/XmlWriter.cs b/mcs/class/System.XML/System.Xml/XmlWriter.cs
index 3a7d35b4ba3..08fadd6afc1 100755
--- a/mcs/class/System.XML/System.Xml/XmlWriter.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriter.cs
@@ -47,9 +47,7 @@ namespace System.Xml
 {
 	public abstract class XmlWriter : IDisposable
 	{
-#if NET_2_0
 		XmlWriterSettings settings;
-#endif
 
 		#region Constructors
 
@@ -59,16 +57,12 @@ namespace System.Xml
 
 		#region Properties
 
-#if NET_2_0
 		public virtual XmlWriterSettings Settings {
 			get { return settings; }
 		}
-#endif
 
 		public abstract WriteState WriteState { get; }
-		
 
-#if NET_2_0
 		public virtual string XmlLang {
 			get { return null; }
 		}
@@ -76,11 +70,6 @@ namespace System.Xml
 		public virtual XmlSpace XmlSpace {
 			get { return XmlSpace.None; }
 		}
-#else
-		public abstract string XmlLang { get; }
-
-		public abstract XmlSpace XmlSpace { get; }
-#endif
 
 		#endregion
 
@@ -96,7 +85,6 @@ namespace System.Xml
 		public abstract void Close ();
 #endif
 
-#if NET_2_0
 		public static XmlWriter Create (Stream output)
 		{
 			return Create (output, null);
@@ -211,7 +199,6 @@ namespace System.Xml
 		{
 			Dispose (false);
 		}
-#endif
 
 		public abstract void Flush ();
 
@@ -292,16 +279,12 @@ namespace System.Xml
 
 		public abstract void WriteBase64 (byte[] buffer, int index, int count);
 
-#if NET_2_0
 		public virtual void WriteBinHex (byte [] buffer, int index, int count)
 		{
 			StringWriter sw = new StringWriter ();
 			XmlConvert.WriteBinHex (buffer, index, count, sw);
 			WriteString (sw.ToString ());
 		}
-#else
-		public abstract void WriteBinHex (byte[] buffer, int index, int count);
-#endif
 
 		public abstract void WriteCData (string text);
 
@@ -329,7 +312,6 @@ namespace System.Xml
 			WriteEndElement();
 		}
 
-#if NET_2_0
 		public void WriteElementString (string prefix, string localName, string ns, string value)
 		{
 			WriteStartElement(prefix, localName, ns);
@@ -337,7 +319,6 @@ namespace System.Xml
 				WriteString(value);
 			WriteEndElement();
 		}
-#endif
 
 		public abstract void WriteEndAttribute ();
 
@@ -349,7 +330,6 @@ namespace System.Xml
 
 		public abstract void WriteFullEndElement ();
 
-#if NET_2_0
 		public virtual void WriteName (string name)
 		{
 			WriteNameInternal (name);
@@ -364,42 +344,27 @@ namespace System.Xml
 		{
 			WriteQualifiedNameInternal (localName, ns);
 		}
-#else
-		public abstract void WriteName (string name);
-
-		public abstract void WriteNmToken (string name);
-
-		public abstract void WriteQualifiedName (string localName, string ns);
-#endif
 
 		internal void WriteNameInternal (string name)
 		{
-#if NET_2_0
 			switch (Settings.ConformanceLevel) {
 			case ConformanceLevel.Document:
 			case ConformanceLevel.Fragment:
 				XmlConvert.VerifyName (name);
 				break;
 			}
-#else
-			XmlConvert.VerifyName (name);
-#endif
 			WriteString (name);
 		}
 
 		internal virtual void WriteNmTokenInternal (string name)
 		{
 			bool valid = true;
-#if NET_2_0
 			switch (Settings.ConformanceLevel) {
 			case ConformanceLevel.Document:
 			case ConformanceLevel.Fragment:
 				valid = XmlChar.IsNmToken (name);
 					break;
 			}
-#else
-			valid = XmlChar.IsNmToken (name);
-#endif
 			if (!valid)
 				throw new ArgumentException ("Argument name is not a valid NMTOKEN.");
 			WriteString (name);
@@ -412,7 +377,6 @@ namespace System.Xml
 			if (ns == null)
 				ns = String.Empty;
 
-#if NET_2_0
 			if (Settings != null) {
 				switch (Settings.ConformanceLevel) {
 				case ConformanceLevel.Document:
@@ -423,9 +387,6 @@ namespace System.Xml
 			}
 			else
 				XmlConvert.VerifyNCName (localName);
-#else
-			XmlConvert.VerifyNCName (localName);
-#endif
 
 			string prefix = ns.Length > 0 ? LookupPrefix (ns) : String.Empty;
 			if (prefix == null)
@@ -605,12 +566,10 @@ namespace System.Xml
 
 		public abstract void WriteRaw (char[] buffer, int index, int count);
 
-#if NET_2_0
 		public void WriteStartAttribute (string localName)
 		{
 			WriteStartAttribute (null, localName, null);
 		}
-#endif
 
 		public void WriteStartAttribute (string localName, string ns)
 		{
@@ -641,7 +600,6 @@ namespace System.Xml
 
 		public abstract void WriteWhitespace (string ws);
 
-#if NET_2_0
 		public virtual void WriteValue (bool value)
 		{
 			WriteString (XQueryConvert.BooleanToString (value));
@@ -745,7 +703,6 @@ namespace System.Xml
 			WriteString (XmlConvert.ToString (value));
 		}
 #endif
-#endif
 
 		#endregion
 
diff --git a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs b/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs
index 6869ca85f99..92db97265b5 100644
--- a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformation.cs
@@ -26,7 +26,7 @@
 // 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_2_0
+
 using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
@@ -94,5 +94,3 @@ namespace System.Net.NetworkInformation {
 
 	}
 }
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
index 3e2bc61b6a1..db9ccd81d5f 100644
--- a/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/MulticastIPAddressInformationCollection.cs
@@ -27,7 +27,7 @@
 // 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_2_0
+
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
@@ -139,5 +139,3 @@ namespace System.Net.NetworkInformation {
 		}
 	}
 }
-#endif
-
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs b/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs
index 61585e05df1..00e3fb26376 100644
--- a/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/NetBiosNodeType.cs
@@ -25,7 +25,7 @@
 // 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_2_0
+
 namespace System.Net.NetworkInformation {
 	public enum NetBiosNodeType {
 		Unknown = 0,
@@ -35,5 +35,4 @@ namespace System.Net.NetworkInformation {
 		Hybrid = 1 << 3,
 	}
 }
-#endif
 
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
index ad92e5a1492..5c90f9a71e6 100644
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/NetworkAddressChangedEventHandler.cs
@@ -25,9 +25,8 @@
 // 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_2_0
+
 namespace System.Net.NetworkInformation {
 	public delegate void NetworkAddressChangedEventHandler (object sender, EventArgs e);
 }
-#endif
 
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
index c3609e4e4ad..df580bb2589 100644
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/NetworkAvailabilityChangedEventHandler.cs
@@ -25,9 +25,7 @@
 // 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_2_0
+
 namespace System.Net.NetworkInformation {
 	public delegate void NetworkAvailabilityChangedEventHandler (object sender, NetworkAvailabilityEventArgs e);
 }
-#endif
-
diff --git a/mcs/class/System/System.Net/ServicePointManager.cs b/mcs/class/System/System.Net/ServicePointManager.cs
index fda1a7b125c..3f14b29396f 100644
--- a/mcs/class/System/System.Net/ServicePointManager.cs
+++ b/mcs/class/System/System.Net/ServicePointManager.cs
@@ -170,14 +170,8 @@ namespace System.Net
 			set { policy = value; }
 		}
 
-#if NET_1_0
-		// we need it for SslClientStream
-		internal
-#else
 		[MonoTODO("CRL checks not implemented")]
-		public
-#endif
-		static bool CheckCertificateRevocationList {
+		public static bool CheckCertificateRevocationList {
 			get { return _checkCRL; }
 			set { _checkCRL = false; }	// TODO - don't yet accept true
 		}
diff --git a/mcs/class/corlib/Mono.Security.Cryptography/MACAlgorithm.cs b/mcs/class/corlib/Mono.Security.Cryptography/MACAlgorithm.cs
index 9cc924bea6d..aac44d26266 100644
--- a/mcs/class/corlib/Mono.Security.Cryptography/MACAlgorithm.cs
+++ b/mcs/class/corlib/Mono.Security.Cryptography/MACAlgorithm.cs
@@ -98,13 +98,7 @@ namespace Mono.Security.Cryptography {
 			if ((blockCount > 0) || ((algo.Padding != PaddingMode.Zeros) && (algo.Padding != PaddingMode.None))) {
 				result = enc.TransformFinalBlock (block, 0, blockCount);
 			} else {
-#if NET_1_0
-				// add an empty (zeros) block for MAC padding
-				byte[] emptyBlock = new byte [blockSize];
-				result = enc.TransformFinalBlock (emptyBlock, 0, blockSize);
-#else
 				result = (byte[]) block.Clone ();
-#endif
 			}
 
 			if (!enc.CanReuseTransform) {
diff --git a/mcs/class/corlib/Mono.Security.X509/X509Chain.cs b/mcs/class/corlib/Mono.Security.X509/X509Chain.cs
index 027005ca2cb..6edd5feac45 100644
--- a/mcs/class/corlib/Mono.Security.X509/X509Chain.cs
+++ b/mcs/class/corlib/Mono.Security.X509/X509Chain.cs
@@ -203,7 +203,7 @@ namespace Mono.Security.X509 {
 
 			// TODO - we should check for CRITICAL but unknown extensions
 			// X509ChainStatusFlags.InvalidExtension
-#if (!NET_1_0 && !INSIDE_CORLIB)
+#if !INSIDE_CORLIB
 			if (ServicePointManager.CheckCertificateRevocationList) {
 				// TODO - check revocation (CRL, OCSP ...)
 				// X509ChainStatusFlags.RevocationStatusUnknown
diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
index 85bf6fa4f0a..78afc430071 100644
--- a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
@@ -69,15 +69,13 @@ namespace System.Security.Permissions {
 		RemotingConfiguration = 0x00000800,
 
 		Infrastructure = 0x00001000,
-#if ! NET_1_0
+
 		BindingRedirects = 0x00002000,
-#endif
+
 		AllFlags = Assertion | UnmanagedCode | SkipVerification | Execution | ControlThread
 			| ControlAppDomain | ControlDomainPolicy | ControlEvidence | ControlPolicy
 			| ControlPrincipal | Infrastructure | RemotingConfiguration | SerializationFormatter
-#if ! NET_1_0
 			| BindingRedirects
-#endif
 	} // SecurityPermissionFlag
 
 } // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Principal/WindowsIdentity.cs b/mcs/class/corlib/System.Security.Principal/WindowsIdentity.cs
index 26d4b84f6c5..14f07dd98c8 100644
--- a/mcs/class/corlib/System.Security.Principal/WindowsIdentity.cs
+++ b/mcs/class/corlib/System.Security.Principal/WindowsIdentity.cs
@@ -76,7 +76,7 @@ namespace System.Security.Principal {
 			// last - as it can override some fields
 			SetToken (userToken);
 		}
-#if !NET_1_0
+
 		[SecurityPermission (SecurityAction.Demand, ControlPrincipal=true)]
 		public WindowsIdentity (string sUserPrincipalName) 
 			: this (sUserPrincipalName, null)
@@ -107,7 +107,6 @@ namespace System.Security.Principal {
 		{
 			_info = info;
 		}
-#endif
 
 		[ComVisible (false)]
 		public void Dispose ()
@@ -252,7 +251,7 @@ namespace System.Security.Principal {
 			_account = (WindowsAccountType) _info.GetValue ("m_acctType", typeof (WindowsAccountType));
 			_authenticated = _info.GetBoolean ("m_isAuthenticated");
 		}
-#if !NET_1_0
+
 		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context) 
 		{
 			info.AddValue ("m_userToken", _token);
@@ -262,7 +261,7 @@ namespace System.Security.Principal {
 			info.AddValue ("m_acctType", _account);
 			info.AddValue ("m_isAuthenticated", _authenticated);
 		}
-#endif
+
 		private void SetToken (IntPtr token) 
 		{
 			if (Environment.IsUnix) {
diff --git a/mcs/class/corlib/System.Security.Principal/WindowsPrincipal.cs b/mcs/class/corlib/System.Security.Principal/WindowsPrincipal.cs
index f4cb14ba291..d5c1724ce75 100644
--- a/mcs/class/corlib/System.Security.Principal/WindowsPrincipal.cs
+++ b/mcs/class/corlib/System.Security.Principal/WindowsPrincipal.cs
@@ -118,17 +118,9 @@ namespace System.Security.Principal {
 				if (m_roles == null) {
 					m_roles = WindowsIdentity._GetRoles (Token);
 				}
-#if !NET_1_0
-				role = role.ToUpperInvariant ();
-#endif
 				foreach (string check in m_roles) {
-#if NET_1_0
-					if (role == check)
-						return true;
-#else
 					if ((check != null) && (role == check.ToUpperInvariant ()))
 						return true;
-#endif
 				}
 				return false;
 			}
diff --git a/mcs/class/corlib/System.Security/SecurityElement.cs b/mcs/class/corlib/System.Security/SecurityElement.cs
index 9ba34115463..ca0513ba86a 100644
--- a/mcs/class/corlib/System.Security/SecurityElement.cs
+++ b/mcs/class/corlib/System.Security/SecurityElement.cs
@@ -436,9 +436,6 @@ namespace System.Security {
 					foreach (SecurityElement child in children) {
 						child.ToXml (ref s, level + 1);
 					}
-#if ! NET_2_0
-					s.Append (' ', level * 3);
-#endif
 				}
 				s.Append ("</")
 				 .Append (tag)
diff --git a/mcs/class/corlib/System.Text/UTF8Encoding.cs b/mcs/class/corlib/System.Text/UTF8Encoding.cs
index f1b2b5280e7..26f205cad3f 100644
--- a/mcs/class/corlib/System.Text/UTF8Encoding.cs
+++ b/mcs/class/corlib/System.Text/UTF8Encoding.cs
@@ -124,9 +124,7 @@ public class UTF8Encoding : Encoding
 						break;
 					} else {
 						// We have a surrogate tail without 
-						// leading surrogate. In NET_2_0 it
-						// uses fallback. In NET_1_1 we output
-						// wrong surrogate.
+						// leading surrogate.
 						char [] fallback_chars = GetFallbackChars (chars, start, fallback, ref buffer);
 						fixed (char *fb_chars = fallback_chars) {
 							char dummy = '\0';
@@ -292,9 +290,7 @@ public class UTF8Encoding : Encoding
 						break;
 					} else {
 						// We have a surrogate tail without 
-						// leading surrogate. In NET_2_0 it
-						// uses fallback. In NET_1_1 we output
-						// wrong surrogate.
+						// leading surrogate.
 						char [] fallback_chars = GetFallbackChars (chars, start, fallback, ref buffer); 
 						char dummy = '\0';
 						if (bytes + InternalGetByteCount (fallback_chars, 0, fallback_chars.Length, fallback, ref dummy, true) > end_bytes)