Removal of NET_1_1 defines and some NET_2_0; Both defines are true these days in...
authorMiguel de Icaza <miguel@gnome.org>
Fri, 1 Jun 2012 22:04:16 +0000 (18:04 -0400)
committerMiguel de Icaza <miguel@gnome.org>
Fri, 1 Jun 2012 22:04:24 +0000 (18:04 -0400)
141 files changed:
mcs/class/Accessibility/Assembly/AssemblyInfo.cs
mcs/class/Mono.Xml.Ext/Mono.Xml.XPath/XPathNavigatorReader.cs
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs
mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs
mcs/class/System.Data/System.Data.OleDb/OleDbPermission.cs
mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
mcs/class/System.Data/System.Data.SqlClient/SqlException.cs
mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
mcs/class/System.Data/System.Data.SqlTypes/SqlTruncateException.cs
mcs/class/System.Data/System.Data/DataRowCollection.cs
mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionTest.cs
mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
mcs/class/System.Data/Test/System.Data/DataTableTest.cs
mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
mcs/class/System.Drawing/Assembly/AssemblyInfo.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AppDomainHelper.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/AssemblyLocator.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClientRemotingConfig.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ClrObjectFactory.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComManagedImportUtil.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ComSoapPublishError.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/GenerateMetadata.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IClrObjectFactory.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComManagedImportUtil.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapIISVRoot.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapMetadata.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IComSoapPublisher.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IISVirtualRoot.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/IServerWebConfig.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapClientImport.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerTlb.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapServerVRoot.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ISoapUtility.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/Publish.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/ServerWebConfig.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapClientImport.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerTlb.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapServerVRoot.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices.Internal/SoapUtility.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/Activity.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/BindingOption.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/IAsyncErrorNotify.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/IPlaybackControl.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitControl.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/IProcessInitializer.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/IServiceCall.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/InheritanceOption.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/PartitionOption.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationConfig.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelper.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelperTx.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServiceConfig.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/SxsOption.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/ThreadPoolOption.cs
mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionStatus.cs
mcs/class/System.Management/Assembly/AssemblyInfo.cs
mcs/class/System.Messaging/Assembly/AssemblyInfo.cs
mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapCore.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
mcs/class/System.Security/System.Security.Cryptography.Xml/Transform.cs
mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigC14NTransform.cs
mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigEnvelopedSignatureTransform.cs
mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigExcC14NTransform.cs
mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs
mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXsltTransform.cs
mcs/class/System.Security/Test/System.Security.Cryptography.Xml/KeyInfoRetrievalMethodTest.cs
mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigC14NTransformTest.cs
mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs
mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs
mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs
mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpWebClientProtocol.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderDirection.cs
mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
mcs/class/System.Web/System.Web.Mail/MailMessage.cs
mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/PanelTest.cs
mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs
mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs
mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs
mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
mcs/class/System.XML/System.Xml/XmlInputStream.cs
mcs/class/System.XML/System.Xml/XmlTextWriter2.cs
mcs/class/System.XML/Test/System.Xml.Xsl/XslTransformTests.cs
mcs/class/System/System.Net.Sockets/IPv6MulticastOption.cs
mcs/class/System/System.Net.Sockets/ProtocolType.cs
mcs/class/System/System.Net.Sockets/Socket.jvm.cs
mcs/class/System/System.Net.Sockets/SocketOptionLevel.cs
mcs/class/System/System.Net/IPEndPoint.cs
mcs/class/System/System.Net/ServicePointManager.cs
mcs/class/System/System.Net/WebConnectionGroup.cs
mcs/class/System/System.Net/WebExceptionStatus.cs
mcs/class/System/System.Web/AspNetHostingPermission.cs
mcs/class/System/System.Web/AspNetHostingPermissionAttribute.cs
mcs/class/System/System.Web/AspNetHostingPermissionLevel.cs
mcs/class/System/Test/System.Net/IPAddressTest.cs
mcs/class/corlib/System.Collections/CaseInsensitiveHashCodeProvider.cs
mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs
mcs/class/corlib/System.Runtime.InteropServices/_Assembly.cs
mcs/class/corlib/System.Runtime.InteropServices/_AssemblyBuilder.cs
mcs/class/corlib/System.Runtime.InteropServices/_AssemblyName.cs
mcs/class/corlib/System.Runtime.InteropServices/_Attribute.cs
mcs/class/corlib/System.Runtime.InteropServices/_ConstructorBuilder.cs
mcs/class/corlib/System.Runtime.InteropServices/_ConstructorInfo.cs
mcs/class/corlib/System.Runtime.InteropServices/_MemberInfo.cs
mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
mcs/class/corlib/System.Security.Cryptography/RSACryptoServiceProvider.cs
mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
mcs/class/corlib/System.Threading/Thread.cs
mcs/class/corlib/Test/System.Collections/SortedListTest.cs
mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
mcs/class/corlib/Test/System.Reflection/AssemblyCas.cs
mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
mcs/class/corlib/Test/System.Runtime.CompilerServices/RuntimeHelpersTest.cs
mcs/class/corlib/Test/System.Runtime.Remoting/RemotingConfigurationTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs
mcs/class/corlib/Test/System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionAttributeTest.cs
mcs/class/corlib/Test/System.Security.Permissions/SecurityPermissionTest.cs
mcs/class/corlib/Test/System.Security.Permissions/StrongNamePublicKeyBlobTest.cs
mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs

