[class libraries] drop NET_1_0 definitions

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintDocument.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintDocument.cs
index e3bbb7e7a7cbc216512cb7e074047472a6b5b399..ef4965ad8c42f5edf34ec4d8c3f386de0467a45f 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintDocument.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintDocument.cs
@@ -45,9 +45,7 @@ namespace System.Drawing.Printing
                private PrinterSettings printersettings;
                private PrintController printcontroller;
                private string documentname;
-#if !(NET_1_0)
                private bool originAtMargins = false; // .NET V1.1 Beta
-#endif
 
                public PrintDocument() {
                        documentname = "document"; //offical default.
@@ -105,7 +103,6 @@ namespace System.Drawing.Printing
                        }
                }
 
-#if !(NET_1_0)
                [DefaultValue (false)]
                [SRDescription ("Determines if the origin is set at the specified margins.")]
                public bool OriginAtMargins{
@@ -116,7 +113,6 @@ namespace System.Drawing.Printing
                                originAtMargins = value;
                        }
                }
-#endif
 
                // methods
                public void Print(){

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
index b4c3b0537f7aca0ef1f9981aa126908be11a5d66..8d5c85efd1e30582df0d452bcebb639e590d0abb 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
@@ -40,11 +40,7 @@ namespace System.Runtime.Remoting.Channels
                IServerChannelSinkProvider next = null;
                BinaryCore _binaryCore;
                
-#if NET_1_0
-               internal static string[] AllowedProperties = new string [] { "includeVersions", "strictBinding" };
-#else
                internal static string[] AllowedProperties = new string [] { "includeVersions", "strictBinding", "typeFilterLevel" };
-#endif
 
                public BinaryServerFormatterSinkProvider ()
                {

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
index a0f9ef4a389c653eb5940daacad113fd47f0d9ea..4429caccc807fa0ce4930dfc69ec8c43e012c753 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
@@ -40,11 +40,7 @@ namespace System.Runtime.Remoting.Channels
                private IServerChannelSinkProvider _next;\r
                SoapCore _soapCore;\r
 \r
-#if NET_1_0\r
-               internal static string[] AllowedProperties = new string [] { "includeVersions", "strictBinding" };\r
-#else\r
                internal static string[] AllowedProperties = new string [] { "includeVersions", "strictBinding", "typeFilterLevel" };\r
-#endif\r
 \r
                public SoapServerFormatterSinkProvider ()\r
                {\r

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlSignature.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlSignature.cs
index aba127bdf821cf3a67c92319012eaeffe023da4c..6e48d2b6f4874f5156031055d8f77f2ddd402b0c 100644 (file)
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlSignature.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlSignature.cs
@@ -47,9 +47,7 @@ namespace System.Security.Cryptography.Xml {
                        public const string DigestMethod = "DigestMethod";
                        public const string DigestValue = "DigestValue";
                        public const string DSAKeyValue = "DSAKeyValue";
-#if NET_2_0
                        public const string EncryptedKey = "EncryptedKey";
-#endif
                        public const string HMACOutputLength = "HMACOutputLength";
                        public const string KeyInfo = "KeyInfo";
                        public const string KeyName = "KeyName";
@@ -57,12 +55,7 @@ namespace System.Security.Cryptography.Xml {
                        public const string Manifest = "Manifest";
                        public const string Object = "Object";
                        public const string Reference = "Reference";
-#if NET_1_0
-                       // RetrievalMethod vs RetrievalElement -> BUG in MS Framework 1.0
-                       public const string RetrievalMethod = "RetrievalElement";
-#else
                        public const string RetrievalMethod = "RetrievalMethod";
-#endif
                        public const string RSAKeyValue = "RSAKeyValue";
                        public const string Signature = "Signature";
                        public const string SignatureMethod = "SignatureMethod";

diff --git a/mcs/class/System.Web/System.Web.Security/PassportIdentity.cs b/mcs/class/System.Web/System.Web.Security/PassportIdentity.cs
index 3191c265676b165ac31d7d78329e85508c68a11c..acef33e53620ac57e3b9982f3370258a341b4ddf 100644 (file)
--- a/mcs/class/System.Web/System.Web.Security/PassportIdentity.cs
+++ b/mcs/class/System.Web/System.Web.Security/PassportIdentity.cs
@@ -59,12 +59,10 @@ namespace System.Web.Security {
                        return AuthUrl (null, -1, -1, null, -1, null, -1, -1);
                }
 
-#if (!NET_1_0)
                public string AuthUrl (String strReturnUrl)
                {
                        return AuthUrl (strReturnUrl, -1, -1, null, -1, null, -1, -1);
                }
-#endif
 
                public string AuthUrl (string strReturnUrl,
                                       int iTimeWindow,

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs
index 23e3d4e85ffe5845a3cda32ca53f86a0937653a6..8e6cabd0d3efbaf23304c1c94faa9a4f09a2c96b 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs
+++ b/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs
@@ -783,26 +783,6 @@ namespace Mono.Xml.Schema
                        return true;
                }
 
-#if NET_1_0
-               public override string ReadInnerXml ()
-               {
-                       // MS.NET 1.0 has a serious bug here. It skips validation.
-                       return ReadInnerXmlInternal ();
-               }
-
-               public override string ReadOuterXml ()
-               {
-                       // MS.NET 1.0 has a serious bug here. It skips validation.
-                       return ReadInnerXmlInternal ();
-               }
-
-               // XmlReader.ReadString() should call derived this.Read().
-               public override string ReadString ()
-               {
-                       return ReadStringInternal ();
-               }
-#endif
-
                // This class itself does not have this feature.
                public override void ResolveEntity ()
                {

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
index 2e2637fa7fc0baf724ae8a891cabded66cd27f2b..7f19ce58d3d06ab83ab969b2642b2647bfb3f6f6 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
+++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
@@ -1680,28 +1680,10 @@ namespace Mono.Xml.Schema
                        return true;
                }
 
-#if NET_1_0
-               public override string ReadInnerXml ()
-               {
-                       // MS.NET 1.0 has a serious bug here. It skips validation.
-                       return reader.ReadInnerXml ();
-               }
-
-               public override string ReadOuterXml ()
-               {
-                       // MS.NET 1.0 has a serious bug here. It skips validation.
-                       return reader.ReadOuterXml ();
-               }
-#endif
-
                // XmlReader.ReadString() should call derived this.Read().
                public override string ReadString ()
                {
-#if NET_1_0
-                       return reader.ReadString ();
-#else
                        return base.ReadString ();
-#endif
                }
 
                // This class itself does not have this feature.

diff --git a/mcs/class/System/System.Collections.Generic/SortedList.cs b/mcs/class/System/System.Collections.Generic/SortedList.cs
index d91ce2ecf77c879b83b3a76b39a878d8da09e29d..9ffa2505ac9826c9152255c9cbca3006b4111199 100644 (file)
--- a/mcs/class/System/System.Collections.Generic/SortedList.cs
+++ b/mcs/class/System/System.Collections.Generic/SortedList.cs
@@ -197,13 +197,6 @@ namespace System.Collections.Generic
                                         Array.Copy (table, newTable, inUse);
                                         this.table = newTable;
                                }
-#if NET_1_0
-                               else if (current > defaultCapacity && value < current) {
-                                        KeyValuePair<TKey, TValue> [] newTable = new KeyValuePair<TKey, TValue> [defaultCapacity];
-                                        Array.Copy (table, newTable, inUse);
-                                        this.table = newTable;
-                                }
-#endif
                                else if (value > inUse) {
                                         KeyValuePair<TKey, TValue> [] newTable = new KeyValuePair<TKey, TValue> [value];
                                         Array.Copy (table, newTable, inUse);

diff --git a/mcs/class/System/System.Collections.Specialized/NameObjectCollectionBase.cs b/mcs/class/System/System.Collections.Specialized/NameObjectCollectionBase.cs
index ae157d4faeca25f06dcc322a1c90e1f44bbeb6be..a1a377da08f34a0e6090892905d848c419d1ba71 100644 (file)
--- a/mcs/class/System/System.Collections.Specialized/NameObjectCollectionBase.cs
+++ b/mcs/class/System/System.Collections.Specialized/NameObjectCollectionBase.cs
@@ -195,13 +195,8 @@ namespace System.Collections.Specialized
                protected NameObjectCollectionBase ()
                {
                        m_readonly = false;
-#if NET_1_0
-                       m_hashprovider = CaseInsensitiveHashCodeProvider.Default;
-                       m_comparer = CaseInsensitiveComparer.Default;
-#else
                        m_hashprovider = CaseInsensitiveHashCodeProvider.DefaultInvariant;
                        m_comparer = CaseInsensitiveComparer.DefaultInvariant;
-#endif
                        m_defCapacity = 0;
                        Init();
                }
@@ -209,13 +204,8 @@ namespace System.Collections.Specialized
                protected NameObjectCollectionBase( int capacity )
                {
                        m_readonly = false;
-#if NET_1_0
-                       m_hashprovider = CaseInsensitiveHashCodeProvider.Default;
-                       m_comparer = CaseInsensitiveComparer.Default;
-#else
                        m_hashprovider = CaseInsensitiveHashCodeProvider.DefaultInvariant;
                        m_comparer = CaseInsensitiveComparer.DefaultInvariant;
-#endif
                        m_defCapacity = capacity;
                        Init();
                }