From: Miguel de Icaza Date: Sun, 3 Jun 2012 01:46:34 +0000 (-0400) Subject: [class libraries] drop NET_1_0 definitions X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=1c19405a835f78a82a6df2f11a42f9b783f93008;p=mono.git [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 e3bbb7e7a7c..ef4965ad8c4 100644 --- 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 b4c3b0537f7..8d5c85efd1e 100644 --- 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 a0f9ef4a389..4429caccc80 100644 --- 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; SoapCore _soapCore; -#if NET_1_0 - internal static string[] AllowedProperties = new string [] { "includeVersions", "strictBinding" }; -#else internal static string[] AllowedProperties = new string [] { "includeVersions", "strictBinding", "typeFilterLevel" }; -#endif public SoapServerFormatterSinkProvider () { 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 aba127bdf82..6e48d2b6f48 100644 --- 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 3191c265676..acef33e5362 100644 --- 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 23e3d4e85ff..8e6cabd0d3e 100644 --- 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 2e2637fa7fc..7f19ce58d3d 100644 --- 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 d91ce2ecf77..9ffa2505ac9 100644 --- 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 [] newTable = new KeyValuePair [defaultCapacity]; - Array.Copy (table, newTable, inUse); - this.table = newTable; - } -#endif else if (value > inUse) { KeyValuePair [] newTable = new KeyValuePair [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 ae157d4faec..a1a377da08f 100644 --- 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(); }