index ae046c851ad0fe913f5b8f649712028c9d9e837c..82a24e7fa8387df2e745552ba6198d71f48e1019 100644 (file)
@@ -62,17 +62,7 @@ using System.Runtime.InteropServices;
 
 [assembly: ImportedFromTypeLib ("Accessibility")]
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: TypeLibVersion (1, 1)]
-       [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-#elif NET_1_1
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-       [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-       [assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: TypeLibVersion (1, 1)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
index 6fa769aa35fe2c179d1255c39f1f72f204f67254..8beb07d8d1b0dd5fd336bddd21f3b55bc7698717 100644 (file)
@@ -543,108 +543,6 @@ namespace Mono.Xml.XPath
                        return ret;\r
                }\r
 \r
-#if NET_1_1\r
-#else\r
-               public override string ReadInnerXml ()\r
-               {\r
-                       if (ReadState != ReadState.Interactive)\r
-                               return String.Empty;\r
-\r
-                       switch (NodeType) {\r
-                       case XmlNodeType.Attribute:\r
-                               return Value;\r
-                       case XmlNodeType.Element:\r
-                               if (IsEmptyElement)\r
-                                       return String.Empty;\r
-\r
-                               int startDepth = Depth;\r
-\r
-                               innerXmlBuilder.Length = 0;\r
-                               bool loop = true;\r
-                               do {\r
-                                       Read ();\r
-                                       if (NodeType ==XmlNodeType.None)\r
-                                               throw new InvalidOperationException ("unexpected end of xml.");\r
-                                       else if (NodeType == XmlNodeType.EndElement && Depth == startDepth) {\r
-                                               loop = false;\r
-                                               Read ();\r
-                                       }\r
-                                       else\r
-                                               innerXmlBuilder.Append (GetCurrentTagMarkup ());\r
-                               } while (loop);\r
-                               string xml = innerXmlBuilder.ToString ();\r
-                               innerXmlBuilder.Length = 0;\r
-                               return xml;\r
-                       case XmlNodeType.None:\r
-                               // MS document is incorrect. Seems not to progress.\r
-                               return String.Empty;\r
-                       default:\r
-                               Read ();\r
-                               return String.Empty;\r
-                       }\r
-               }\r
-               \r
-               StringBuilder atts = new StringBuilder ();\r
-               private string GetCurrentTagMarkup ()\r
-               {\r
-                       switch (NodeType) {\r
-                       case XmlNodeType.CDATA:\r
-                               return String.Format ("<![CDATA[{0}]]>", Value.Replace ("]]>", "]]&gt;"));\r
-                       case XmlNodeType.Text:\r
-                               return Value.Replace ("<", "&lt;");\r
-                       case XmlNodeType.Comment:\r
-                               return String.Format ("<!--{0}-->", Value);\r
-                       case XmlNodeType.SignificantWhitespace:\r
-                       case XmlNodeType.Whitespace:\r
-                               return Value;\r
-                       case XmlNodeType.EndElement:\r
-                               return String.Format ("</{0}>", Name);\r
-                       }\r
-\r
-                       bool isEmpty = IsEmptyElement;\r
-                       string name = Name;\r
-                       atts.Length = 0;\r
-                       XPathNavigator temp = current.Clone ();\r
-                       while (temp.MoveToNextAttribute ())\r
-                               atts.AppendFormat (" {0}='{1}'", temp.Name, temp.Value.Replace ("'", "&apos;"));\r
-                       if (!IsEmptyElement)\r
-                               return String.Format ("<{0}{1}>", name, atts);\r
-                       else\r
-                               return String.Format ("<{0}{1} />", name, atts);\r
-               }\r
-\r
-               // Arranged copy of XmlTextReader.ReadOuterXml()\r
-               public override string ReadOuterXml ()\r
-               {\r
-                       if (ReadState != ReadState.Interactive)\r
-                               return String.Empty;\r
-\r
-                       switch (NodeType) {\r
-                       case XmlNodeType.Attribute:\r
-                               // strictly incompatible with MS... (it holds spaces attribute between name, value and "=" char (very trivial).\r
-                               return String.Format ("{0}={1}{2}{1}", Name, QuoteChar, ReadInnerXml ());\r
-                       case XmlNodeType.Element:\r
-                               bool isEmpty = IsEmptyElement;\r
-                               string name = Name;\r
-                               StringBuilder atts = new StringBuilder ();\r
-                               XPathNavigator temp = current.Clone ();\r
-                               while (temp.MoveToNextAttribute ())\r
-                                       atts.AppendFormat (" {0}='{1}'", temp.Name, temp.Value.Replace ("'", "&apos;"));\r
-\r
-                               if (!isEmpty)\r
-                                       return String.Format ("{0}{1}</{2}>", GetCurrentTagMarkup (), atts, ReadInnerXml (), name);\r
-                               else\r
-                                       return String.Format ("{0}", GetCurrentTagMarkup ());\r
-                       case XmlNodeType.None:\r
-                               // MS document is incorrect. Seems not to progress.\r
-                               return String.Empty;\r
-                       default:\r
-                               Read ();\r
-                               return String.Empty;\r
-                       }\r
-               }\r
-#endif\r
-\r
                public override string LookupNamespace (string prefix)\r
                {\r
                        XPathNavigator backup = current.Clone ();\r
index 0eacb644e185937fe0d8b4f9282518499e5e394c..4a7aa220a090e0a5159da697469b6556643ad48c 100644 (file)
@@ -21,20 +21,9 @@ using System.Runtime.Serialization;
 
 namespace System.Data.OracleClient {
        [Serializable]
-       public sealed class OracleException
-#if NET_2_0
-               : System.Data.Common.DbException
-#else
-               : SystemException
-#endif //NET_1_1       
+       public sealed class OracleException : System.Data.Common.DbException
        {
-               #region Fields
-
-               private int code;
-
-               #endregion // Fields
-
-               #region Constructors
+               int code;
 
                internal OracleException (int code, string message) : base (message)
                {
@@ -45,25 +34,13 @@ namespace System.Data.OracleClient {
                {
                        code = si.GetInt32 ("code");
                }
-
-               #endregion // Constructors
-
-               #region Properties
-
                public int Code {
                        get { return code; }
                }
-
-               #endregion // Properties
-
-               #region Override implementation of Exception
-
                public override void GetObjectData (SerializationInfo si, StreamingContext context)
                {
                        si.AddValue ("code", code, typeof(int));
                        base.GetObjectData (si, context);
                }
-
-               #endregion Override implementation of Exception
        }
 }
index bfb97364f16e95a8529a8a6785e4fc29bfc1572a..ccc45404d64cb8a4df4f787a573b7ddc351fd0bc 100644 (file)
@@ -45,10 +45,8 @@ namespace System.Data.Common {
 
                bool allowBlankPassword;
                string keyRestrictions;
-#if NET_1_1
                KeyRestrictionBehavior keyRestrictionBehavior;
                string connectionString;
-#endif
 
                #endregion // Fields
 
@@ -77,7 +75,6 @@ namespace System.Data.Common {
                        set { keyRestrictions = value; }
                }
 
-#if NET_1_1
                public string ConnectionString {
                        get {
                                if (connectionString == null)
@@ -94,12 +91,10 @@ namespace System.Data.Common {
                                keyRestrictionBehavior = value;
                        }
                }
-#endif
 
                #endregion // Properties
 
                #region // Methods
-#if NET_2_0
                [EditorBrowsableAttribute (EditorBrowsableState.Never)]
                public bool ShouldSerializeConnectionString ()
                {
@@ -113,7 +108,6 @@ namespace System.Data.Common {
                        // FIXME: configurable ? why is this in the attribute class ?
                        return false;
                }
-#endif
                #endregion // Methods
        }
 }
index da7db7e807fe6332206b68df5271edf7ce20753e..a198de6bb2c3174b4ed9740b7e52a6fdf24053f5 100644 (file)
@@ -38,9 +38,7 @@ namespace System.Data.Odbc
        {
                #region Constructors
 
-#if NET_1_1
                [Obsolete ("use OdbcPermission(PermissionState.None)", true)]
-#endif
                public OdbcPermission ()
                        : base (PermissionState.None)
                {
@@ -51,9 +49,7 @@ namespace System.Data.Odbc
                {
                }
 
-#if NET_1_1
                [Obsolete ("use OdbcPermission(PermissionState.None)", true)]
-#endif
                public OdbcPermission (PermissionState state, bool allowBlankPassword)
                        : base (state)
                {
index 44797ea1784bce7e305d66e43a2ad50d48165fa2..af23b58cd726ccee47eef10300c4c81016cabb75 100644 (file)
@@ -48,9 +48,7 @@ namespace System.Data.OleDb
 
                #region Constructors
 
-#if NET_1_1
                [Obsolete ("use OleDbPermission(PermissionState.None)", true)]
-#endif
                public OleDbPermission ()
                        : base (PermissionState.None)
                {
@@ -61,9 +59,7 @@ namespace System.Data.OleDb
                {
                }
 
-#if NET_1_1
                [Obsolete ("use OleDbPermission(PermissionState.None)", true)]
-#endif
                public OleDbPermission (PermissionState state, bool allowBlankPassword)
                        : base (state)
                {
@@ -86,11 +82,9 @@ namespace System.Data.OleDb
 
                #region Properties
 
-#if NET_2_0
                [Obsolete ()]
                [BrowsableAttribute (false)]
                [EditorBrowsableAttribute (EditorBrowsableState.Never)]
-#endif
                public string Provider {
                        get {
                                if (_provider == null)
@@ -108,36 +102,6 @@ namespace System.Data.OleDb
                {
                        return new OleDbPermission (this);
                }
-
-#if !NET_2_0
-               // methods required to support Provider were removed in Fx 2.0
-               // i.e. Provider isn't included in the XML output
-
-               public override void FromXml (SecurityElement securityElement)
-               {
-                       base.FromXml (securityElement);
-                       // Provider
-               }
-
-               [MonoTODO ("is it worth to implement as it is being removed ?")]
-               public override IPermission Intersect (IPermission target)
-               {
-                       return base.Intersect (target);
-               }
-
-               public override SecurityElement ToXml ()
-               {
-                       SecurityElement se = base.ToXml ();
-                       // add Provider
-                       return se;
-               }
-
-               [MonoTODO ("is it worth to implement as it is being removed ?")]
-               public override IPermission Union (IPermission target)
-               {
-                       return base.Union (target);
-               }
-#endif
                #endregion
        }
 }
index 7b141315d9e47dcba39ed46d2ce39fce13b17bed..c66bf3328c270e8f540c1c8a8e1dd37b67c22b2a 100644 (file)
@@ -85,12 +85,10 @@ namespace System.Data.SqlClient {
                        return new SqlClientPermission (this);
                }
 
-#if NET_1_1
                public override void Add (string connectionString, string restrictions, KeyRestrictionBehavior behavior)
                {
                        base.Add (connectionString, restrictions, behavior);
                }
-#endif
                #endregion // Methods
        }
 }
index 0dd0da89ecccc4545dfaddbf2e75e83d7e424155..542a564bd1b59e7c4b384fce02bf221547699181 100644 (file)
@@ -45,12 +45,7 @@ using Mono.Data.Tds.Protocol;
 namespace System.Data.SqlClient
 {
        [Serializable]
-       public sealed class SqlException
-#if NET_2_0
-               : DbException
-#else
-               : SystemException
-#endif //NET_1_1
+       public sealed class SqlException : DbException
        {
                #region Fields
 
index a6fab12a90721823f418bf8a4d298f169168062f..c7c0468ab21dd085dccff4f9dee68eede3a12400 100644 (file)
@@ -34,9 +34,7 @@ using System.Runtime.Serialization;
 
 namespace System.Data.SqlTypes
 {
-#if NET_1_1
        [Serializable]
-#endif
        public sealed class SqlNullValueException : SqlTypeException, ISerializable
        {
                public SqlNullValueException ()
index 15312cd35d5248fabe8e594229717a0925e6c4c5..ca476adc08a17172919342f4fcc2cfe67a812d51 100644 (file)
@@ -34,9 +34,7 @@ using System.Runtime.Serialization;
 
 namespace System.Data.SqlTypes
 {
-#if NET_1_1
        [Serializable]
-#endif
        public sealed class SqlTruncateException : SqlTypeException, ISerializable
        {
                public SqlTruncateException ()
index 3cef9793b8ef50d11ee8fa01d4207f8459853e33..fbbc7e932ba98827ce7d5403cafe74c1899642c8 100644 (file)
@@ -123,11 +123,7 @@ namespace System.Data
                /// <summary>
                /// Creates a row using specified values and adds it to the DataRowCollection.
                /// </summary>
-#if NET_2_0
                public DataRow Add (params object[] values)
-#else
-               public virtual DataRow Add (object[] values)
-#endif
                {
                        if (values == null)
                                throw new NullReferenceException ();
@@ -155,24 +151,16 @@ namespace System.Data
 
                                        string err = String.Format ("Cannot clear table Parent because " +
                                                                "ForeignKeyConstraint {0} enforces Child.", uc.ConstraintName);
-#if NET_1_1
                                        throw new InvalidConstraintException (err);
-#else
-                                       throw new ArgumentException (err);
-#endif
                                }
                        }
 
-#if NET_2_0
                        table.DataTableClearing ();
-#endif 
                        List.Clear ();
 
                        // Remove from indexes
                        table.ResetIndexes ();
-#if NET_2_0
                        table.DataTableCleared ();
-#endif
                        OnListChanged (this, new ListChangedEventArgs (ListChangedType.Reset, -1, -1));
                }
 
@@ -340,7 +328,6 @@ namespace System.Data
                }
        }
 
-#if NET_2_0
        sealed partial class DataRowCollection {
                public override int Count {
                        get { return List.Count; }
@@ -361,15 +348,4 @@ namespace System.Data
                        return base.GetEnumerator ();
                }
        }
-#else
-       [Serializable]
-       partial class DataRowCollection {
-               /// <summary>
-               /// This member overrides InternalDataCollectionBase.List
-               /// </summary>
-               protected override ArrayList List {
-                       get { return base.List; }
-               }
-       }
-#endif
 }
index 652160d14bc5c4bfa1fed86077469fb5059b3114..9c2842619f4fc1686b43d6067164f1b5471c2892 100644 (file)
@@ -97,44 +97,6 @@ namespace MonoTests.System.Data.Common {
                                Assert.AreEqual (count, dbdp.ToXml ().Children.Count, msg + ".Count");
                }
 
-#if !NET_2_0
-               [Test]
-               public void Constructor_Empty ()
-               {
-                       NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission ();
-                       Check ("Empty", dbdp, false, false, 0);
-               }
-#elif !NET_1_1
-               [Test]
-               [ExpectedException (typeof (ArgumentOutOfRangeException))]
-               public void Constructor_PermissionStateBoolean_Invalid ()
-               {
-                       PermissionState ps = (PermissionState) Int32.MinValue;
-                       NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-               }
-
-               [Test]
-               public void Constructor_PermissionStateBoolean_None ()
-               {
-                       PermissionState ps = PermissionState.None;
-                       NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-                       Check ("None,False", dbdp, false, false, 0);
-
-                       dbdp = new NonAbstractDBDataPermission (ps, true);
-                       Check ("None,True", dbdp, true, false, 0);
-               }
-
-               [Test]
-               public void Constructor_PermissionStateBoolean_Unrestricted ()
-               {
-                       PermissionState ps = PermissionState.Unrestricted;
-                       NonAbstractDBDataPermission dbdp = new NonAbstractDBDataPermission (ps, false);
-                       Check ("Unrestricted,False", dbdp, false, true, 0);
-
-                       dbdp = new NonAbstractDBDataPermission (ps, true);
-                       Check ("Unrestricted,True", dbdp, true, true, 0);
-               }
-#endif
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
                public void Constructor_DBDataPermission_Null ()
index 10af5ada60fa1f47fc26c5f900b654be9bd68463..26e1301417cacfee4fe6466c058bdbe6e69576df 100644 (file)
@@ -101,17 +101,9 @@ namespace MonoTests.System.Data
                                _constraint2.ConstraintName = "dog"; //case insensitive
                                col.Add (_constraint1);
                                col.Add (_constraint2);
-#if NET_1_1
-#else
-                               Assert.Fail ("Failed to throw Duplicate name exception.");
-#endif
                                col.Remove (_constraint2); // only for !1.0
                                col.Remove (_constraint1);
                        }
-#if ! NET_1_1
-                       catch (DuplicateNameException) {
-                       }
-#endif
                        catch (AssertionException exc) {
                                throw exc;
                        }
@@ -124,16 +116,8 @@ namespace MonoTests.System.Data
                        //Constraint Already exists
                        try {
                                col.Add (_constraint1);
-#if NET_1_1
-#else
-                               Assert.Fail ("B2: Failed to throw ArgumentException.");
-#endif
                                col.Remove (_constraint1);
                        } catch (ArgumentException) {
-#if NET_1_1
-#else
-                               throw;
-#endif
                        } catch (AssertionException exc) {
                                throw exc;
                        } catch {
index f1c7f78b463b61ce4658cc5552701eed0875a23f..2a9db1a1582888b19a1b3691162251133a466d05 100644 (file)
@@ -899,7 +899,6 @@ namespace MonoTests.System.Data
                        Assert.AreEqual ("Error#1", (table.GetErrors ())[0].RowError, "#A02");
                }
 
-#if NET_2_0
                [Test]
                public void NewRowAddedTest ()
                {
@@ -924,7 +923,6 @@ namespace MonoTests.System.Data
 
                        Assert.IsTrue (_tableNewRowAddedEventFired, "#NewRowAdded Event #01");
                }
-#endif
 
                [Test]
                public void CloneCopyTest ()
@@ -983,11 +981,6 @@ namespace MonoTests.System.Data
                        DataColumn[] colArray = {table.Columns[0]};
                        table.PrimaryKey = colArray;
                        table.ExtendedProperties.Add ("TimeStamp", DateTime.Now);
-#if NET_1_1 // This prevents further tests after .NET 1.1.
-#else
-                       CultureInfo cultureInfo = new CultureInfo ("en-gb");
-                       table.Locale = cultureInfo;
-#endif
 
                        row = table1.NewRow ();
                        row ["Name"] = "Abc";
@@ -1012,10 +1005,6 @@ namespace MonoTests.System.Data
                        Assert.AreEqual ("Id / Name + (Id * Id)", cloneTable.DisplayExpression, "#A06");
                        Assert.AreEqual (1, cloneTable.ExtendedProperties.Count, "#A07");
                        Assert.IsFalse (cloneTable.HasErrors, "#A08");
-#if NET_1_1
-#else
-                       Assert.AreEqual (2057, cloneTable.Locale.LCID, "#A09");
-#endif
                        Assert.AreEqual (100, cloneTable.MinimumCapacity, "#A10");
                        Assert.AreEqual ("Namespace#1", cloneTable.Namespace, "#A11");
                        Assert.AreEqual ("PrefixNo:1", cloneTable.Prefix, "#A12");
@@ -1033,10 +1022,6 @@ namespace MonoTests.System.Data
                        Assert.AreEqual ("Id / Name + (Id * Id)", copyTable.DisplayExpression, "#A21");
                        Assert.AreEqual (1, copyTable.ExtendedProperties.Count, "#A22");
                        Assert.IsTrue (copyTable.HasErrors, "#A23");
-#if NET_1_1
-#else
-                       Assert.AreEqual (2057, copyTable.Locale.LCID, "#A24");
-#endif
                        Assert.AreEqual (100, copyTable.MinimumCapacity, "#A25");
                        Assert.AreEqual ("Namespace#1", copyTable.Namespace, "#A26");
                        Assert.AreEqual ("PrefixNo:1", copyTable.Prefix, "#A27");
@@ -1446,11 +1431,7 @@ namespace MonoTests.System.Data
                        // clear test
                        table.Clear ();
                        Assert.AreEqual (0, table.Rows.Count, "#A08");
-#if NET_1_1
                        Assert.AreEqual (0, table.Constraints.Count, "#A09");
-#else
-                       Assert.AreEqual (1, table.Constraints.Count, "#A09");
-#endif
                        Assert.AreEqual (0, table.ChildRelations.Count, "#A10");
                }
 
@@ -1469,18 +1450,14 @@ namespace MonoTests.System.Data
                        table.Rows.Add (new object [] { 4, "mono 4" });
 
                        table.AcceptChanges ();
-#if NET_2_0
                        _tableClearedEventFired = false;
                        table.TableCleared += new DataTableClearEventHandler (OnTableCleared);
                        _tableClearingEventFired = false;
                        table.TableClearing += new DataTableClearEventHandler (OnTableClearing);
-#endif // NET_2_0
 
                        table.Clear ();
-#if NET_2_0
                        Assert.IsTrue (_tableClearingEventFired, "#3 should have fired cleared event");
                        Assert.IsTrue (_tableClearedEventFired, "#0 should have fired cleared event");
-#endif // NET_2_0
 
                        DataRow r = table.Rows.Find (1);
                        Assert.IsTrue (r == null, "#1 should have cleared");
@@ -1490,7 +1467,6 @@ namespace MonoTests.System.Data
                        Assert.AreEqual (1, table.Rows.Count, "#2 should add row");
                }
 
-#if NET_2_0
                private bool _tableClearedEventFired;
                private void OnTableCleared (object src, DataTableClearEventArgs args)
                {
@@ -1508,9 +1484,7 @@ namespace MonoTests.System.Data
                {
                        _tableNewRowAddedEventFired = true;
                }
-#endif // NET_2_0
 
-#if NET_2_0
                [Test]
                public void TestWriteXmlSchema1 ()
                {
@@ -1852,7 +1826,6 @@ namespace MonoTests.System.Data
                        Assert.AreEqual ("  </xs:element>", substring, "test#32");
                        Assert.AreEqual ("</xs:schema>", TextString, "test#33");
                }
-#endif
 
                [Test]
                public void Serialize ()
@@ -2032,7 +2005,6 @@ namespace MonoTests.System.Data
                        Assert.AreEqual (1, dt.Rows.Count);
                }
 
-#if NET_2_0
                private bool tableInitialized;
                [Test]
                public void TableInitializedEventTest1 ()
@@ -2093,7 +2065,6 @@ namespace MonoTests.System.Data
                {
                        tableInitialized = true;
                }
-#endif
 
                public void OnRowChanging (object src, DataRowChangeEventArgs args)
                {
@@ -2105,7 +2076,6 @@ namespace MonoTests.System.Data
                        rowActionChanged = args.Action;
                }
 
-#if NET_2_0
                private DataTable dt;
                private void localSetup () {
                        dt = new DataTable ("test");
@@ -4160,7 +4130,6 @@ namespace MonoTests.System.Data
 
                #endregion // Read/Write XML Tests
 
-#endif // NET_2_0
        }
 
        public  class MyDataTable : DataTable
index 5e633630f99e92e0eb185a02332653ec28f62f97..8328f7ebbb2f8afceca220b23d95d5ce8d46052e 100644 (file)
@@ -209,15 +209,11 @@ namespace MonoTests.System.Data
                        // Create a ForeingKeyConstraint Object using the constructor
                         // ForeignKeyConstraint (string, string, string[], string[], AcceptRejectRule, Rule, Rule);
                         ForeignKeyConstraint fkc = new ForeignKeyConstraint ("hello world", parentTableName, parentColumnNames, childColumnNames, AcceptRejectRule.Cascade, Rule.Cascade, Rule.Cascade);                                                                                                                            // Assert that the Constraint object does not belong to any table yet
-#if NET_1_1
                        try {
                                DataTable tmp = fkc.Table;
                                Fail ("When table is null, get_Table causes an InvalidOperationException.");
                        } catch (InvalidOperationException) {
                        }
-#else
-                        Assertion.AssertEquals ("#A01 Table should not be set", fkc.Table, null);
-#endif
                                                                                                     
                         Constraint []constraints = new Constraint[3];
                         constraints [0] = new UniqueConstraint (column1);
@@ -302,11 +298,7 @@ namespace MonoTests.System.Data
                                fkc = new ForeignKeyConstraint((DataColumn)null,(DataColumn)null);
                                Fail("Failed to throw ArgumentNullException.");
                        }
-#if NET_1_1
                        catch (NullReferenceException) {}
-#else
-                       catch (ArgumentNullException) {}
-#endif
                        catch (AssertionException exc) {throw exc;}
                        catch (Exception exc)
                        {
@@ -344,13 +336,8 @@ namespace MonoTests.System.Data
                                fkc = new ForeignKeyConstraint(_ds.Tables[0].Columns[0], localTable.Columns[1]);
                                Fail("Failed to throw InvalidConstraintException.");
                        }
-#if NET_1_1
                        // tables in different datasets
                        catch (InvalidOperationException) {}
-#else
-                       //different dataTypes
-                       catch (InvalidConstraintException) {}
-#endif
 
                        // Cannot create a Key from Columns that belong to
                        // different tables.
index 5f9b12e7aad0397f81c0549a838a16d9b79211b9..602136ba6011785c77f86e0339e87311b8781cdb 100644 (file)
@@ -60,17 +60,7 @@ using System.Runtime.InteropServices;
        [assembly: AssemblyKeyFile("../msfinal.pub")]
 #endif
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Dependency ("System,", LoadHint.Always)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-#elif NET_1_1
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-       [assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-       [assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Dependency ("System,", LoadHint.Always)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
index 66a64e15e2fb1b23ba0f83bbd44cca9c7ee7b429..0a5bc3d86fcb57cbb9c7802b43c8dd97377d9c8b 100644 (file)
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("ef24f689-14f8-4d92-b4af-d7b1f0e70fd4")]
        public class AppDomainHelper
        {
@@ -48,5 +47,4 @@ namespace System.EnterpriseServices.Internal
 
 
        }
-#endif
 }
index 416c4ecc3f73924a0dc8a0a2792d98ddb911e684..6a49a8495a7ed48abc78eba4bf0bb4e047240fda 100644 (file)
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("458aa3b5-265a-4b75-bc05-9bea4630cf18")]
        public class AssemblyLocator : MarshalByRefObject {
 
@@ -41,5 +40,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index c5f858b51919f2d69b0a149b6aaf523333c069f7..1499726678fcb7f8d99da5bcd40fc51527a82511 100644 (file)
@@ -29,7 +29,6 @@ using System;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        public class ClientRemotingConfig {
 
                [MonoTODO]
@@ -45,5 +44,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index 800a29e05e5248af8836573fd5d4a03c12d0e3fd..48c2bf9437df62b4a63c7f7c1c13b8ec202cc5d8 100644 (file)
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("ecabafd1-7f19-11d2-978e-0000f8757e2a")]
        public class ClrObjectFactory : IClrObjectFactory {
 
@@ -68,5 +67,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index 4b2f07141cbf604d2a820d6a7c2365c0e4883064..45befdd77f552935ba1953aab81d8bf2020cbc01 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("3b0398c9-7812-4007-85cb-18c771f2206f")]
        public class ComManagedImportUtil : IComManagedImportUtil {
 
@@ -53,5 +52,4 @@ namespace System.EnterpriseServices.Internal
                        throw new NotImplementedException ();
                }
        }
-#endif
 }
index af093859b416c880714743c052e31b3ad5207c83..1b54e64fb1e9dd2dc31f96b82c8d480db28fc7bf 100644 (file)
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        public class ComSoapPublishError {
 
                [MonoTODO]
@@ -46,5 +45,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index 495de64f637d862b3ee479091d93cbb27c148418..1928b8b8e6c9fc0677213e0643f1e6b9df94a94a 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("d8013ff1-730b-45e2-ba24-874b7242c425")]
        public class GenerateMetadata : IComSoapMetadata {
 
@@ -66,5 +65,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index e6f925232f58d8ae7f5060d4bb614a847829fe00..6035ea4adfbe14536f3cb6c68606f2c7bd61ba06 100644 (file)
@@ -31,30 +31,20 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("ecabafd2-7f19-11d2-978e-0000f8757e2a")]
        public interface IClrObjectFactory
        {
                [DispId(1)]
-#if NET_2_0
                [return:MarshalAs (UnmanagedType.IDispatch)]
-#endif
                object CreateFromAssembly (string assembly, string type, string mode);
                [DispId(4)]
-#if NET_2_0
                [return:MarshalAs (UnmanagedType.IDispatch)]
-#endif
                object CreateFromMailbox (string Mailbox, string Mode);
                [DispId(2)]
-#if NET_2_0
                [return:MarshalAs (UnmanagedType.IDispatch)]
-#endif
                object CreateFromVroot (string VrootUrl, string Mode);
                [DispId(3)]
-#if NET_2_0
                [return:MarshalAs (UnmanagedType.IDispatch)]
-#endif
                object CreateFromWsdl (string WsdlUrl, string Mode);
        }
-#endif
 }
index 87ad358865e6ee6cad4d3ba997b4169239e19485..4385073a107aeff467a0537d1dd5796b5a44fc19 100644 (file)
@@ -32,7 +32,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("c3f8f66b-91be-4c99-a94f-ce3b0a951039")]
        public interface IComManagedImportUtil 
        {
@@ -41,5 +40,4 @@ namespace System.EnterpriseServices.Internal
                [DispId(5)] 
                void InstallAssembly ([MarshalAs(UnmanagedType.BStr)] string filename, [MarshalAs(UnmanagedType.BStr)] string parname, [MarshalAs(UnmanagedType.BStr)] string appname);
        }
-#endif
 }
index 11b2aa5b674b4c93d4da28a0774ce45976e67a0e..f44a526f68c677d8c8db17e60f767e732cb2238a 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
        [Guid("d8013ef0-730b-45e2-ba24-874b7242c425")]
        public interface IComSoapIISVRoot {
                [DispId(1)]
@@ -39,5 +38,4 @@ namespace System.EnterpriseServices.Internal {
                [DispId(2)]
                void Delete ([MarshalAs(UnmanagedType.BStr)] string RootWeb, [MarshalAs(UnmanagedType.BStr)] string PhysicalDirectory, [MarshalAs(UnmanagedType.BStr)] string VirtualDirectory, [MarshalAs(UnmanagedType.BStr)] out string Error);
        }
-#endif
 }
index 068fbc7fb5193dfb5f2b4411ce7f1a50dcbda90b..4f80008d8adaf87b22670230a13f30681a269a35 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
        [Guid("d8013ff0-730b-45e2-ba24-874b7242c425")]
        public interface IComSoapMetadata {
                [return: MarshalAs(UnmanagedType.BStr)]
@@ -41,5 +40,4 @@ namespace System.EnterpriseServices.Internal {
                [DispId(2)]
                string GenerateSigned ([MarshalAs(UnmanagedType.BStr)] string SrcTypeLibFileName, [MarshalAs(UnmanagedType.BStr)] string OutPath, [MarshalAs(UnmanagedType.Bool)] bool InstallGac, [MarshalAs(UnmanagedType.BStr)] out string Error);
        }
-#endif
 }
index c3c30f063373b8aefb62d137e4042909955e33b2..4527906deae86bee752d46bff482ffdf90719e98 100644 (file)
@@ -32,7 +32,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("d8013eee-730b-45e2-ba24-874b7242c425")]
        public interface IComSoapPublisher
        {
@@ -112,5 +111,4 @@ namespace System.EnterpriseServices.Internal
                [DispId(12)]
                void UnRegisterAssembly ([MarshalAs(UnmanagedType.BStr)] string AssemblyPath);
        }
-#endif
 }
index 61da318bba66d47d866cadeaf0ddd177a7e37bf8..311d6944b9268310d70612588774c51e67a21971 100644 (file)
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("d8013ef1-730b-45e2-ba24-874b7242c425")]
        public class IISVirtualRoot : IComSoapIISVRoot {
 
@@ -53,5 +52,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index c88ab0e70760daac2d61ba7e481583ddb1ebfc46..fbd75e1e70371c4decb473b8fd2be79e14e924fb 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
        [Guid("6261e4b5-572a-4142-a2f9-1fe1a0c97097")]
        public interface IServerWebConfig {
                [DispId(1)]
@@ -49,5 +48,4 @@ namespace System.EnterpriseServices.Internal {
                        [MarshalAs(UnmanagedType.BStr)] string FileRootName,
                        [MarshalAs(UnmanagedType.BStr)] out string Error);
        }
-#endif
 }
index 62c55831a8f38c2799fee4a5d28bcbb0d680a048..ca7f96f2d6c51e285a51b75dc007b06c57c98049 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
        [Guid("E7F0F021-9201-47e4-94DA-1D1416DEC27A")]
        public interface ISoapClientImport {
                [DispId(1)]
@@ -43,5 +42,4 @@ namespace System.EnterpriseServices.Internal {
                        [MarshalAs(UnmanagedType.BStr)] string assemblyName,
                        [MarshalAs(UnmanagedType.BStr)] string typeName);
        }
-#endif
 }
index 0b457af5336056e7be8f5f51357171ef2941e28d..adcc8b4a75afb23389af8358e9c3ffa3b8be791e 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
        [Guid("1E7BA9F7-21DB-4482-929E-21BDE2DFE51C")]
        public interface ISoapServerTlb {
                [DispId(1)]
@@ -63,5 +62,4 @@ namespace System.EnterpriseServices.Internal {
                        [MarshalAs(UnmanagedType.BStr)] string assemblyName,
                        [MarshalAs(UnmanagedType.BStr)] string typeName);
        }
-#endif
 }
index 1e3ed0cb6bffd81e9b06db01db69dfbd38566915..300f6f595cbddaf41e2239a9f17da5f98fbe4f03 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
        [Guid("A31B6577-71D2-4344-AEDF-ADC1B0DC5347")]
        public interface ISoapServerVRoot {
                [DispId(1)]
@@ -69,5 +68,4 @@ namespace System.EnterpriseServices.Internal {
                        [MarshalAs(UnmanagedType.BStr)] out string baseUrl,
                        [MarshalAs(UnmanagedType.BStr)] out string virtualRoot);
        }
-#endif
 }
index 7c10f881c3f92c33b532f13fc5b2dd9693d85e3c..64f1e76e7c8f47d1d93e8a960314bc0c30865b7c 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal {
 
-#if NET_1_1
        [Guid("5AC4CB7E-F89F-429b-926B-C7F940936BF4")]
        public interface ISoapUtility {
                [DispId(2)]
@@ -51,5 +50,4 @@ namespace System.EnterpriseServices.Internal {
                [DispId(3)]
                void Present ();
        }
-#endif
 }
index d6920fa6701793f1861ed015dc10326cd6afd341..73d41c10aed04a1a1f1c5210a4627452cc357815 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("d8013eef-730b-45e2-ba24-874b7242c425")]
        public class Publish : IComSoapPublisher {
 
@@ -125,5 +124,4 @@ namespace System.EnterpriseServices.Internal
                        throw new NotImplementedException ();
                }
        }
-#endif
 }
index 9745e3094d7ed0885bd140774e5200e28ac8deae..7292bc2d2b71db9a5cc3f0a69755a20e03d0626e 100644 (file)
@@ -30,7 +30,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        public class ServerWebConfig : IServerWebConfig {
 
                [MonoTODO]
@@ -52,5 +51,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index 456dcf07ccca1d63bb924a341967ddd434967dfb..5aa1050520bc7c4c035c08863f515591901d7ab7 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("346D5B9F-45E1-45c0-AADF-1B7D221E9063")]
        public sealed class SoapClientImport : ISoapClientImport {
 
@@ -49,5 +48,4 @@ namespace System.EnterpriseServices.Internal
 
 
        }
-#endif
 }
index c3677ce7ee3809513ffd33fc7e85f8e59ee19d0b..75bf6db77ef6cd728e4ce1276275b69b22b7a5ec 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("F6B6768F-F99E-4152-8ED2-0412F78517FB")]
        public sealed class SoapServerTlb : ISoapServerTlb {
 
@@ -54,5 +53,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index 5018df3acea19a90bb1a5f2fbb337f5798a807f7..a8c215f0d014b6ca46c5d8218f2e148bfd035bb2 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("CAA817CC-0C04-4d22-A05C-2B7E162F4E8F")]
        public sealed class SoapServerVRoot : ISoapServerVRoot {
 
@@ -61,5 +60,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index ba6eea9802aac16971695531ed62870f7fab2244..e3923889fa5b8360436e31529d8e0fc2b83807b8 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices.Internal
 {
-#if NET_1_1
        [Guid("5F9A955F-AA55-4127-A32B-33496AA8A44E")]
        public sealed class SoapUtility : ISoapUtility {
 
@@ -60,5 +59,4 @@ namespace System.EnterpriseServices.Internal
                }
 
        }
-#endif
 }
index e51b3fba474f5788b4800f087451521f1d563753..66d4c6f2d24b4fe8422a5f6dfca23203704af9eb 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [ComVisible(false)]\r
        public sealed class Activity {\r
 \r
@@ -73,5 +72,4 @@ namespace System.EnterpriseServices {
 \r
                #endregion\r
        }\r
-#endif\r
 }\r
index 93dc6818611ac481c0373922db3b1c4393f84bbf..709da2323df363b3ba76e16228e135d68e88d96c 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Serializable]\r
        [ComVisible(false)]\r
        public enum BindingOption {\r
@@ -39,5 +38,4 @@ namespace System.EnterpriseServices {
                NoBinding,\r
                BindingToPoolThread\r
        }\r
-#endif\r
 }\r
index 11bd5e2cbdd75c5e4b0f0994055144bf7adf4175..46d8797f96192906b90d3167d9f952f5cf5ec1f4 100644 (file)
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Guid("FE6777FB-A674-4177-8F32-6D707E113484")]\r
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]\r
-#if NET_2_0\r
        [ComImport]\r
-#endif\r
        public interface IAsyncErrorNotify {\r
 \r
                #region Methods\r
@@ -46,5 +43,4 @@ namespace System.EnterpriseServices {
 \r
                #endregion\r
        }\r
-#endif\r
 }\r
index 37ffcebfa87004c72bf59eb47c0c90d215ea07d4..dc536bcd7bf4bda5913c571eb260dcb1cea92762 100644 (file)
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Guid("51372AFD-CAE7-11CF-BE81-00AA00A2FA25")]\r
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]\r
-#if NET_2_0\r
        [ComImport]\r
-#endif\r
        public interface IPlaybackControl {\r
 \r
                #region Methods\r
@@ -47,5 +44,4 @@ namespace System.EnterpriseServices {
 \r
                #endregion\r
        }\r
-#endif\r
 }\r
index 221aaf14135e1c0c4bf6d724a62420902cd93a9d..d0bdc5df1b603901be9585914597062dc880ad6f 100644 (file)
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Guid("72380d55-8d2b-43a3-8513-2b6ef31434e9")]\r
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]\r
-#if NET_2_0\r
        [ComImport]\r
-#endif\r
        public interface IProcessInitControl {\r
 \r
                #region Methods\r
@@ -46,5 +43,4 @@ namespace System.EnterpriseServices {
 \r
                #endregion\r
        }\r
-#endif\r
 }\r
index fe32de0feff8d58dcdd4f8f751ee0c7c0bdbffcc..3491b64336f329bcab527acee880349841bce2ce 100644 (file)
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 
 namespace System.EnterpriseServices {
 
-#if NET_1_1
        [Guid("1113f52d-dc7f-4943-aed6-88d04027e32a")]
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-#if NET_2_0
        [ComImport]
-#endif
        public interface IProcessInitializer {
 
                #region Methods
@@ -47,5 +44,4 @@ namespace System.EnterpriseServices {
 
                #endregion
        }
-#endif
 }
index b3895406f505a242b682d8f40b59a65e64c801e1..447588a1c92987d5431f01d4879bf9d524027ae8 100644 (file)
@@ -32,12 +32,9 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Guid("BD3E2E12-42DD-40f4-A09A-95A50C58304B")]\r
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]\r
-#if NET_2_0\r
        [ComImport]\r
-#endif\r
        public interface IServiceCall {\r
 \r
                #region Methods\r
@@ -46,5 +43,4 @@ namespace System.EnterpriseServices {
 \r
                #endregion\r
        }\r
-#endif\r
 }\r
index 478554c82357ae1a838fe902c5ab16057c5d7404..7cadf861662291954c79ee842caa2d75a8d82063 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Serializable]\r
        [ComVisible(false)]\r
        public enum InheritanceOption {\r
@@ -39,5 +38,4 @@ namespace System.EnterpriseServices {
                Inherit,\r
                Ignore\r
        }\r
-#endif\r
 }\r
index f3ac104e39f04d72448c3d8f2b6f4f4520f548c8..8ea16469cf28301af0f9b62923330a8f2a3f95b8 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Serializable]\r
        [ComVisible(false)]\r
        public enum PartitionOption {\r
@@ -40,5 +39,4 @@ namespace System.EnterpriseServices {
                Inherit,\r
                New\r
        }\r
-#endif\r
 }\r
index e35406207e40e1bfaa421398b4a2818177801281..8a1d1c1bf00bfb1432c18a77222a4ae252f150d1 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Serializable]\r
        [Guid("36dcda30-dc3b-4d93-be42-90b2d74c64e7")]\r
        public class RegistrationConfig {\r
@@ -110,5 +109,4 @@ namespace System.EnterpriseServices {
 \r
                #endregion\r
        }\r
-#endif\r
 }\r
index 0750fe0ce3657075dc00c6f0edf0008b61ce308a..860ffa48834af25d3d2548d76ca13a0d5ef380c3 100644 (file)
@@ -59,13 +59,11 @@ namespace System.EnterpriseServices {
                        throw new NotImplementedException ();
                }
 
-#if NET_1_1
                [MonoTODO]
                public void InstallAssemblyFromConfig ([MarshalAs(UnmanagedType.IUnknown)] ref RegistrationConfig regConfig)
                {
                        throw new NotImplementedException ();
                }
-#endif
 
                public void UninstallAssembly (string assembly, string application)
                {
@@ -78,13 +76,11 @@ namespace System.EnterpriseServices {
                        throw new NotImplementedException ();
                }
 
-#if NET_1_1
                [MonoTODO]
                public void UninstallAssemblyFromConfig ([MarshalAs(UnmanagedType.IUnknown)] ref RegistrationConfig regConfig)
                {
                        throw new NotImplementedException ();
                }
-#endif
 
                #endregion // Methods
        }
index a1fe576b1a6cf5e9ccd8e25491e96512728fce8c..70fd1cdb808c4feb98b6c5c47e8f94bbd52eecf0 100644 (file)
@@ -70,13 +70,11 @@ namespace System.EnterpriseServices {
                        throw new NotImplementedException ();
                }
 
-#if NET_1_1
                [MonoTODO]
                public void InstallAssemblyFromConfig ([MarshalAs(UnmanagedType.IUnknown)] ref RegistrationConfig regConfig, object sync)
                {
                        throw new NotImplementedException ();
                }
-#endif
 
                [MonoTODO]
                public bool IsInTransaction ()
@@ -95,13 +93,11 @@ namespace System.EnterpriseServices {
                        throw new NotImplementedException ();
                }
 
-#if NET_1_1
                [MonoTODO]
                public void UninstallAssemblyFromConfig ([MarshalAs(UnmanagedType.IUnknown)] ref RegistrationConfig regConfig, object sync)
                {
                        throw new NotImplementedException ();
                }
-#endif
 
                #endregion // Methods
        }
index 02a440252b3de48b9e7c833b9eae2a008f77d105..1dc83a10a329213747b8d53a0bd283d2fe25c0a4 100644 (file)
@@ -34,7 +34,6 @@ using System.Transactions;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [MonoTODO]\r
        [ComVisible(false)]\r
        public sealed class ServiceConfig {\r
@@ -265,5 +264,4 @@ namespace System.EnterpriseServices {
 \r
                #endregion\r
        }\r
-#endif\r
 }\r
index 7330cb65a501fd626dd114eeac036c569df3606a..6cd57c7a9e9a04d062ece09325f91746bcdc220b 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Serializable]\r
        [ComVisible(false)]\r
        public enum SxsOption {\r
@@ -40,5 +39,4 @@ namespace System.EnterpriseServices {
                Inherit,\r
                New\r
        }\r
-#endif\r
 }\r
index 065150db64836e340a017c7707c595db16495389..f7d430b3600b22b2335dd11e5c1452eef8c10c91 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Serializable]\r
        [ComVisible(false)]\r
        public enum ThreadPoolOption {\r
@@ -41,5 +40,4 @@ namespace System.EnterpriseServices {
                STA,\r
                MTA\r
        }\r
-#endif\r
 }\r
index 2f403ec55f382a6908ac05d7ee1c1c3dbfc6b5d3..ea80895d96f73db33f8d0d8eee1bc3930fb4afae 100644 (file)
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
 \r
 namespace System.EnterpriseServices {\r
 \r
-#if NET_1_1\r
        [Serializable]\r
        [ComVisible(false)]\r
        public enum TransactionStatus {\r
@@ -42,5 +41,4 @@ namespace System.EnterpriseServices {
                Aborting,\r
                Aborted\r
        }\r
-#endif\r
 }\r
index ee74384c1fee35b00544eba967be92a197b8a503..7b3a6b0a9d4fcaf2aeb0ca0ad2b98d8b3cb13a3b 100644 (file)
@@ -60,15 +60,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-       [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-#elif NET_1_1 || NET_1_0
-       [assembly: AssemblyTitle ("System.Management")]
-       [assembly: AssemblyDescription ("This assembly contains the classes necessary to access management information from managed code")]
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-       [assembly: AssemblyKeyName ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
index 89e69f75f7675dc6dbd5106dbc1f7748daa6c036..7acff868a0fd222803c83ac12a522fa3b3b4de0d 100644 (file)
@@ -57,15 +57,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-       [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-#elif NET_1_1
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-#elif NET_1_0
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
index 04c6aa84930bcee93a18c7afa43628aabc477c21..b61844f8f3342009ceb25a816f26eb10a30faee6 100644 (file)
@@ -61,16 +61,10 @@ using System.Runtime.InteropServices;
        [assembly: AssemblyKeyFile("../ecma.pub")]
 #endif
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: CLSCompliant (false)]
-       [assembly: ComVisible (false)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-       [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-       [assembly: TypeLibVersion (2, 0)]
-#elif NET_1_1
-       [assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
-       [assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CLSCompliant (false)]
+[assembly: ComVisible (false)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
+[assembly: TypeLibVersion (2, 0)]
index 64482b84f2e4b06c58919d014e9c86b48059614c..cb232dc6e32c9852d04cd750540b9fcb99372b73 100644 (file)
@@ -38,11 +38,7 @@ namespace System.Runtime.Remoting.Channels
                IClientChannelSinkProvider next = null;
                BinaryCore _binaryCore;
 
-#if NET_1_1
                static string[] allowedProperties = new string [] { "includeVersions", "strictBinding", "typeFilterLevel" };
-#else
-               static string[] allowedProperties = new string [] { "includeVersions", "strictBinding" };
-#endif
 
                public BinaryClientFormatterSinkProvider ()
                {
index 8cc9a39b14f484be31b724475f20c2db37408421..7da3a54c3cef1d991e171f38694dd0c5c46410bc 100644 (file)
@@ -43,9 +43,7 @@ namespace System.Runtime.Remoting.Channels
                bool _strictBinding = false;
                IDictionary _properties;
                
-#if NET_1_1
                TypeFilterLevel _filterLevel = TypeFilterLevel.Low;
-#endif
                
                public static BinaryCore DefaultInstance = new BinaryCore ();
                
@@ -74,7 +72,6 @@ namespace System.Runtime.Remoting.Channels
                                                _strictBinding = Convert.ToBoolean (property.Value);
                                                break;
                                                
-#if NET_1_1
                                        case "typeFilterLevel":
                                                if (property.Value is TypeFilterLevel)
                                                        _filterLevel = (TypeFilterLevel) property.Value;
@@ -83,7 +80,6 @@ namespace System.Runtime.Remoting.Channels
                                                        _filterLevel = (TypeFilterLevel) Enum.Parse (typeof(TypeFilterLevel), s);
                                                }
                                                break;
-#endif
                                                
                                }
                        }
@@ -110,10 +106,8 @@ namespace System.Runtime.Remoting.Channels
                        _deserializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (null, context, false);
 #endif
                        
-#if NET_1_1
                        _serializationFormatter.FilterLevel = _filterLevel;
                        _deserializationFormatter.FilterLevel = _filterLevel;
-#endif
                        
                        if (!_includeVersions)
                        {
@@ -143,12 +137,10 @@ namespace System.Runtime.Remoting.Channels
                        get { return _properties; }
                }
                
-#if NET_1_1
                public TypeFilterLevel TypeFilterLevel
                {
                        get { return _filterLevel; }
                }
-#endif
        }
 }
 
index 09c2b7f8eaccf0fe6eabd1944140c3ff2769b89c..f9031a7dd8feecf1e1d931789a9af800a36763a6 100644 (file)
@@ -80,7 +80,6 @@ namespace System.Runtime.Remoting.Channels {
                        }
                }
 
-#if NET_1_1
                [ComVisible(false)]
                public TypeFilterLevel TypeFilterLevel
                {
@@ -92,7 +91,6 @@ namespace System.Runtime.Remoting.Channels {
                                _binaryCore = new BinaryCore (this, props, BinaryServerFormatterSinkProvider.AllowedProperties);
                        }
                }
-#endif
 
                public void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,
                                                  IMessage msg, ITransportHeaders headers, Stream stream)
index 3f77fd3aa277e33bcaab5cbd2dfa28ed9358f110..b4c3b0537f7aca0ef1f9981aa126908be11a5d66 100644 (file)
@@ -68,7 +68,6 @@ namespace System.Runtime.Remoting.Channels
                        }
                }
 
-#if NET_1_1
                [ComVisible(false)]
                public TypeFilterLevel TypeFilterLevel
                {
@@ -80,7 +79,6 @@ namespace System.Runtime.Remoting.Channels
                                _binaryCore = new BinaryCore (this, props, AllowedProperties);
                        }
                }
-#endif
 
                public IServerChannelSink CreateSink (IChannelReceiver channel)
                {
index 7fcbf261dfe1643f766be1665cbfbd9a5d6fdcd8..3480f3dfa40d849ef312bbbea24619ad966b3012 100644 (file)
@@ -43,9 +43,7 @@ namespace System.Runtime.Remoting.Channels
                bool _strictBinding = false;
                IDictionary _properties;
                
-#if NET_1_1
                TypeFilterLevel _filterLevel = TypeFilterLevel.Low;
-#endif
 
                public static SoapCore DefaultInstance = new SoapCore ();
                
@@ -73,7 +71,6 @@ namespace System.Runtime.Remoting.Channels
                                        case "strictBinding":
                                                _strictBinding = Convert.ToBoolean (property.Value);
                                                break;
-#if NET_1_1
                                        case "typeFilterLevel":
                                                if (property.Value is TypeFilterLevel)
                                                        _filterLevel = (TypeFilterLevel) property.Value;
@@ -82,7 +79,6 @@ namespace System.Runtime.Remoting.Channels
                                                        _filterLevel = (TypeFilterLevel) Enum.Parse (typeof(TypeFilterLevel), s);
                                                }
                                                break;
-#endif
                                }
                        }
                        
@@ -103,10 +99,8 @@ namespace System.Runtime.Remoting.Channels
                        _serializationFormatter = CreateFormatter (surrogateSelector, context);
                        _deserializationFormatter = CreateFormatter (null, context);
 
-#if NET_1_1
                        _serializationFormatter.FilterLevel = _filterLevel;
                        _deserializationFormatter.FilterLevel = _filterLevel;
-#endif
                }
                
                SoapFormatter CreateFormatter (ISurrogateSelector selector, StreamingContext context)
@@ -143,12 +137,10 @@ namespace System.Runtime.Remoting.Channels
                        get { return _properties; }
                }
                
-#if NET_1_1
                public TypeFilterLevel TypeFilterLevel
                {
                        get { return _filterLevel; }
                }
-#endif
        }
 }
 
index 841bcea566d37f1b0c8a4a6241c702f615c36cfd..d818bca48c7d190ac2309ed9459ba150728e93dc 100644 (file)
@@ -86,7 +86,6 @@ namespace System.Runtime.Remoting.Channels {
                        }\r
                }\r
 \r
-#if NET_1_1\r
                [ComVisible(false)]\r
                public TypeFilterLevel TypeFilterLevel\r
                {\r
@@ -98,7 +97,6 @@ namespace System.Runtime.Remoting.Channels {
                                _soapCore = new SoapCore (this, props, SoapServerFormatterSinkProvider.AllowedProperties);\r
                        }\r
                }\r
-#endif\r
 \r
                public void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,\r
                                                  IMessage msg, ITransportHeaders headers, Stream stream)\r
index b0b164d98c02818a360b42167651c56ac1bdbfea..a0f9ef4a389c653eb5940daacad113fd47f0d9ea 100644 (file)
@@ -64,7 +64,6 @@ namespace System.Runtime.Remoting.Channels
                        set { _next = value; }\r
                }\r
 \r
-#if NET_1_1\r
                [ComVisible(false)]\r
                public TypeFilterLevel TypeFilterLevel\r
                {\r
@@ -76,7 +75,6 @@ namespace System.Runtime.Remoting.Channels
                                _soapCore = new SoapCore (this, props, AllowedProperties);\r
                        }\r
                }\r
-#endif\r
 \r
                public IServerChannelSink CreateSink (IChannelReceiver channel)\r
                {\r
index d6f66de4daf39f3612df85eb4dd57fa7ed1f8eac..8fd2335c79255f98c69aae01de54f9c66234e771 100644 (file)
@@ -52,9 +52,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                private FormatterTypeStyle _typeFormat = FormatterTypeStyle.TypesWhenNeeded;\r
                private ISoapMessage _topObject = null;\r
                \r
-#if NET_1_1\r
                TypeFilterLevel _filterLevel = TypeFilterLevel.Low;\r
-#endif\r
 \r
                public SoapFormatter() {\r
                        _selector = null;\r
@@ -146,11 +144,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        }\r
                }\r
                \r
-#if NET_1_1\r
                [MonoTODO ("Interpret this")]\r
-#if ONLY_1_1\r
-               [ComVisible(false)]\r
-#endif\r
                public TypeFilterLevel FilterLevel {\r
                        get {\r
                                return _filterLevel;\r
@@ -159,7 +153,6 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                                _filterLevel = value;\r
                        }\r
                }\r
-#endif\r
                \r
                public FormatterAssemblyStyle AssemblyFormat\r
                {\r
index c0aaaa2e76fe75c49948412a04157ebe091fe8f6..8293e1d4f99168dd43fc2bbbb86548d640dedb99 100644 (file)
@@ -38,10 +38,7 @@ using System.Security.Policy;
 using System.Net;
 using System.Text;
 using System.Xml;
-
-#if NET_2_0
 using System.Security.Cryptography.X509Certificates;
-#endif
 
 namespace System.Security.Cryptography.Xml {
 
@@ -56,7 +53,6 @@ namespace System.Security.Cryptography.Xml {
                public const string XmlDsigRSASHA1Url                           = XmlDsigNamespaceUrl + "rsa-sha1";
                public const string XmlDsigSHA1Url                              = XmlDsigNamespaceUrl + "sha1";
 
-#if NET_2_0
                public const string XmlDecryptionTransformUrl                   = "http://www.w3.org/2002/07/decrypt#XML";
                public const string XmlDsigBase64TransformUrl                   = XmlDsigNamespaceUrl + "base64";
                public const string XmlDsigC14NTransformUrl                     = XmlDsigCanonicalizationUrl;
@@ -69,7 +65,6 @@ namespace System.Security.Cryptography.Xml {
                public const string XmlLicenseTransformUrl                      = "urn:mpeg:mpeg21:2003:01-REL-R-NS:licenseTransform";
 
                private EncryptedXml encryptedXml;
-#endif
 
                protected Signature m_signature;
                private AsymmetricAlgorithm key;
@@ -79,15 +74,9 @@ namespace System.Security.Cryptography.Xml {
                private XmlElement signatureElement;
                private Hashtable hashes;
                // FIXME: enable it after CAS implementation
-#if false //NET_1_1
-               private XmlResolver xmlResolver = new XmlSecureResolver (new XmlUrlResolver (), new Evidence ());
-#else
                private XmlResolver xmlResolver = new XmlUrlResolver ();
-#endif
                private ArrayList manifests;
-#if NET_2_0
                private IEnumerator _x509Enumerator;
-#endif
 
                private static readonly char [] whitespaceChars = new char [] {' ', '\r', '\n', '\t'};
 
@@ -113,20 +102,16 @@ namespace System.Security.Cryptography.Xml {
                        envdoc.LoadXml (elem.OuterXml);
                }
 
-#if NET_2_0
                [ComVisible (false)]
                public EncryptedXml EncryptedXml {
                        get { return encryptedXml; }
                        set { encryptedXml = value; }
                }
-#endif
 
                public KeyInfo KeyInfo {
                        get {
-#if NET_2_0
                                if (m_signature.KeyInfo == null)
                                        m_signature.KeyInfo = new KeyInfo ();
-#endif
                                return m_signature.KeyInfo;
                        }
                        set { m_signature.KeyInfo = value; }
@@ -170,10 +155,8 @@ namespace System.Security.Cryptography.Xml {
 
                public void AddReference (Reference reference) 
                {
-#if NET_2_0
                        if (reference == null)
                                throw new ArgumentNullException ("reference");
-#endif
                        m_signature.SignedInfo.AddReference (reference);
                }
 
@@ -183,9 +166,7 @@ namespace System.Security.Cryptography.Xml {
                        // not affect to the input itself.
                        if (t is XmlDsigXPathTransform 
                                || t is XmlDsigEnvelopedSignatureTransform
-#if NET_2_0
                                || t is XmlDecryptionTransform
-#endif
                        )
                                input = (XmlDocument) input.Clone ();
 
@@ -503,13 +484,8 @@ namespace System.Security.Cryptography.Xml {
                                if (!CheckSignatureWithKey (key))
                                        return null;
                        } else {
-#if NET_2_0
                                if (Signature.KeyInfo == null)
                                        return null;
-#else
-                               if (Signature.KeyInfo == null)
-                                       throw new CryptographicException ("At least one KeyInfo is required.");
-#endif
                                // no supplied key, iterates all KeyInfo
                                while ((key = GetPublicKey ()) != null) {
                                        if (CheckSignatureWithKey (key)) {
@@ -633,14 +609,12 @@ namespace System.Security.Cryptography.Xml {
                        return false;
                }
 
-#if NET_2_0
                [MonoTODO]
                [ComVisible (false)]
                public bool CheckSignature (X509Certificate2 certificate, bool verifySignatureOnly)
                {
                        throw new NotImplementedException ();
                }
-#endif
 
                public bool CheckSignatureReturningKey (out AsymmetricAlgorithm signingKey) 
                {
@@ -689,7 +663,6 @@ namespace System.Security.Cryptography.Xml {
 
                        if (macAlg is HMACSHA1) {
                                method = XmlDsigHMACSHA1Url;
-#if NET_2_0
                        } else if (macAlg is HMACSHA256) {
                                method = "http://www.w3.org/2001/04/xmldsig-more#hmac-sha256";
                        } else if (macAlg is HMACSHA384) {
@@ -698,7 +671,6 @@ namespace System.Security.Cryptography.Xml {
                                method = "http://www.w3.org/2001/04/xmldsig-more#hmac-sha512";
                        } else if (macAlg is HMACRIPEMD160) {
                                method = "http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160";
-#endif
                        }
 
                        if (method == null)
@@ -734,7 +706,7 @@ namespace System.Security.Cryptography.Xml {
                                pkEnumerator = m_signature.KeyInfo.GetEnumerator ();
                        }
                        
-#if NET_2_0 && SECURITY_DEP
+#if SECURITY_DEP
                        if (_x509Enumerator != null) {
                                if (_x509Enumerator.MoveNext ()) {
                                        X509Certificate cert = (X509Certificate) _x509Enumerator.Current;
@@ -758,7 +730,7 @@ namespace System.Security.Cryptography.Xml {
                                        return key;
                                }
 
-#if NET_2_0 && SECURITY_DEP
+#if SECURITY_DEP
                                if (kic is KeyInfoX509Data) {
                                        _x509Enumerator = ((KeyInfoX509Data) kic).Certificates.GetEnumerator ();
                                        if (_x509Enumerator.MoveNext ()) {
@@ -783,7 +755,6 @@ namespace System.Security.Cryptography.Xml {
 
                        signatureElement = value;
                        m_signature.LoadXml (value);
-#if NET_2_0
                        // Need to give the EncryptedXml object to the 
                        // XmlDecryptionTransform to give it a fighting 
                        // chance at decrypting the document.
@@ -793,14 +764,11 @@ namespace System.Security.Cryptography.Xml {
                                                ((XmlDecryptionTransform) t).EncryptedXml = EncryptedXml;
                                }
                        }
-#endif
                }
 
-#if NET_1_1
                [ComVisible (false)]
                public XmlResolver Resolver {
                        set { xmlResolver = value; }
                }
-#endif
        }
 }
index bfa9b6b7630d4ae2d2754e2a87e7a4abaa330f65..80c8923e99dcd77e72ec8b9d3485d71bdfd5a404 100644 (file)
@@ -45,11 +45,7 @@ namespace System.Security.Cryptography.Xml {
                private XmlResolver xmlResolver;
                private Hashtable propagated_namespaces = new Hashtable ();
 
-#if NET_2_0
                protected Transform ()
-#else
-               public Transform ()
-#endif
                {
                        if (SecurityManager.SecurityEnabled) {
                                xmlResolver = new XmlSecureResolver (new XmlUrlResolver (), (Evidence) new Evidence ());
@@ -73,43 +69,32 @@ namespace System.Security.Cryptography.Xml {
                        get;
                }
 
-#if NET_1_1
                [ComVisible(false)]
                public XmlResolver Resolver {
                        set { xmlResolver = value; }
                }
-#endif
 
-#if NET_2_0
                [MonoTODO]
                [ComVisible (false)]
                public XmlElement Context {
                        get { throw new NotImplementedException (); }
                        set { throw new NotImplementedException (); }
                }
-#endif
 
                [ComVisible (false)]
-#if NET_2_0
-               public
-#else
-               internal
-#endif
-               Hashtable PropagatedNamespaces {
+               public Hashtable PropagatedNamespaces {
                        get { return propagated_namespaces; }
                }
 
                #endregion // Properties
 
                #region Methods
-#if NET_2_0
                [ComVisible (false)]
                public virtual byte[] GetDigestedOutput (HashAlgorithm hash)
                {
                        // no null check, MS throws a NullReferenceException here
                        return hash.ComputeHash ((Stream) GetOutput (typeof (Stream)));
                }
-#endif
 
                protected abstract XmlNodeList GetInnerXml ();
 
index 935980a75571437a1dcf906965c042352addf339..1a78700c57b83c9b5647df3c6d773f357b59710a 100644 (file)
@@ -121,9 +121,7 @@ namespace System.Security.Cryptography.Xml {
                        if (stream != null) {
                                XmlDocument doc = new XmlDocument ();
                                doc.PreserveWhitespace = true;  // REALLY IMPORTANT
-#if NET_1_1
                                doc.XmlResolver = GetResolver ();
-#endif
                                doc.Load (new XmlSignatureStreamReader (new StreamReader (stream)));
 //                             doc.Load ((Stream) obj);
                                s = canonicalizer.Canonicalize (doc);
index 137d5c269b7663b67efa64a773cd873f47272682..80f3c0db0c3a2df59e144216678f12fc5ca99411 100644 (file)
@@ -95,9 +95,7 @@ namespace System.Security.Cryptography.Xml {
                        if (inputObj is Stream) {
                                doc = new XmlDocument ();
                                doc.PreserveWhitespace = true;
-#if NET_1_1
                                doc.XmlResolver = GetResolver ();
-#endif
                                doc.Load (new XmlSignatureStreamReader (
                                        new StreamReader (inputObj as Stream)));
                                return GetOutputFromNode (doc, GetNamespaceManager (doc), true);
index c8c777df804a1f8f760c39584f2218b28dc1b91a..b8a432c58d6572f07bdc6122dd7af700a3291ebf 100644 (file)
@@ -140,9 +140,7 @@ namespace System.Security.Cryptography.Xml {
                        if (stream != null) {
                                XmlDocument doc = new XmlDocument ();
                                doc.PreserveWhitespace = true;  // REALLY IMPORTANT
-#if NET_1_1
                                doc.XmlResolver = GetResolver ();
-#endif
                                doc.Load (new XmlSignatureStreamReader (new StreamReader (stream)));
 //                             doc.Load ((Stream) obj);
                                s = canonicalizer.Canonicalize (doc);
index 185e8b3dcd442fc7045ac16025338b3b953effc0..654385ae1428b8291c7d5f5b4f5c90930cd8a453 100644 (file)
@@ -190,9 +190,7 @@ namespace System.Security.Cryptography.Xml
                        if (obj is Stream) {
                                doc = new XmlDocument ();
                                doc.PreserveWhitespace = true;
-#if NET_1_1
                                doc.XmlResolver = GetResolver ();
-#endif
                                doc.Load (new XmlSignatureStreamReader (
                                        new StreamReader ((Stream) obj)));
                        }
@@ -201,9 +199,7 @@ namespace System.Security.Cryptography.Xml
                        }
                        else if (obj is XmlNodeList) {
                                doc = new XmlDocument ();
-#if NET_1_1
                                doc.XmlResolver = GetResolver ();
-#endif
                                foreach (XmlNode xn in (obj as XmlNodeList))  {
                                        XmlNode importedNode = doc.ImportNode (xn, true);
                                        doc.AppendChild (importedNode);
index 2bf7e416ddef3203842f8c1649cb56449acdb403..d039bf16730b0ec0dfde53f6aeb7d047353e9c5e 100644 (file)
@@ -87,37 +87,24 @@ namespace System.Security.Cryptography.Xml
 
                public override object GetOutput () 
                {
-#if NET_2_0
                        if (xnl == null)
                                throw new ArgumentNullException ("LoadInnerXml before transformation.");
-#endif
+
                        XmlResolver resolver = GetResolver ();
 
                        XslTransform xsl = new XslTransform ();
                        XmlDocument doc = new XmlDocument ();
-#if NET_1_1
                        doc.XmlResolver = resolver;
-#endif
                        foreach (XmlNode n in xnl)
                                doc.AppendChild (doc.ImportNode (n, true));
-#if NET_1_1
                        xsl.Load (doc, resolver);
-#else
-                       xsl.Load (doc);
-#endif
 
                        if (inputDoc == null)
-#if NET_2_0
                                throw new ArgumentNullException ("LoadInput before transformation.");
-#else
-                               throw new NullReferenceException ("LoadInput before transformation.");
-#endif
 
                        MemoryStream stream = new MemoryStream ();
                        // only possible output: Stream
-#if NET_1_1
                        xsl.XmlResolver = resolver;
-#endif
                        xsl.Transform (inputDoc, null, stream);
 
                        stream.Seek (0, SeekOrigin.Begin);
@@ -144,9 +131,7 @@ namespace System.Security.Cryptography.Xml
                        Stream s = (obj as Stream);
                        if (s != null) {
                                inputDoc = new XmlDocument ();
-#if NET_1_1
                                inputDoc.XmlResolver = GetResolver ();
-#endif
 //                             inputDoc.Load (obj as Stream);
                                inputDoc.Load (new XmlSignatureStreamReader (new StreamReader (s)));
                                return;
@@ -161,9 +146,7 @@ namespace System.Security.Cryptography.Xml
                        XmlNodeList nl = (obj as XmlNodeList);
                        if (nl != null) {
                                inputDoc = new XmlDocument ();
-#if NET_1_1
                                inputDoc.XmlResolver = GetResolver ();
-#endif
                                for (int i = 0; i < nl.Count; i++)
                                        inputDoc.AppendChild (inputDoc.ImportNode (nl [i], true));
                        }
index 589cdbc52045e5bdf632629f6fc8cf0f8c4d9eb8..140bdc7b589c0cc2734e373838166c14abdfe657 100644 (file)
@@ -86,15 +86,7 @@ namespace MonoTests.System.Security.Cryptography.Xml {
                        KeyInfoRetrievalMethod uri1 = new KeyInfoRetrievalMethod ();
                        // no exception is thrown
                        uri1.LoadXml (doc.DocumentElement);
-#if NET_2_0
                        AssertCrypto.AssertXmlEquals ("invalid", "<RetrievalMethod xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", (uri1.GetXml ().OuterXml));
-#elif NET_1_1
-                       // note that URI="" is present (unlike a empty Uri)
-                       Assert.AreEqual ("<RetrievalMethod URI=\"\" xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", (uri1.GetXml ().OuterXml), "invalid");
-#else
-                       // Fx 1.0 misnamed the tag name
-                       Assert.AreEqual ("<RetrievalElement URI=\"\" xmlns=\"http://www.w3.org/2000/09/xmldsig#\" />", (uri1.GetXml ().OuterXml), "invalid");
-#endif
                }
        }
 }
index 8ddba56c7e1daceefede0f79694f7062c33980e7..816df3e9809e04c12d24f1caa25b01667a21215d 100644 (file)
@@ -153,19 +153,12 @@ namespace MonoTests.System.Security.Cryptography.Xml {
                        transform.LoadInput (doc);
                        Stream s = (Stream) transform.GetOutput ();
                        string output = Stream2String (s);
-#if NET_1_1
                        Assert.AreEqual (c14xml3, output, "XmlDocument");
-#else
-                       // .NET 1.0 keeps the \r\n (0x0D, 0x0A) - bug
-                       Assert.AreEqual (c14xml1, output, "XmlDocument");
-#endif
                }
 
                [Test]
-#if NET_2_0
                [Category ("NotDotNet")]
                // see LoadInputAsXmlNodeList2 description
-#endif
                public void LoadInputAsXmlNodeList () 
                {
                        XmlDocument doc = GetDoc ();
@@ -205,11 +198,7 @@ namespace MonoTests.System.Security.Cryptography.Xml {
                }
 
                [Test]
-#if NET_2_0
                [ExpectedException (typeof (ArgumentException))]
-#else
-               // LAMESPEC: input MUST be one of InputType - but no exception is thrown (not documented)
-#endif
                public void LoadInputWithUnsupportedType () 
                {
                        byte[] bad = { 0xBA, 0xD };
index bd70d9b2b60fd47680ff31536e1d15aba2748ee3..50fb9ba480fecf583c3932a1a4df30bdcff84b66 100644 (file)
@@ -248,19 +248,12 @@ namespace MonoTests.System.Security.Cryptography.Xml {
                        transform.LoadInput (doc);
                        Stream s = (Stream) transform.GetOutput ();
                        string output = Stream2String (s);
-#if NET_1_1
                        Assert.AreEqual (c14xml3, output, "XmlDocument");
-#else
-                       // .NET 1.0 keeps the \r\n (0x0D, 0x0A) - bug
-                       Assert.AreEqual (c14xml1, output, "XmlDocument");
-#endif
                }
 
                [Test]
-#if NET_2_0
                [Category ("NotDotNet")]
                // see LoadInputAsXmlNodeList2 description
-#endif
                public void LoadInputAsXmlNodeList () 
                {
                        XmlDocument doc = GetDoc ();
index a059752f8df4fa4d1b4214da80c11a18a50c13be..2d311a07aaf1880c9fd3c8e343cf1ffd0ea7b7bd 100644 (file)
@@ -56,11 +56,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-#elif (NET_1_1 || NET_1_0)
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
index 5d6c200642681b363750d099fb14a0df67838b46..aaeb69ebc5f43e705f86c39cfa4802edd099dce7 100644 (file)
@@ -60,14 +60,6 @@ using System.Runtime.InteropServices;
        [assembly: AssemblyKeyFile("../msfinal.pub")]
 #endif
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-#elif NET_1_1
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-#elif NET_1_0
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
index e9cb549316c9beabaed5ff269dc4bf6e8728812b..e642a6202ddd3494a99b7c06912adf8b042b48b5 100644 (file)
@@ -42,11 +42,9 @@ namespace System.Web.Services.Configuration
                HttpPost = 1 << 1,
                HttpGet =  1 << 2,
                Documentation = 1 << 3,
-#if NET_1_1
                HttpSoap12 = 1 << 4,
                HttpPostLocalhost = 1 << 5,
                AnyHttpSoap = HttpSoap | HttpSoap12,
-#endif
                All = 0xFF
        }
        
index 22d9ca7f3b69cf4a5848e02362c469e030d6ca11..2125fbcb239f02c8ae03d56d6999e5e059139f39 100644 (file)
@@ -104,7 +104,6 @@ namespace System.Web.Services.Description {
                        set { use = value; }
                }
 
-#if NET_1_1
                [MonoTODO]
                [XmlElement ("headerfault")]
                public SoapHeaderFaultBinding Fault 
@@ -112,7 +111,6 @@ namespace System.Web.Services.Description {
                        get { return null; }
                        set { ; }
                }
-#endif
 
                #endregion // Properties
        }
index 2b653064d915935f7f5a299d354c66007746f695..78c1da0bf7b721fba4c5f718575ad61c2db67a59 100644 (file)
@@ -50,9 +50,7 @@ namespace System.Web.Services.Protocols {
                IWebProxy proxy;
                string userAgent;
                
-#if NET_1_1
                bool _unsafeAuthenticated;
-#endif
                #endregion
 
                #region Constructors
@@ -111,26 +109,20 @@ namespace System.Web.Services.Protocols {
                }
 
                [WebServicesDescription ("Sets the user agent http header for the request.")]
-#if NET_2_0
                [Browsable (false)]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-#endif
                public string UserAgent {
                        get { return userAgent; }
                        set { userAgent = value; }
                }
                
-#if NET_1_1
-#if NET_2_0
                [Browsable (false)]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-#endif
                public bool UnsafeAuthenticatedConnectionSharing
                {
                        get { return _unsafeAuthenticated; }
                        set { _unsafeAuthenticated = value; }
                }
-#endif
 
                #endregion // Properties
 
@@ -162,10 +154,8 @@ namespace System.Web.Services.Protocols {
                        HttpWebRequest request = req as HttpWebRequest;
                        if (request == null)
                                return req;
-#if NET_2_0
                        if (enableDecompression)
                                request.AutomaticDecompression = DecompressionMethods.GZip;
-#endif
 
                        request.AllowAutoRedirect = allowAutoRedirect;
                        if (clientCertificates != null)
@@ -177,10 +167,6 @@ namespace System.Web.Services.Protocols {
 
                        request.UserAgent = userAgent;
 
-#if NET_1_1
-               //      request.UnsafeAuthenticatedConnectionSharing = _unsafeAuthenticated;
-#endif
-
                        return request;
                }
 
index 88719295f15b1e0f818b16d33ebf883efa36aa2c..2eb2aedf0bfd3299838ee7c7ed7047998d8a3509 100644 (file)
@@ -63,11 +63,9 @@ namespace System.Web.Services.Protocols {
                        set { memberName = value; }
                }
 
-#if NET_1_1
                [Obsolete ("This property will be removed from a future"
                        + " version. The presence of a particular header"
                        + " in a SOAP message is no longer enforced", false)]
-#endif
                public bool Required {
                        get { return required; }
                        set { required = value; }
index c21f8ff83a132a3cb59e0de9454029e6e0a5daee..23b2cd685bedad30605619022c7639c9cbc5913d 100644 (file)
@@ -34,8 +34,6 @@ namespace System.Web.Services.Protocols {
                In = 0x1,
                InOut = 0x3,
                Out = 0x2,
-#if NET_1_1
                Fault = 0x4
-#endif
        }
 }
index 038cd76137607d85f2362f0db161d838585cddd6..8fa269658ab8f7cc4b5378e887bdde20a692b325 100644 (file)
@@ -49,9 +49,7 @@ namespace System.Web.Services.Protocols {
                object[] inParameters;
                object[] outParameters;
                
-#if NET_2_0
                SoapProtocolVersion soapVersion;
-#endif
 
                #endregion // Fields
 
@@ -97,9 +95,7 @@ namespace System.Web.Services.Protocols {
 
                public SoapException Exception {
                        get { return exception; }
-#if NET_2_0
                        set { exception = value; }
-#endif
                }
 
                public SoapHeaderCollection Headers {
@@ -133,37 +129,23 @@ namespace System.Web.Services.Protocols {
                        get;
                }
                
-#if NET_1_1
                public string ContentEncoding
                {
                        get { return content_encoding; }
                        set { content_encoding = value; }
                }
-#else
-               internal string ContentEncoding
-               {
-                       get { return content_encoding; }
-                       set { content_encoding = value; }
-               }
-#endif
 
                internal bool IsSoap12 {
                        get {
-#if NET_2_0
                                return SoapVersion == SoapProtocolVersion.Soap12;
-#else
-                               return false;
-#endif
                        }
                }
 
-#if NET_2_0
                [System.Runtime.InteropServices.ComVisible(false)]
                [DefaultValue (SoapProtocolVersion.Default)]
                public virtual SoapProtocolVersion SoapVersion {
                        get { return soapVersion; }
                }
-#endif
  
                internal Stream InternalStream 
                { 
index e5d8db41cedc7a83071f13c2e50cd559cd90ccc8..f5f1a2d135350b0fffdb138ab6819e2159b922a7 100644 (file)
@@ -63,9 +63,7 @@ namespace System.Web.Mail
                        attachments = new ArrayList (8);
                        headers = new ListDictionary ();
                        bodyEncoding = Encoding.Default;
-#if NET_1_1
                        fields = new Hashtable ();
-#endif
                }               
        
                // Properties
@@ -132,7 +130,6 @@ namespace System.Web.Mail
                        set { urlContentLocation = value; }
                }
 
-#if NET_1_1
                Hashtable fields;
                
                public IDictionary Fields {
@@ -140,6 +137,5 @@ namespace System.Web.Mail
                                return (IDictionary) fields;
                        }
                }
-#endif
        }
 }
index b10fc8c57d424ffb024c042e33fac27b64621f50..3fe644e221f2cc0811a216d1031c0c2229a1ecac 100644 (file)
@@ -228,7 +228,6 @@ namespace System.Web.Mail {
            get { return message.UrlContentLocation; } 
        }
 
-#if NET_1_1
                public MailHeader Fields {
                        get {
                                        MailHeader bodyHeaders = new MailHeader();
@@ -240,6 +239,5 @@ namespace System.Web.Mail {
                        }
                        
                }
-#endif
     }   
 }
index 29f4325e9c7ee607aa02b4a10fad1ad44a7b1e5d..adbcf92aa5a533c5b82111b244445bd2cd50eafe 100644 (file)
@@ -223,7 +223,6 @@ namespace System.Web.Mail {
                        MailHeader partHeader = new MailHeader ();
                        partHeader.ContentType = bodyContentType;               
 
-#if NET_1_1
                        // Add all the custom headers to body part as specified in 
                        //Fields property of MailMessageWrapper
 
@@ -240,7 +239,6 @@ namespace System.Web.Mail {
                        if (msg.Fields.Data ["http://schemas.microsoft.com/cdo/configuration/sendpassword"] != null)
                                msg.Fields.Data.Remove ("http://schemas.microsoft.com/cdo/configuration/sendpassword");
                        partHeader.Data.Add (msg.Fields.Data);
-#endif
 
                        smtp.WriteHeader (partHeader);
          
index 70cc8d1cb084e5de90bb9fbbbe646c1f55747a60..fbdd25c624c6c6789a0cb961b8aaf32e3b8ac4b3 100644 (file)
@@ -67,7 +67,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                                base.Render (writer);
                                return writer.InnerWriter.ToString ();
                        }
-#if NET_2_0
                        protected override Style CreateControlStyle ()
                        {
                                Style s = new Style (new StateBag ());
@@ -104,7 +103,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                                base.RenderEndTag (writer);
                                return writer.InnerWriter.ToString ();
                        }
-#endif
                }
 
                class PokerR : Panel
@@ -118,7 +116,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                                base.Render (writer);
                                return writer.InnerWriter.ToString ();
                        }
-#if NET_2_0
+
                        public override void RenderBeginTag (HtmlTextWriter writer)
                        {
                                writer.Write ("RenderBeginTag");
@@ -128,26 +126,24 @@ namespace MonoTests.System.Web.UI.WebControls {
                        {
                                writer.Write ("RenderEndTag");
                        }
-#endif
                }
                #endregion
-#if NET_2_0
+
                [TestFixtureSetUp]
                public void SetUp ()
                {
                        WebTest.CopyResource (GetType (), "NoEventValidation.aspx", "NoEventValidation.aspx");
                }
-#endif
+
                [Test]
                public void Defaults ()
                {
                        Poker p = new Poker ();
-#if NET_2_0
+
                        Assert.AreEqual (ContentDirection.NotSet, p.Direction, "Direction"); 
                        Assert.AreEqual (string.Empty, p.GroupingText, "GroupingText");
                        Assert.AreEqual (ScrollBars.None, p.ScrollBars, "ScrollBars"); 
                        Assert.AreEqual (string.Empty, p.DefaultButton, "DefaultButton");
-#endif
                }
                
                [Test]
@@ -156,15 +152,10 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Poker p = new Poker ();
                        p.Wrap = false;
                        p.Controls.Add (new LiteralControl ("TEXT"));
-#if NET_2_0
                        const string html ="<div style=\"white-space:nowrap;\">\n\tTEXT\n</div>";
-#elif NET_1_1
-                       const string html ="<div nowrap=\"nowrap\">\n\tTEXT\n</div>";
-#endif
                        Assert.AreEqual (html, p.Render ());
                }
 
-#if NET_2_0
                [Test]
                public void CreateControlStyle ()
                {
@@ -289,7 +280,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        WebTest.Unload ();
                }
-#endif
        }
 }
 
index e9295b67241cec3a1c7a17c74d15a0a9f10a0403..7252b4b27a628e63895f948db2dd76fd7e2757a1 100644 (file)
@@ -45,7 +45,6 @@ namespace MonoTests.System.Web {
        [TestFixture]
        public class HttpRequestTest {
 
-#if NET_1_1
                [Test]
                [ExpectedException (typeof (HttpRequestValidationException))]
                public void ValidateInput_XSS ()
@@ -95,7 +94,6 @@ namespace MonoTests.System.Web {
                        // the next statement throws
                        Assert.AreEqual ("<SCRIPT>alert(document.cookie)</SCRIPT>", request.QueryString ["test"], "QueryString");
                }
-#endif
                //
                // Tests the properties from the simple constructor.
                [Test]
index e82ece5703bc8a0a27d186f8ab4e8ebeea041d7f..eccc9dbe634ec989d3e8165b51defcd52e606095 100644 (file)
@@ -732,7 +732,6 @@ namespace MonoTests.System.Web {
                        }
                }
 
-#if NET_1_1
                [Test]
                public void UrlPathEncode ()
                {
@@ -756,9 +755,7 @@ namespace MonoTests.System.Web {
                        Assert.AreEqual (s, s2, "UrlPathEncode " + s);
                }
 
-#endif
 
-#if NET_2_0
                [Test]
 #if TARGET_JVM
                [Ignore ("TD #6956")]
@@ -829,7 +826,7 @@ namespace MonoTests.System.Web {
                                        Assert.AreEqual (values [i] [q], tmp [q], msg + "[Value]");
                        }
                }
-#endif
+
                string [] decoding_pairs = {
        @"&aacute;&Aacute;&acirc;&Acirc;&acute;&aelig;&AElig;&agrave;&Agrave;&alefsym;&alpha;&Alpha;&amp;&and;&ang;&aring;&Aring;&asymp;&atilde;&Atilde;&auml;&Auml;&bdquo;&beta;&Beta;&brvbar;&bull;&cap;&ccedil;&Ccedil;&cedil;&cent;&chi;&Chi;&circ;&clubs;&cong;&copy;&crarr;&cup;&curren;&dagger;&Dagger;&darr;&dArr;&deg;&delta;&Delta;&diams;&divide;&eacute;&Eacute;&ecirc;&Ecirc;&egrave;&Egrave;&empty;&emsp;&ensp;&epsilon;&Epsilon;&equiv;&eta;&Eta;&eth;&ETH;&euml;&Euml;&euro;&exist;&fnof;&forall;&frac12;&frac14;&frac34;&frasl;&gamma;&Gamma;&ge;&gt;&harr;&hArr;&hearts;&hellip;&iacute;&Iacute;&icirc;&Icirc;&iexcl;&igrave;&Igrave;&image;&infin;&int;&iota;&Iota;&iquest;&isin;&iuml;&Iuml;&kappa;&Kappa;&lambda;&Lambda;&lang;&laquo;&larr;&lArr;&lceil;&ldquo;&le;&lfloor;&lowast;&loz;&lrm;&lsaquo;&lsquo;&lt;&macr;&mdash;&micro;&middot;&minus;&mu;&Mu;&nabla;&nbsp;&ndash;&ne;&ni;&not;&notin;&nsub;&ntilde;&Ntilde;&nu;&Nu;&oacute;&Oacute;&ocirc;&Ocirc;&oelig;&OElig;&ograve;&Ograve;&oline;&omega;&Omega;&omicron;&Omicron;&oplus;&or;&ordf;&ordm;&oslash;&Oslash;&otilde;&Otilde;&otimes;&ouml;&Ouml;&para;&part;&permil;&perp;&phi;&Phi;&pi;&Pi;&piv;&plusmn;&pound;&prime;&Prime;&prod;&prop;&psi;&Psi;&quot;&radic;&rang;&raquo;&rarr;&rArr;&rceil;&rdquo;&real;&reg;&rfloor;&rho;&Rho;&rlm;&rsaquo;&rsquo;&sbquo;&scaron;&Scaron;&sdot;&sect;&shy;&sigma;&Sigma;&sigmaf;&sim;&spades;&sub;&sube;&sum;&sup;&sup1;&sup2;&sup3;&supe;&szlig;&tau;&Tau;&there4;&theta;&Theta;&thetasym;&thinsp;&thorn;&THORN;&tilde;&times;&trade;&uacute;&Uacute;&uarr;&uArr;&ucirc;&Ucirc;&ugrave;&Ugrave;&uml;&upsih;&upsilon;&Upsilon;&uuml;&Uuml;&weierp;&xi;&Xi;&yacute;&Yacute;&yen;&yuml;&Yuml;&zeta;&Zeta;&zwj;&zwnj;",
        @"áÁâ´æÆàÀℵαΑ&∧∠åÅ≈ãÃäÄ„βΒ¦•∩çǸ¢χΧˆ♣≅©↵∪¤†‡↓⇓°δΔ♦÷éÉêÊèÈ∅  εΕ≡ηΗðÐëË€∃ƒ∀½¼¾⁄γΓ≥>↔⇔♥…íÍîΡìÌℑ∞∫ιΙ¿∈ïÏκΚλΛ〈«←⇐⌈“≤⌊∗◊‎‹‘<¯—µ·−μΜ∇ –≠∋¬∉⊄ñÑνΝóÓôÔœŒòÒ‾ωΩοΟ⊕∨ªºøØõÕ⊗öÖ¶∂‰⊥φΦπΠϖ±£′″∏∝ψΨ""√〉»→⇒⌉”ℜ®⌋ρΡ‏›’‚šŠ⋅§­σΣς∼♠⊂⊆∑⊃¹²³⊇ßτΤ∴θΘϑ þޘיúÚ↑⇑ûÛùÙ¨ϒυΥüÜ℘ξΞýÝ¥ÿŸζΖ‍‌",
index d2dd70c82a709b6c636b78d5c0b68f7768c4fbb5..6af8a6158932afc1141ecc3f9c18d7566d506bb9 100644 (file)
@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
 //\r
-#if NET_2_0\r
 \r
 using System;\r
 using System.Text;\r
@@ -611,107 +610,6 @@ namespace Mono.Xml.XPath
                        return ret;\r
                }\r
 \r
-#if NET_1_1\r
-#else\r
-               public override string ReadInnerXml ()\r
-               {\r
-                       if (ReadState != ReadState.Interactive)\r
-                               return String.Empty;\r
-\r
-                       switch (NodeType) {\r
-                       case XmlNodeType.Attribute:\r
-                               return Value;\r
-                       case XmlNodeType.Element:\r
-                               if (IsEmptyElement)\r
-                                       return String.Empty;\r
-\r
-                               int startDepth = Depth;\r
-\r
-                               innerXmlBuilder.Length = 0;\r
-                               bool loop = true;\r
-                               do {\r
-                                       Read ();\r
-                                       if (NodeType ==XmlNodeType.None)\r
-                                               throw new InvalidOperationException ("unexpected end of xml.");\r
-                                       else if (NodeType == XmlNodeType.EndElement && Depth == startDepth) {\r
-                                               loop = false;\r
-                                               Read ();\r
-                                       }\r
-                                       else\r
-                                               innerXmlBuilder.Append (GetCurrentTagMarkup ());\r
-                               } while (loop);\r
-                               string xml = innerXmlBuilder.ToString ();\r
-                               innerXmlBuilder.Length = 0;\r
-                               return xml;\r
-                       case XmlNodeType.None:\r
-                               // MS document is incorrect. Seems not to progress.\r
-                               return String.Empty;\r
-                       default:\r
-                               Read ();\r
-                               return String.Empty;\r
-                       }\r
-               }\r
-               \r
-               StringBuilder atts = new StringBuilder ();\r
-               private string GetCurrentTagMarkup ()\r
-               {\r
-                       switch (NodeType) {\r
-                       case XmlNodeType.CDATA:\r
-                               return String.Format ("<![CDATA[{0}]]>", Value.Replace ("]]>", "]]&gt;"));\r
-                       case XmlNodeType.Text:\r
-                               return Value.Replace ("<", "&lt;");\r
-                       case XmlNodeType.Comment:\r
-                               return String.Format ("<!--{0}-->", Value);\r
-                       case XmlNodeType.SignificantWhitespace:\r
-                       case XmlNodeType.Whitespace:\r
-                               return Value;\r
-                       case XmlNodeType.EndElement:\r
-                               return String.Format ("</{0}>", Name);\r
-                       }\r
-\r
-                       bool isEmpty = IsEmptyElement;\r
-                       string name = Name;\r
-                       atts.Length = 0;\r
-                       XPathNavigator temp = current.Clone ();\r
-                       while (temp.MoveToNextAttribute ())\r
-                               atts.AppendFormat (" {0}='{1}'", temp.Name, temp.Value.Replace ("'", "&apos;"));\r
-                       if (!IsEmptyElement)\r
-                               return String.Format ("<{0}{1}>", name, atts);\r
-                       else\r
-                               return String.Format ("<{0}{1} />", name, atts);\r
-               }\r
-\r
-               // Arranged copy of XmlTextReader.ReadOuterXml()\r
-               public override string ReadOuterXml ()\r
-               {\r
-                       if (ReadState != ReadState.Interactive)\r
-                               return String.Empty;\r
-\r
-                       switch (NodeType) {\r
-                       case XmlNodeType.Attribute:\r
-                               // strictly incompatible with MS... (it holds spaces attribute between name, value and "=" char (very trivial).\r
-                               return String.Format ("{0}={1}{2}{1}", Name, QuoteChar, ReadInnerXml ());\r
-                       case XmlNodeType.Element:\r
-                               bool isEmpty = IsEmptyElement;\r
-                               string name = Name;\r
-                               StringBuilder atts = new StringBuilder ();\r
-                               XPathNavigator temp = current.Clone ();\r
-                               while (temp.MoveToNextAttribute ())\r
-                                       atts.AppendFormat (" {0}='{1}'", temp.Name, temp.Value.Replace ("'", "&apos;"));\r
-\r
-                               if (!isEmpty)\r
-                                       return String.Format ("{0}{1}</{2}>", GetCurrentTagMarkup (), atts, ReadInnerXml (), name);\r
-                               else\r
-                                       return String.Format ("{0}", GetCurrentTagMarkup ());\r
-                       case XmlNodeType.None:\r
-                               // MS document is incorrect. Seems not to progress.\r
-                               return String.Empty;\r
-                       default:\r
-                               Read ();\r
-                               return String.Empty;\r
-                       }\r
-               }\r
-#endif\r
 \r
                public override string LookupNamespace (string prefix)\r
                {\r
@@ -749,5 +647,3 @@ namespace Mono.Xml.XPath
                #endregion\r
        }\r
 }\r
-\r
-#endif\r
index 43d46d557e390e32d7ab51a4e3038be5ce1956ec..24494382abaffc61f64d2edb01e42388bbc0af4b 100644 (file)
@@ -256,19 +256,6 @@ namespace Mono.Xml
                        return reader.ReadString ();\r
                }\r
 \r
-#if NET_1_1\r
-#else\r
-               public override string ReadInnerXml ()\r
-               {\r
-                       return ReadInnerXmlInternal ();\r
-               }\r
-\r
-               public override string ReadOuterXml ()\r
-               {\r
-                       return ReadOuterXmlInternal ();\r
-               }\r
-#endif\r
-\r
                public override string LookupNamespace (string prefix)\r
                {\r
                        return reader.LookupNamespace (prefix);\r
index 83d48be1d21b7326084391213d6500da7d95d525..2e7b27813439eff990b7d3b0244a6390ec94869c 100644 (file)
@@ -266,22 +266,14 @@ namespace System.Xml.Schema
                ///             4. targetNamespace should be any uri
                ///             5. version should be a normalizedString
                /// </remarks>
-#if NET_2_0
                [Obsolete ("Use XmlSchemaSet.Compile() instead.")]
-#endif
                public void Compile (ValidationEventHandler handler)
                {
                        Compile (handler, new XmlUrlResolver ());
                }
 
-#if NET_2_0
                [Obsolete ("Use XmlSchemaSet.Compile() instead.")]
-#endif
-#if NET_1_1
                public void Compile (ValidationEventHandler handler, XmlResolver resolver)
-#else
-               internal void Compile (ValidationEventHandler handler, XmlResolver resolver)
-#endif
                {
                        XmlSchemaSet xss = new XmlSchemaSet ();
                        if (handler != null)
index 8b724c53009ab534253394248c1842de8c3bb06c..e572e06dbf67bd1438a32d6527765025ff1f1a98 100644 (file)
@@ -99,11 +99,7 @@ namespace System.Xml.Schema
                        return Add (ns, reader, new XmlUrlResolver ());
                }
 
-#if NET_1_1
                public XmlSchema Add (string ns, XmlReader reader, XmlResolver resolver)
-#else
-               internal XmlSchema Add (string ns, XmlReader reader, XmlResolver resolver)
-#endif
                {
                        XmlSchema schema = XmlSchema.Read (reader, ValidationEventHandler);
                        if (schema.TargetNamespace == null)
index 3e1228f6ceeea3742a5a9d175ab009f758cc8805..e61c599490b2d116e300efb453b0d15bb90b42e4 100644 (file)
@@ -122,7 +122,6 @@ namespace System.Xml.Serialization
                        get { return _form; }
                }
                
-#if NET_2_0
                public string XsdElementName
                {
                        get { return _mapMember.Name; }
@@ -135,15 +134,11 @@ namespace System.Xml.Serialization
                                "System.Nullable`1[" + ret + "]" : ret;
                }
 #endif
-#endif
 
-#if NET_1_1
                public bool CheckSpecified
                {
                        get { return _mapMember.IsOptionalValueType; }
                }
-#endif
-
                #endregion // Properties
        }
 }
index 89bd52402df00d40e23606f4bf96abcd4bf0e85d..ad4bae1f36f294a9a74877341c80efdae0606362 100644 (file)
@@ -587,11 +587,7 @@ namespace System.Xml.Serialization
                protected void WriteNullTagEncoded (string name, string ns)
                {
                        Writer.WriteStartElement (name, ns);
-#if NET_1_1
                        Writer.WriteAttributeString ("nil", XmlSchema.InstanceNamespace, "true");
-#else
-                       Writer.WriteAttributeString ("null", XmlSchema.InstanceNamespace, "1");
-#endif
                        Writer.WriteEndElement ();
                }
 
index a83b7ee80bcae7a101374ab503a90cbe1d059f6a..2610a90c281cddc688af728263de74cf3527b56c 100644 (file)
@@ -111,10 +111,6 @@ namespace System.Xml.Xsl {
                XmlResolver xmlResolver = new XmlUrlResolver ();\r
 \r
                [MonoTODO] // FIXME: audit security check\r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public XmlResolver XmlResolver {\r
                        set {\r
                                 xmlResolver = value;\r
@@ -122,37 +118,22 @@ namespace System.Xml.Xsl {
                }\r
                \r
                #region Transform\r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public XmlReader Transform (IXPathNavigable input, XsltArgumentList args)\r
                {\r
                        return Transform (input.CreateNavigator (), args, xmlResolver);\r
                }\r
 \r
-#if NET_1_1\r
                public XmlReader Transform (IXPathNavigable input, XsltArgumentList args, XmlResolver resolver)\r
-#else\r
-               XmlReader Transform (IXPathNavigable input, XsltArgumentList args, XmlResolver resolver)\r
-#endif\r
                {\r
                        return Transform (input.CreateNavigator (), args, resolver);\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public XmlReader Transform (XPathNavigator input, XsltArgumentList args)\r
                {\r
                        return Transform (input, args, xmlResolver);\r
                }\r
-#if NET_1_1\r
+\r
                public XmlReader Transform (XPathNavigator input, XsltArgumentList args, XmlResolver resolver)\r
-#else\r
-               XmlReader Transform (XPathNavigator input, XsltArgumentList args, XmlResolver resolver)\r
-#endif\r
                {\r
                        // todo: is this right?\r
                        MemoryStream stream = new MemoryStream ();\r
@@ -161,70 +142,41 @@ namespace System.Xml.Xsl {
                        return new XmlTextReader (stream, XmlNodeType.Element, null);\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output)\r
                {\r
                        Transform (input.CreateNavigator (), args, output, xmlResolver);\r
                }\r
-#if NET_1_1\r
+\r
                public void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output, XmlResolver resolver)\r
-#else\r
-               void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output, XmlResolver resolver)\r
-#endif\r
                {\r
                        Transform (input.CreateNavigator (), args, output, resolver);\r
                }\r
                \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public void Transform (IXPathNavigable input, XsltArgumentList args, Stream output)\r
                {\r
                        Transform (input.CreateNavigator (), args, output, xmlResolver);\r
                }\r
-#if NET_1_1\r
                public void Transform (IXPathNavigable input, XsltArgumentList args, Stream output, XmlResolver resolver)\r
-#else\r
-               void Transform (IXPathNavigable input, XsltArgumentList args, Stream output, XmlResolver resolver)\r
-#endif\r
                {\r
                        Transform (input.CreateNavigator (), args, output, resolver);\r
                }\r
                \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output)\r
                {\r
                        Transform (input.CreateNavigator (), args, output, xmlResolver);\r
                }\r
-#if NET_1_1\r
+\r
                public void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output, XmlResolver resolver)\r
-#else\r
-               void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output, XmlResolver resolver)\r
-#endif\r
                {\r
                        Transform (input.CreateNavigator (), args, output, resolver);\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output)\r
                {\r
                        Transform (input, args, output, xmlResolver);\r
                }\r
-#if NET_1_1\r
+\r
                public void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output, XmlResolver resolver)\r
-#else\r
-               void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output, XmlResolver resolver)\r
-#endif\r
                {\r
                        if (s == null)\r
                                throw new XsltException ("No stylesheet was loaded.", null);\r
@@ -234,37 +186,22 @@ namespace System.Xml.Xsl {
                        output.Flush ();\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public void Transform (XPathNavigator input, XsltArgumentList args, Stream output)\r
                {\r
                        Transform (input, args, output, xmlResolver);           \r
                }\r
-#if NET_1_1\r
                public void Transform (XPathNavigator input, XsltArgumentList args, Stream output, XmlResolver resolver)\r
-#else\r
-               void Transform (XPathNavigator input, XsltArgumentList args, Stream output, XmlResolver resolver)\r
-#endif\r
                {\r
                        XslOutput xslOutput = (XslOutput)s.Outputs[String.Empty];\r
                        Transform (input, args, new StreamWriter (output, xslOutput.Encoding), resolver);\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output)\r
                {\r
                        Transform (input, args, output, xmlResolver);\r
                }\r
-#if NET_1_1\r
+\r
                public void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output, XmlResolver resolver)\r
-#else\r
-               void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output, XmlResolver resolver)\r
-#endif\r
                {\r
                        if (s == null)\r
                                throw new XsltException ("No stylesheet was loaded.", null);\r
@@ -275,20 +212,12 @@ namespace System.Xml.Xsl {
                        output.Flush ();\r
                }\r
                \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete ("You should pass XmlResolver to Transform() method", false)]\r
-#endif\r
                public void Transform (string inputfile, string outputfile)\r
                { \r
                        Transform (inputfile, outputfile, xmlResolver);\r
                }\r
 \r
-#if NET_1_1\r
                public void Transform (string inputfile, string outputfile, XmlResolver resolver)\r
-#else\r
-               void Transform (string inputfile, string outputfile, XmlResolver resolver)\r
-#endif\r
                {\r
                        using (Stream s = new FileStream (outputfile, FileMode.Create, FileAccess.ReadWrite)) {\r
                                Transform(new XPathDocument (inputfile).CreateNavigator (), null, s, resolver);\r
@@ -318,84 +247,48 @@ namespace System.Xml.Xsl {
                        }\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete("You should pass evidence.", false)]\r
-#endif\r
                public void Load (XmlReader stylesheet)\r
                {\r
                        Load (stylesheet, null, null);\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete("You should pass evidence.", false)]\r
-#endif\r
                public void Load (XmlReader stylesheet, XmlResolver resolver)\r
                {\r
                        Load (stylesheet, resolver, null);\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete("You should pass evidence.", false)]\r
-#endif\r
                public void Load (XPathNavigator stylesheet)\r
                {\r
                        Load (stylesheet, null, null);\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete("You should pass evidence.", false)]\r
-#endif\r
                public void Load (XPathNavigator stylesheet, XmlResolver resolver)\r
                {\r
                        Load (stylesheet, resolver, null);\r
                }\r
                \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete("You should pass evidence.", false)]\r
-#endif\r
                public void Load (IXPathNavigable stylesheet)\r
                {\r
                        Load (stylesheet.CreateNavigator(), null);\r
                }\r
 \r
-#if NET_2_0\r
-#elif NET_1_1\r
-               [Obsolete("You should pass evidence.", false)]\r
-#endif\r
                public void Load (IXPathNavigable stylesheet, XmlResolver resolver)\r
                {\r
                        Load (stylesheet.CreateNavigator(), resolver);\r
                }\r
 \r
                // Introduced in .NET 1.1\r
-#if NET_1_1\r
                public void Load (IXPathNavigable stylesheet, XmlResolver resolver, Evidence evidence)\r
-#else\r
-               internal void Load (IXPathNavigable stylesheet, XmlResolver resolver, Evidence evidence)\r
-#endif\r
                {\r
                        Load (stylesheet.CreateNavigator(), resolver, evidence);\r
                }\r
 \r
-#if NET_1_1\r
                public void Load (XPathNavigator stylesheet, XmlResolver resolver, Evidence evidence)\r
-#else\r
-               internal void Load (XPathNavigator stylesheet, XmlResolver resolver, Evidence evidence)\r
-#endif\r
                {\r
                        s = new Compiler (debugger).Compile (stylesheet, resolver, evidence);\r
                }\r
 \r
-#if NET_1_1\r
                public void Load (XmlReader stylesheet, XmlResolver resolver, Evidence evidence)\r
-#else\r
-               internal void Load (XmlReader stylesheet, XmlResolver resolver, Evidence evidence)\r
-#endif\r
                {\r
                        Load (new XPathDocument (stylesheet, XmlSpace.Preserve).CreateNavigator (), resolver, evidence);\r
                }\r
index 01e0ab0461e62390c3f7d16e75a25505f616463f..ff8d33419168fc4621e1c53acb4474defc59e532 100644 (file)
@@ -63,15 +63,9 @@ namespace System.Xml
                        try {
                                return base.Read (dest_buffer, index, count);
                        }
-#if NET_1_1
                        catch (System.ArgumentException ex) {
                                throw new XmlException ("Invalid data", ex);
                        }
-#else
-                       catch (System.Text.DecoderFallbackException) {
-                               throw invalidDataException;
-                       }
-#endif
                }
 
                protected override void Dispose (bool disposing)
index 287dbe7856fa10492d94835578e23645c5107a6a..618ac25d030c59c26d4e9b83513f97f060e477e5 100644 (file)
@@ -139,13 +139,7 @@ Here are some implementation notes (mostly common to previous module):
        closing '>' is written).
 
 */
-
-
-#if NET_1_1
 namespace System.Xml
-#else
-namespace Mono.Xml
-#endif
 {
        public class XmlTextWriter : XmlWriter
        {
@@ -268,7 +262,6 @@ namespace Mono.Xml
                        allow_doc_fragment = true;
                }
 
-#if NET_2_0
                internal XmlTextWriter (
                        TextWriter writer, XmlWriterSettings settings, bool closeOutput)
                {
@@ -312,7 +305,6 @@ namespace Mono.Xml
                        check_character_validity = settings.CheckCharacters;
                        namespace_handling = settings.NamespaceHandling;
                }
-#endif
 
                void Initialize (TextWriter writer)
                {
@@ -336,7 +328,6 @@ namespace Mono.Xml
                                new char [] {'"', '&', '<', '>' };
                }
 
-#if NET_2_0
                // 2.0 XmlWriterSettings support
 
                // As for ConformanceLevel, MS.NET is inconsistent with
@@ -345,8 +336,6 @@ namespace Mono.Xml
                // result in an error.
                // ms-help://MS.NETFramework.v20.en/wd_xml/html/7db8802b-53d8-4735-a637-4d2d2158d643.htm
 
-#endif
-
                // Literal Output Control
 
                public Formatting Formatting {
@@ -432,17 +421,12 @@ namespace Mono.Xml
 
                public override void Close ()
                {
-#if NET_2_0
                        if (state != WriteState.Error) {
-#endif
                                if (state == WriteState.Attribute)
                                        WriteEndAttribute ();
                                while (open_count > 0)
                                        WriteEndElement ();
-#if NET_2_0
                        }
-#endif
-
                        if (close_output_stream)
                                writer.Close ();
                        else
@@ -517,9 +501,7 @@ namespace Mono.Xml
                public override void WriteEndDocument ()
                {
                        switch (state) {
-#if NET_2_0
                        case WriteState.Error:
-#endif
                        case WriteState.Closed:
                        case WriteState.Start:
                                throw StateError ("EndDocument");
@@ -589,11 +571,7 @@ namespace Mono.Xml
                public override void WriteStartElement (
                        string prefix, string localName, string namespaceUri)
                {
-#if NET_2_0
                        if (state == WriteState.Error || state == WriteState.Closed)
-#else
-                       if (state == WriteState.Closed)
-#endif
                                throw StateError ("StartTag");
                        node_state = XmlNodeType.Element;
 
@@ -765,11 +743,7 @@ namespace Mono.Xml
 
                void WriteEndElementCore (bool full)
                {
-#if NET_2_0
                        if (state == WriteState.Error || state == WriteState.Closed)
-#else
-                       if (state == WriteState.Closed)
-#endif
                                throw StateError ("EndElement");
                        if (open_count == 0)
                                throw InvalidOperation ("There is no more open element.");
@@ -1309,9 +1283,7 @@ namespace Mono.Xml
                void ShiftStateTopLevel (string occured, bool allowAttribute, bool dontCheckXmlDecl, bool isCharacter)
                {
                        switch (state) {
-#if NET_2_0
                        case WriteState.Error:
-#endif
                        case WriteState.Closed:
                                throw StateError (occured);
                        case WriteState.Start:
@@ -1350,9 +1322,7 @@ namespace Mono.Xml
                void ShiftStateContent (string occured, bool allowAttribute)
                {
                        switch (state) {
-#if NET_2_0
                        case WriteState.Error:
-#endif
                        case WriteState.Closed:
                                        throw StateError (occured);
                        case WriteState.Prolog:
@@ -1505,25 +1475,19 @@ namespace Mono.Xml
 
                Exception ArgumentOutOfRangeError (string name)
                {
-#if NET_2_0
                        state = WriteState.Error;
-#endif
                        return new ArgumentOutOfRangeException (name);
                }
 
                Exception ArgumentError (string msg)
                {
-#if NET_2_0
                        state = WriteState.Error;
-#endif
                        return new ArgumentException (msg);
                }
 
                Exception InvalidOperation (string msg)
                {
-#if NET_2_0
                        state = WriteState.Error;
-#endif
                        return new InvalidOperationException (msg);
                }
 
index 785f5a13d38028213f410a52668e00e18f901ae4..18cef9df4860bf0b7a921298714d6c6acc76b1bd 100644 (file)
@@ -414,9 +414,7 @@ xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl='urn:schemas-micros
 
                // http://support.microsoft.com/default.aspx?scid=kb;en-us;834667
                [Test]
-#if NET_1_1
                [Category ("NotDotNet")]
-#endif
                public void LocalParameter ()
                {
                        string xsltFragment = @"<?xml version=""1.0"" encoding=""UTF-8"" ?>
index 9b3631bd4a9e4571367b91512f5a17cdce6cf6b5..3db9e6c55505aa033973d8e827edbc6f0bab48ab 100644 (file)
@@ -33,7 +33,6 @@ using System.Net;
 
 namespace System.Net.Sockets
 {
-#if NET_1_1
        // <remarks>
        //   Encapsulates a multicast option
        // </remarks>
@@ -80,5 +79,4 @@ namespace System.Net.Sockets
                        }
                }
        }
-#endif
 }
index 90a06d1202486ac303fa151d0a6f861445f65dbf..824e912c308fb93b18e93bad32040e96276da90a 100644 (file)
@@ -70,11 +70,9 @@ namespace System.Net.Sockets {
                /// </summary>
                Idp = 22,
 
-#if NET_1_1
                /// <summary>
                /// </summary>
                IPv6 = 41,
-#endif
 
                /// <summary>
                /// </summary>
index c6eabc50aee3430df3d90fe6325af44da1b8d296..e4de7bf54eaa9551e16f3508f1a4ba1ebfa54ddc 100644 (file)
@@ -918,7 +918,6 @@ namespace System.Net.Sockets
                        }
                }
 
-#if NET_1_1
                public static bool SupportsIPv4 
                {
                        get 
@@ -936,23 +935,6 @@ namespace System.Net.Sockets
                                return ipv6Supported == 1;
                        }
                }
-#else
-               internal static bool SupportsIPv4 
-               {
-                       get 
-                       {
-                               return true;
-                       }
-               }
-
-               internal static bool SupportsIPv6 
-               {
-                       get 
-                       {
-                               return false;
-                       }
-               }
-#endif
 
                internal static void CheckProtocolSupport()
                {
@@ -973,7 +955,7 @@ namespace System.Net.Sockets
 
                        if(ipv6Supported == -1) 
                        {
-#if NET_2_0 && CONFIGURATION_DEP
+#if CONFIGURATION_DEP
                                SettingsSection config;
                                config = (SettingsSection) System.Configuration.ConfigurationManager.GetSection ("system.net/settings");
                                if (config != null)
index e93bb2f4b046c8bac7000aafdebda1d020183866..cda7027a7f7f963cca9924f13c301fa533338296 100644 (file)
@@ -46,11 +46,9 @@ namespace System.Net.Sockets {
                /// </summary>
                IP = 0,
 
-#if NET_1_1
                /// <summary>
                /// </summary>
                IPv6 = 41,
-#endif
 
                /// <summary>
                /// </summary>
index a1f6a6cf6805483abc3bb9e3ba282b9f24202ef7..a6982a1ed7a98d47320a35e56139a5f0b7a85207 100644 (file)
@@ -117,7 +117,6 @@ namespace System.Net {
 
                                        ipe = new IPEndPoint(address, port);
                                        break;
-#if NET_1_1
                                case AddressFamily.InterNetworkV6:
                                        if (size < 28) {
                                                return(null);
@@ -144,7 +143,6 @@ namespace System.Net {
 
                                        ipe = new IPEndPoint (new IPAddress(addressData, scopeId), port);
                                        break;
-#endif
                                default:
                                        return null;
                        }
@@ -173,7 +171,7 @@ namespace System.Net {
                                        sockaddr [6] = (byte) ((addr >> 16) & 0xff);
                                        sockaddr [7] = (byte) ((addr >> 24) & 0xff);
                                        break;
-#if NET_1_1
+
                                case AddressFamily.InterNetworkV6:
                                        sockaddr = new SocketAddress(AddressFamily.InterNetworkV6, 28);
 
@@ -189,7 +187,6 @@ namespace System.Net {
                                        sockaddr [26] = (byte) ((address.ScopeId >> 16) & 0xff);
                                        sockaddr [27] = (byte) ((address.ScopeId >> 24) & 0xff);
                                        break;
-#endif
                        }
 
                        return(sockaddr);
index 3e35e93a867020fca08fd47404f30aa09851b73d..02eb05e873b95efdf777f7ca94298f3145d10b85 100644 (file)
@@ -114,14 +114,12 @@ namespace System.Net
                private static bool _checkCRL = false;
                private static SecurityProtocolType _securityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls;
 
-#if NET_1_1
 #if TARGET_JVM
                static bool expectContinue = false;
 #else
                static bool expectContinue = true;
 #endif
                static bool useNagle;
-#endif
                static RemoteCertificateValidationCallback server_cert_cb;
                static bool tcp_keepalive;
                static int tcp_keepalive_time;
@@ -270,7 +268,6 @@ namespace System.Net
                        }
                }
 
-#if NET_1_1
                public static bool Expect100Continue {
                        get { return expectContinue; }
                        set { expectContinue = value; }
@@ -280,7 +277,7 @@ namespace System.Net
                        get { return useNagle; }
                        set { useNagle = value; }
                }
-#endif
+
                // Methods
                public static void SetTcpKeepAlive (bool enabled, int keepAliveTime, int keepAliveInterval)
                {
index 80cf2342a546b082614056ba5bd255946a7fc3d9..39253cbad22a8cb2e1880edc5eb6a97a2ece66ee 100644 (file)
@@ -115,13 +115,12 @@ namespace System.Net
                                cnc_cred.Password != req_cred.Password) {
                                needs_reset = true;
                        }
-#if NET_1_1
+
                        if (!needs_reset) {
                                bool req_sharing = request.UnsafeAuthenticatedConnectionSharing;
                                bool cnc_sharing = cnc.UnsafeAuthenticatedConnectionSharing;
                                needs_reset = (req_sharing == false || req_sharing != cnc_sharing);
                        }
-#endif
                        if (needs_reset) {
                                cnc.Close (false); // closes the authenticated connection
                                cnc.ResetNtlm ();
index ceeadb9108ec32120b8713b5f58701bad60910e8..32fa1af8ea287685b114d3c4d3bd2e92758ce073 100644 (file)
@@ -53,16 +53,13 @@ namespace System.Net
                Timeout = 14,
                ProxyNameResolutionFailure = 15,
 
-#if NET_1_1
+
                UnknownError = 16,
                MessageLengthLimitExceeded = 17,
-#endif
 
-#if NET_2_0
                CacheEntryNotFound = 18,
                RequestProhibitedByCachePolicy = 19,
                RequestProhibitedByProxy = 20,
-#endif
 
        }
 }
index f139599f97be86ce7ed689edbccc80ce2488a001..d1076a3271d0bdeaaaead9a5d5ab25f0aae57465 100644 (file)
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Security;
 using System.Security.Permissions;
 
@@ -161,5 +159,3 @@ namespace System.Web {
                }
        }
 }
-
-#endif
index 80b59455f3e705ff141aa6ac1354a9cf2657f985..8a299d48b06209725592672b25356a131d910b3d 100644 (file)
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Security;
 using System.Security.Permissions;
 
@@ -67,5 +65,3 @@ namespace System.Web {
                }
        }
 }
-
-#endif
index beeb1959f5740bd42f705507298609573b9c4e36..4fa8edb2531b742a8b41df1bc996db629642814b 100644 (file)
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 namespace System.Web {
 
-#if NET_2_0
        [Serializable]
-#endif
        public enum AspNetHostingPermissionLevel {
                None = 100,
                Minimal = 200,
@@ -42,5 +38,3 @@ namespace System.Web {
                Unrestricted = 600
        }
 }
-
-#endif
index 86d287acf088bb732ca7d7d4147d6a0775e52f00..650775db37bd39f85957de8dbe5235532bc85bf4 100644 (file)
@@ -150,7 +150,6 @@ public class IPAddressTest
                Assert.AreEqual ("255.255.255.255", IPAddress.None.ToString (), "#5");
        }
 
-#if NET_1_1
        [Test]
        public void ToStringV6 ()
        {
@@ -162,7 +161,6 @@ public class IPAddressTest
                        Assert.AreEqual (ipv6AddressList[i*2].ToLower(), addr, "ToStringIPv6 #" + i);
                }
        }
-#endif
 
        [Test]
        public void IsLoopbackV4 ()
@@ -179,7 +177,6 @@ public class IPAddressTest
                Assert.IsFalse (IPAddress.IsLoopback (ip), "#4");
        }
 
-#if NET_1_1
        [Test]
        public void IsLoopbackV6 ()
        {
@@ -218,7 +215,6 @@ public class IPAddressTest
                for (int i = 0; i < dataIn.Length; i++)
                        Assert.AreEqual (dataOut [i], dataIn [i], "GetAddressBytesV6 #2");
        }
-#endif
 
        [Test]
        public void Address ()
@@ -257,7 +253,6 @@ public class IPAddressTest
                }
        }
 
-#if NET_1_1
        [Test]
        public void ParseOkV6 ()
        {
@@ -278,7 +273,6 @@ public class IPAddressTest
                                        ip.ToString ().ToLower (), source));
                }
        }
-#endif
 
        [Test]
        public void ParseWrongV4 ()
@@ -363,22 +357,9 @@ public class IPAddressTest
        public void Constructor0_Address_4Byte ()
        {
                byte[] bytes = new byte[4] { 192, 202, 112, 37 };
-#if NET_2_0
                IPAddress i = new IPAddress (bytes);
                Assert.AreEqual (bytes, i.GetAddressBytes (), "#1");
                Assert.AreEqual ("192.202.112.37", i.ToString (), "#2");
-#else
-               try {
-                       new IPAddress (bytes);
-                       Assert.Fail ("#1");
-               } catch (ArgumentException ex) {
-                       Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
-                       Assert.IsNotNull (ex.Message, "#3");
-                       Assert.AreEqual ("address", ex.Message, "#4");
-                       Assert.IsNull (ex.ParamName, "#5");
-                       Assert.IsNull (ex.InnerException, "#6");
-               }
-#endif
        }
 
        [Test]
@@ -394,14 +375,9 @@ public class IPAddressTest
                        Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
                        Assert.IsNull (ex.InnerException, "#A3");
                        Assert.IsNotNull (ex.Message, "#A4");
-#if NET_2_0
                        Assert.IsFalse (ex.Message == "address", ex.Message, "#A5");
                        Assert.IsNotNull (ex.ParamName, "#A6");
                        Assert.AreEqual ("address", ex.ParamName, "#A7");
-#else
-                       Assert.AreEqual ("address", ex.Message, "#A5");
-                       Assert.IsNull (ex.ParamName, "#A6");
-#endif
                }
 
                try {
@@ -411,14 +387,9 @@ public class IPAddressTest
                        Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
                        Assert.IsNull (ex.InnerException, "#B3");
                        Assert.IsNotNull (ex.Message, "#B4");
-#if NET_2_0
                        Assert.IsFalse (ex.Message == "address", ex.Message, "#B5");
                        Assert.IsNotNull (ex.ParamName, "#B6");
                        Assert.AreEqual ("address", ex.ParamName, "#B7");
-#else
-                       Assert.AreEqual ("address", ex.Message, "#B5");
-                       Assert.IsNull (ex.ParamName, "#B6");
-#endif
                }
 
                try {
@@ -428,14 +399,9 @@ public class IPAddressTest
                        Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#C2");
                        Assert.IsNull (ex.InnerException, "#C3");
                        Assert.IsNotNull (ex.Message, "#C4");
-#if NET_2_0
                        Assert.IsFalse (ex.Message == "address", "#C5");
                        Assert.IsNotNull (ex.ParamName, "#C6");
                        Assert.AreEqual ("address", ex.ParamName, "#C7");
-#else
-                       Assert.AreEqual ("address", ex.Message, "#C5");
-                       Assert.IsNull (ex.ParamName, "#C6");
-#endif
                }
        }
 
@@ -467,14 +433,9 @@ public class IPAddressTest
                        Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
                        Assert.IsNull (ex.InnerException, "#3");
                        Assert.IsNotNull (ex.Message, "#4");
-#if NET_2_0
                        Assert.IsFalse (ex.Message == "address", "#5");
                        Assert.IsNotNull (ex.ParamName, "#6");
                        Assert.AreEqual ("address", ex.ParamName, "#7");
-#else
-                       Assert.AreEqual ("address", ex.Message, "#5");
-                       Assert.IsNull (ex.ParamName, "#6");
-#endif
                }
        }
 
@@ -492,7 +453,6 @@ public class IPAddressTest
                }
        }
 
-#if NET_2_0
        [Test]
        public void FromBytes1 ()
        {
@@ -605,7 +565,6 @@ public class IPAddressTest
                Assert.IsTrue (IPAddress.Parse ("FF01::1").IsIPv6Multicast, "#2");
                Assert.IsFalse (IPAddress.Parse ("FE00::1").IsIPv6Multicast, "#3");
        }
-#endif
 }
 }
 
index 950a08ef0ad35e8d72bc5df26403a3b3b2f79efe..0a273dacc8f9e9dc67d30d7f689943fa37b5e271 100644 (file)
@@ -107,11 +107,7 @@ namespace System.Collections
 #endif
                }
 
-#if NET_1_1
                public
-#else
-               internal
-#endif
                static CaseInsensitiveHashCodeProvider DefaultInvariant {
                        get {
                                return singletonInvariant;
index 5b95e94dd1e72dd26b7992720f588983000d4809..39ac038dd889123753a53aa1449a015bfb41d9d4 100644 (file)
@@ -48,13 +48,8 @@ namespace System.Runtime.InteropServices {
                public bool PreserveSig;
                public bool SetLastError;
 
-#if NET_1_1
                public bool BestFitMapping;
                public bool ThrowOnUnmappableChar;
-#else
-               private bool BestFitMapping;
-               private bool ThrowOnUnmappableChar;
-#endif
                #endregion
 
                public string Value {
index 3e9780a98854263db0cb52fe8b0e01578d0571ba..29e234bf547cb506fc4f5890bacdbe55b8140fa1 100644 (file)
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.IO;
 using System.Globalization;
 using System.Reflection;
@@ -137,4 +135,3 @@ namespace System.Runtime.InteropServices
        }
 }
 
-#endif
index ac80562f233b7af287da5f5e91b39e46a6bcff37..db444ea3008c7c6c18d5436bb35b8b99a26b8841 100644 (file)
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Reflection.Emit;
 
 namespace System.Runtime.InteropServices {
@@ -49,5 +47,3 @@ namespace System.Runtime.InteropServices {
                        IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
        }
 }
-
-#endif
index a4ae7a34e9b024a0b0a846d7c81cfd83db173d53..ab72a0da60be43e8817a1f95f1c2c599fdbcfd49 100644 (file)
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Reflection;
 
 namespace System.Runtime.InteropServices {
@@ -49,5 +47,3 @@ namespace System.Runtime.InteropServices {
                        IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
        }
 }
-
-#endif
index c162d9dd11166b3168876446c33d1bcc5023a6f9..46671e3d00ea8a6e2c93f3abbfaebc15354ba047 100644 (file)
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System;
 
 namespace System.Runtime.InteropServices {
@@ -48,5 +46,3 @@ namespace System.Runtime.InteropServices {
                        IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
        }
 }
-
-#endif
index 622a0dcf706a7283e97639e526b1fa424b801027..bc8f5fbbf358e7dd9a481055fd32069e3cd7d692 100644 (file)
@@ -27,8 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_1_1
-
 using System.Reflection.Emit;
 
 namespace System.Runtime.InteropServices {
@@ -49,5 +47,3 @@ namespace System.Runtime.InteropServices {
                        IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
        }
 }
-
-#endif
index 5515f46b9c0cd156e4d321bb9ca2430dafc910cf..c11dbac76c58bfab7c8a3a9b0c89bdbfaadd753c 100644 (file)
@@ -5,8 +5,6 @@
 //   Kazuki Oikawa  (kazuki@panicode.com)
 //
 
-#if NET_1_1
-
 using System;
 using System.Globalization;
 using System.Reflection;
@@ -96,4 +94,3 @@ namespace System.Runtime.InteropServices
                Type ReflectedType {get;}
        }
 }
-#endif
index 4e745e55ccfdbe77940df54281b2d012365fddc5..0b7e269fbf617710ae615ecfd22836acf90df042 100644 (file)
@@ -5,8 +5,6 @@
 //   Kazuki Oikawa  (kazuki@panicode.com)
 //
 
-#if NET_1_1
-
 using System;
 using System.Reflection;
 
@@ -51,4 +49,3 @@ namespace System.Runtime.InteropServices
                        IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
        }
 }
-#endif
index 0d9f61426022c116fa595cd952ef4d6cabda72ae..d15ea7d943fbbd99a5054ef4c9bc62edd1b9d23c 100644 (file)
@@ -403,10 +403,8 @@ namespace System.Runtime.Remoting.Channels
                                return null;
                        }
                        
-#if NET_1_1
                        if (RemotingConfiguration.CustomErrorsEnabled (IsLocalCall (msg)))
                                replySink = new ExceptionFilterSink (msg, replySink);
-#endif
                        
                        return _crossContextSink.AsyncProcessMessage (msg, replySink);          
                }
@@ -425,7 +423,6 @@ namespace System.Runtime.Remoting.Channels
 
                internal static IMessage CheckReturnMessage (IMessage callMsg, IMessage retMsg)
                {
-#if NET_1_1
                        IMethodReturnMessage ret = retMsg as IMethodReturnMessage;
                        if (ret != null && ret.Exception != null)
                        {
@@ -435,7 +432,6 @@ namespace System.Runtime.Remoting.Channels
                                        retMsg = new MethodResponse (ex, (IMethodCallMessage)callMsg);
                                }
                        }
-#endif
                        return retMsg;
                }
                
index 46e71422e04baf501f3327fe6cfa3d393355a068..33fef7a0a8d2c26525bdb5146ef1093305ae47d7 100644 (file)
@@ -364,14 +364,12 @@ namespace System.Runtime.Remoting
                        }
                }
                
-#if NET_1_1
                public static bool CustomErrorsEnabled (bool isLocalRequest)
                {
                        if (_errorMode == "off") return false;
                        if (_errorMode == "on") return true;
                        return !isLocalRequest;
                }
-#endif
 
                internal static void SetCustomErrorsMode (string mode)
                {
index fd9c53307f152fa98a8366e9cbe5068bbc338b82..e3962a3b7157a19bab06b7a1a89c3ddf9315fd61 100644 (file)
@@ -46,9 +46,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
                StreamingContext _context;
                SerializationBinder _binder;
                
-#if NET_1_1
                TypeFilterLevel _filterLevel;
-#endif
 
                ObjectManager _manager;
                Hashtable _registeredAssemblies = new Hashtable();
@@ -84,9 +82,7 @@ namespace System.Runtime.Serialization.Formatters.Binary
                        _binder = formatter.Binder;
                        _manager = new ObjectManager (_surrogateSelector, _context);
                        
-#if NET_1_1
                        _filterLevel = formatter.FilterLevel;
-#endif
                }
 
                public void ReadObjectGraph (BinaryReader reader, bool readHeaders, out object result, out Header[] headers)
@@ -701,10 +697,6 @@ namespace System.Runtime.Serialization.Formatters.Binary
                                                        
                                                if (field != null)
                                                        metadata.MemberInfos [n] = field;
-#if ONLY_1_1
-                                               else
-                                                       throw new SerializationException ("Field \"" + names[n] + "\" not found in class " + metadata.Type.FullName);
-#endif
                                                
                                                if (!hasTypeInfo) {
                                                        types [n] = field.FieldType;
index 41951ff66ccf22575abf1a1ddddf321141ed3f34..3a1270cbd66d8e29ddca88d2cebd9df0c003ee49 100644 (file)
@@ -92,10 +92,8 @@ namespace System.Security.Cryptography {
                        persistKey = (parameters != null);
                        if (parameters == null) {
                                parameters = new CspParameters (PROV_DSS_DH);
-#if NET_1_1
                                if (useMachineKeyStore)
                                        parameters.Flags |= CspProviderFlags.UseMachineKeyStore;
-#endif
                                store = new KeyPairPersistence (parameters);
                                // no need to load - it cannot exists
                        }
@@ -137,14 +135,12 @@ namespace System.Security.Cryptography {
                        get { return "http://www.w3.org/2000/09/xmldsig#dsa-sha1"; }
                }
 
-#if NET_1_1
                private static bool useMachineKeyStore = false;
 
                public static bool UseMachineKeyStore {
                        get { return useMachineKeyStore; }
                        set { useMachineKeyStore = value; }
                }
-#endif
 
                public override DSAParameters ExportParameters (bool includePrivateParameters) 
                {
index f1a3d2daa09c013890ea9578f93d909f2f35b363..bf4de13a90906925ed10d4c4fb9272b0f404585b 100644 (file)
@@ -98,10 +98,8 @@ namespace System.Security.Cryptography {
                        persistKey = (p != null);
                        if (p == null) {
                                p = new CspParameters (PROV_RSA_FULL);
-#if NET_1_1
                                if (useMachineKeyStore)
                                        p.Flags |= CspProviderFlags.UseMachineKeyStore;
-#endif
                                store = new KeyPairPersistence (p);
                                // no need to load - it cannot exists
                        }
@@ -120,14 +118,12 @@ namespace System.Security.Cryptography {
                        }
                }
 
-#if NET_1_1
                private static bool useMachineKeyStore = false;
 
                public static bool UseMachineKeyStore {
                        get { return useMachineKeyStore; }
                        set { useMachineKeyStore = value; }
                }
-#endif
        
                ~RSACryptoServiceProvider () 
                {
@@ -168,10 +164,8 @@ namespace System.Security.Cryptography {
        
                public byte[] Decrypt (byte[] rgb, bool fOAEP) 
                {
-#if NET_1_1
                        if (m_disposed)
                                throw new ObjectDisposedException ("rsa");
-#endif
                        // choose between OAEP or PKCS#1 v.1.5 padding
                        AsymmetricKeyExchangeDeformatter def = null;
                        if (fOAEP)
@@ -252,10 +246,8 @@ namespace System.Security.Cryptography {
                // HashAlgorithm descendant
                public byte[] SignData (byte[] buffer, object halg) 
                {
-#if NET_1_1
                        if (buffer == null)
                                throw new ArgumentNullException ("buffer");
-#endif
                        return SignData (buffer, 0, buffer.Length, halg);
                }
        
@@ -410,10 +402,8 @@ namespace System.Security.Cryptography {
 
                        var p = new CspParameters (PROV_RSA_FULL);
                        p.KeyNumber = keyBlob [5] == 0x24 ? AT_SIGNATURE : AT_KEYEXCHANGE;
-#if NET_1_1
                        if (useMachineKeyStore)
                                p.Flags |= CspProviderFlags.UseMachineKeyStore;
-#endif
                        store = new KeyPairPersistence (p);
                }
        }
index 629f5633c2ee2f944bd27844d64d86ddbd2c5e48..3e1c714e375329743cc18ee74609ca001eb415e2 100644 (file)
@@ -51,9 +51,7 @@ namespace System.Security.Permissions {
                
                // Properties
                public string All {
-#if NET_1_1
                        get { throw new NotSupportedException ("All"); }
-#endif
                        set { 
                                read = value; 
                                write = value;
index 857197bda425b584deee603207558872470ab5e7..2ed62c051486a59b29bb8dbde22772152a9c4b51 100644 (file)
@@ -682,10 +682,8 @@ namespace System.Threading {
                }
 #endif
 
-#if NET_1_1
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static void MemoryBarrier ();
-#endif
 
 #if !MOONLIGHT
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -820,8 +818,6 @@ namespace System.Threading {
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                extern private static ThreadState GetState (InternalThread thread);
 
-#if NET_1_1
-               
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                extern public static byte VolatileRead (ref byte address);
                
@@ -910,7 +906,6 @@ namespace System.Threading {
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                extern public static void VolatileWrite (ref UIntPtr address, UIntPtr value);
                
-#endif
 
                static int CheckStackSize (int maxStackSize)
                {
@@ -1049,11 +1044,7 @@ namespace System.Threading {
                [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
                [StrongNameIdentityPermission (SecurityAction.LinkDemand, PublicKey="00000000000000000400000000000000")]
                [Obsolete ("see CompressedStack class")]
-#if NET_1_1
                public
-#else
-               internal
-#endif
                CompressedStack GetCompressedStack ()
                {
                        // Note: returns null if no CompressedStack has been set.
@@ -1069,11 +1060,7 @@ namespace System.Threading {
                [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
                [StrongNameIdentityPermission (SecurityAction.LinkDemand, PublicKey="00000000000000000400000000000000")]
                [Obsolete ("see CompressedStack class")]
-#if NET_1_1
                public
-#else
-               internal
-#endif
                void SetCompressedStack (CompressedStack stack)
                {
                        ExecutionContext.SecurityContext.CompressedStack = stack;
@@ -1081,7 +1068,6 @@ namespace System.Threading {
 
 #endif
 
-#if NET_1_1
                void _Thread.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -1102,6 +1088,5 @@ namespace System.Threading {
                {
                        throw new NotImplementedException ();
                }
-#endif
        }
 }
index 9c570daab6800a86be816d0c49a32f3bd81de855..a160d80863b924a743bdd0636a4d50829054485d 100644 (file)
@@ -186,11 +186,7 @@ namespace MonoTests.System.Collections
                        SortedList list = new SortedList (1000);
                        list.Capacity = new_capacity;
 
-#if NET_1_1
                        Assert.AreEqual (new_capacity, list.Capacity);
-#else
-                       Assert.AreEqual (16, list.Capacity);
-#endif
                }
 
                [Test]
@@ -199,9 +195,6 @@ namespace MonoTests.System.Collections
                        SortedList list = new SortedList (42);
                        Assert.AreEqual (42, list.Capacity, "#1");
                        list.Capacity = 0;
-#if !NET_2_0 // no such expectation as it is broken in .NET 2.0
-                       Assert.AreEqual (16, list.Capacity, "#2");
-#endif
                }
 
                [Test]
index a2d68e2c186f6a679a6c81d29e331289d03693f9..6f681d6712936e5d39e1d3eabf98cb57e6f83549 100644 (file)
@@ -276,14 +276,12 @@ public class AssemblyBuilderTest
                Assert.IsNull (ab.GetDynamicModule ("FOO4"));
        }
 
-#if NET_1_1
        [Test]
        public void TestImageRuntimeVersion ()
        {
                string version = ab.ImageRuntimeVersion;
                Assert.IsTrue (version.Length > 0);
        }
-#endif
 
        [Test]
        public void TestAddResourceFile_Name_Null ()
index 57be788ba273ae1f9136cd238eee5958eb3ad44b..31114c4631301b232c282c1b3fc68c014fd63dae 100644 (file)
@@ -104,10 +104,6 @@ namespace MonoCasTests.System.Reflection {
                public void PartialTrust_PermitOnly_ControlEvidenceFileIOPermission ()
                {
                        at.Corlib_test ();
-#if NET_2_0
-#elif NET_1_1
-                       at.Corlib ();
-#endif
                }
 
                [Test]
index b410b4f827b07a42400a000b71d1ede95ca55a9c..f0df88a89d34e67c89ef21eaf840f0559a7b4375 100644 (file)
@@ -192,7 +192,6 @@ namespace MonoTests.System.Reflection
 
                        // corlib doesn't reference anything
                        Assert.AreEqual (0, corlib.GetReferencedAssemblies ().Length, "GetReferencedAssemblies");
-#if NET_2_0
                        Assert.AreEqual ("mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", corlib.FullName, "FullName");
                        // not really "true" but it's even more trusted so...
                        Assert.IsTrue (corlib.GlobalAssemblyCache, "GlobalAssemblyCache");
@@ -200,11 +199,6 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual ("v2.0.50727", corlib.ImageRuntimeVersion, "ImageRuntimeVersion");
                        Assert.IsFalse (corlib.ReflectionOnly, "ReflectionOnly");
                        Assert.AreEqual (0x1, corlib.ManifestModule.MetadataToken);
-#elif NET_1_1
-                       Assert.IsFalse (corlib.GlobalAssemblyCache, "GlobalAssemblyCache");
-                       Assert.AreEqual ("mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", corlib.FullName, "FullName");
-                       Assert.AreEqual ("v1.1.4322", corlib.ImageRuntimeVersion, "ImageRuntimeVersion");
-#endif
                }
 
                [Test]
index e7e91990b99ce8fc54d0dbfb5eb4942b81a3034c..fc4010bd21cd22d3394c54eb71047e449fbe6a21 100644 (file)
@@ -153,7 +153,6 @@ namespace MonoTests.System.Runtime.CompilerServices {
                        RuntimeHelpers.InitializeArray (new Fielder ().array, rfh);
                }
 
-#if NET_1_1
                public void TestGetHashCode ()
                {
                        Assert.AreEqual (0, RuntimeHelpers.GetHashCode (null));
@@ -182,6 +181,5 @@ namespace MonoTests.System.Runtime.CompilerServices {
                        Assert.IsTrue (RuntimeHelpers.Equals (o1, o3));
                        Assert.IsTrue (!RuntimeHelpers.Equals (o1, o4));
                }
-#endif
        }
 }
index 8845862403b99c15fcb4a8b75279af8aeeae1d24..ed92feba3596a0e74c45281c113e226390afa515 100644 (file)
@@ -6,9 +6,7 @@
 // 
 
 using System;
-#if NET_1_1
-       using System.Net.Sockets;
-#endif
+using System.Net.Sockets;
 using System.Reflection;
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
@@ -190,11 +188,7 @@ namespace MonoTests.System.Runtime.Remoting
                
                // tests the CAO related methods
                [Test]
-#if NET_1_1
                [ExpectedException(typeof(SocketException))]
-#else
-               [ExpectedException(typeof(RemotingException))]
-#endif
                public void RegisterActivatedType()
                {
                        TcpChannel chn = null;
index a3bf9fd4c19923303feaa9e18289b622ea5d4b43..91b39eb832c5434a5a551018b4016e29bcd2afdd 100644 (file)
@@ -1049,7 +1049,6 @@ public class RSACryptoServiceProviderTest {
                Assert.IsTrue ((original != newKeyPair), "Key Pair Deleted");
        }
 
-#if NET_1_1
        [Test]
        public void UseMachineKeyStore_Default ()
        {
@@ -1086,7 +1085,6 @@ public class RSACryptoServiceProviderTest {
                catch (UnauthorizedAccessException) {
                }
        }
-#endif
 
        [Test]
        public void PKCS1 () 
index 8ae3e4119a277b9a7f6f72c6e035d2150c937e7e..133501dd34172aee6781aa664719c22357ab8a14 100644 (file)
@@ -101,7 +101,6 @@ namespace MonoTests.System.Security.Permissions {
                        Assert.AreEqual (envar, p.GetPathList (EnvironmentPermissionAccess.Read), "All=EnvironmentPermission-Read");
                        Assert.AreEqual (envar, p.GetPathList (EnvironmentPermissionAccess.Write), "All=EnvironmentPermission-Write");
                }
-#if NET_1_1
                [Test]
                [ExpectedException (typeof (NotSupportedException))]
                public void All_Get () 
@@ -109,7 +108,7 @@ namespace MonoTests.System.Security.Permissions {
                        EnvironmentPermissionAttribute attr = new EnvironmentPermissionAttribute (SecurityAction.Assert);
                        string s = attr.All;
                }
-#endif
+
                [Test]
                public void Read () 
                {
index 8b54433ea0b9c8e826b7a9846dccae0bed6c196f..ba7470e5cd62569bd974d3edcf37a56d7a801dfc 100644 (file)
@@ -118,7 +118,7 @@ namespace MonoTests.System.Security.Permissions {
                        Assert.AreEqual (filename, p.GetPathList (FileIOPermissionAccess.Read) [0], "All=FileIOPermissionAttribute-Read");
                        Assert.AreEqual (filename, p.GetPathList (FileIOPermissionAccess.Write) [0], "All=FileIOPermissionAttribute-Write");
                }
-#if NET_1_1
+
                [Test]
                [ExpectedException (typeof (NotSupportedException))]
                public void All_Get () 
@@ -126,7 +126,7 @@ namespace MonoTests.System.Security.Permissions {
                        FileIOPermissionAttribute attr = new FileIOPermissionAttribute (SecurityAction.Assert);
                        string s = attr.All;
                }
-#endif
+
                [Test]
                public void Append ()
                {
index e8c51a54373fb448c50ae65cde03e698df89e132..7a4e5644f99874abaef389fff261362ebaeecf6d 100644 (file)
@@ -42,9 +42,7 @@ namespace MonoTests.System.Security.Permissions {
                static SecurityPermissionFlag [] AllFlags = {
                        SecurityPermissionFlag.AllFlags,
                        SecurityPermissionFlag.Assertion,
-#if NET_1_1
                        SecurityPermissionFlag.BindingRedirects,
-#endif
                        SecurityPermissionFlag.ControlAppDomain,
                        SecurityPermissionFlag.ControlDomainPolicy,
                        SecurityPermissionFlag.ControlEvidence,
@@ -62,9 +60,7 @@ namespace MonoTests.System.Security.Permissions {
                static SecurityPermissionFlag [] AllFlagsExceptNoFlags = {
                        SecurityPermissionFlag.AllFlags,
                        SecurityPermissionFlag.Assertion,
-#if NET_1_1
                        SecurityPermissionFlag.BindingRedirects,
-#endif
                        SecurityPermissionFlag.ControlAppDomain,
                        SecurityPermissionFlag.ControlDomainPolicy,
                        SecurityPermissionFlag.ControlEvidence,
@@ -80,9 +76,7 @@ namespace MonoTests.System.Security.Permissions {
 
                static SecurityPermissionFlag [] AllFlagsExceptAllFlags = {
                        SecurityPermissionFlag.Assertion,
-#if NET_1_1
                        SecurityPermissionFlag.BindingRedirects,
-#endif
                        SecurityPermissionFlag.ControlAppDomain,
                        SecurityPermissionFlag.ControlDomainPolicy,
                        SecurityPermissionFlag.ControlEvidence,
index 3e07132ba76bd154210f963584dcd0e6f58bf01c..22b8355d1f1fd7380322a28bdab2eb70cdeda334 100644 (file)
@@ -71,18 +71,20 @@ public class StrongNamePublicKeyBlobTest {
 
                // non standard get hash code - why ???
                Assert.AreEqual (snpkb2.GetHashCode (), snpkb.GetHashCode (), "GetHashCode-0");
-#if NET_2_0
+
                // the first 4 bytes has code has been fixed in 2.0 beta 1
-#elif NET_1_1
-               // It seems to be the first four bytes of the public key data
-               // which seems like non sense as all valid public key will have the same header ?
-               Assert.AreEqual (2359296, snpkb.GetHashCode (), "GetHashCode-1");
-               Assert.AreEqual (2359296, snpkb2.GetHashCode (), "GetHashCode-2");
-               Assert.AreEqual (2989, snpkb3.GetHashCode (), "GetHashCode-3");
-               byte[] header = { 0x00, 0x24, 0x00, 0x00 };
-               StrongNamePublicKeyBlob snpkb4 = new StrongNamePublicKeyBlob (header);
-               Assert.AreEqual (2359296, snpkb4.GetHashCode (), "GetHashCode-4");
-#endif
+
+// Historical data:
+// #elif NET_1_1
+//             // It seems to be the first four bytes of the public key data
+//             // which seems like non sense as all valid public key will have the same header ?
+//             Assert.AreEqual (2359296, snpkb.GetHashCode (), "GetHashCode-1");
+//             Assert.AreEqual (2359296, snpkb2.GetHashCode (), "GetHashCode-2");
+//             Assert.AreEqual (2989, snpkb3.GetHashCode (), "GetHashCode-3");
+//             byte[] header = { 0x00, 0x24, 0x00, 0x00 };
+//             StrongNamePublicKeyBlob snpkb4 = new StrongNamePublicKeyBlob (header);
+//             Assert.AreEqual (2359296, snpkb4.GetHashCode (), "GetHashCode-4");
+// #endif
        }
 }
 
index 69ad39fd694dca670671e8aba1e7df469cdad328..4c84824c912b1a374e9f52263533836562f02f65 100644 (file)
@@ -180,10 +180,8 @@ namespace MonoTests.System.Security.Principal {
 
                        IDeserializationCallback dc = (id as IDeserializationCallback);
                        Assert.IsNotNull (dc, "IDeserializationCallback");
-#if NET_1_1
                        ISerializable s = (id as ISerializable);
                        Assert.IsNotNull (s, "ISerializable");
-#endif
                }
 
                // This is clearly a hack - but I've seen it too many times so I think we