[net_1_0] Finally all of NET_1_0 is gone from the source files

diff --git a/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs b/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs
index 65bb82d8b51c5d8eee3ea8dc6f07c5c166cb401d..b94b43c2514d6ad3f86b0e86ef0de87515fa61c7 100644 (file)
--- a/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs
@@ -49,20 +49,15 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile ("../msfinal.pub")]
 
-#if NET_2_0
-       [assembly: AssemblyTitle ("cscompmgd.dll")]
-       [assembly: AssemblyDefaultAlias ("cscompmgd.dll")]
-       [assembly: AssemblyDescription ("cscompmgd.dll")]
-       [assembly: AssemblyCompany (Consts.MonoCompany)]
-       [assembly: AssemblyProduct (Consts.MonoProduct)]
-       [assembly: AssemblyCopyright (Consts.MonoCopyright)]
-       [assembly: SatelliteContractVersion (Consts.VsVersion)]
-       [assembly: AssemblyInformationalVersion (Consts.VsFileVersion)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-       [assembly: NeutralResourcesLanguage ("en-US")]
-       [assembly: ReliabilityContract (Consistency.MayCorruptProcess, Cer.None)]
-#elif (NET_1_1 || NET_1_0)
-       [assembly: AssemblyDescription ("Managed interface for C# compiler")]
-       [assembly: AssemblyTitle ("Managed C# Compiler")]
-#endif
+[assembly: AssemblyTitle ("cscompmgd.dll")]
+[assembly: AssemblyDefaultAlias ("cscompmgd.dll")]
+[assembly: AssemblyDescription ("cscompmgd.dll")]
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+[assembly: SatelliteContractVersion (Consts.VsVersion)]
+[assembly: AssemblyInformationalVersion (Consts.VsFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: NeutralResourcesLanguage ("en-US")]
+[assembly: ReliabilityContract (Consistency.MayCorruptProcess, Cer.None)]

diff --git a/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs b/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
index e9261c44aa4bff7c3935a8a379c6a4d71791b7f0..0f297530ca6be427ad175f132e3aa526f0142cf1 100644 (file)
--- a/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
+++ b/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
@@ -41,19 +41,15 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile ("../msfinal.pub")]
 
-#if NET_2_0
-       [assembly: AssemblyTitle ("CustomMarshalers.dll")]
-       [assembly: AssemblyDescription ("CustomMarshalers.dll")]
-       [assembly: AssemblyDefaultAlias ("CustomMarshalers.dll")]
-
-       [assembly: AssemblyCompany (Consts.MonoCompany)]
-       [assembly: AssemblyProduct (Consts.MonoProduct)]
-       [assembly: AssemblyCopyright (Consts.MonoCopyright)]
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-
-       [assembly: CLSCompliant (true)]
-       [assembly: ComVisible (false)]
-#elif NET_1_1
-#elif NET_1_0
-#endif
+[assembly: AssemblyTitle ("CustomMarshalers.dll")]
+[assembly: AssemblyDescription ("CustomMarshalers.dll")]
+[assembly: AssemblyDefaultAlias ("CustomMarshalers.dll")]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+
+[assembly: CLSCompliant (true)]
+[assembly: ComVisible (false)]

diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2DataReader.cs b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2DataReader.cs
index aaf3e5c2ada8e5720697a3a04e3b95657056d1ae..a5761603e4d5b5a93b95a041108ea08e76a32a6f 100644 (file)
--- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2DataReader.cs
+++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2/DB2DataReader.cs
@@ -404,7 +404,6 @@ namespace IBM.Data.DB2
 \r
                #region Read\r
 \r
-#if !NET_1_0\r
                public bool HasRows\r
                {\r
                        get\r
@@ -418,7 +417,6 @@ namespace IBM.Data.DB2
                                return hasRows;\r
                        }\r
                }\r
-#endif\r
 \r
                public bool Read()\r
                {\r
@@ -588,19 +586,11 @@ namespace IBM.Data.DB2
                        // TODO: need better implementation for big BLOBs\r
 \r
                        byte[] sourceArray = (byte[])this[col];\r
-#if NET_1_0\r
-                       if(buffer == null)\r
-                       {\r
-                               Array.Copy(sourceArray, (int)fieldOffset, buffer, bufferOffset, length);\r
-                       }\r
-                       return sourceArray.Length;\r
-#else\r
                        if(buffer == null)\r
                        {\r
                                Array.Copy(sourceArray, fieldOffset, buffer, bufferOffset, length);\r
                        }\r
                        return sourceArray.LongLength;\r
-#endif\r
                }\r
                #endregion\r
 \r

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataBindingTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataBindingTests.cs
index 7ad8f4a120403023127b3ebd5a07858bf21d14fb..e0261dc21bb7c26de1b10730fd316b2d82d9f73d 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataBindingTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataBindingTests.cs
@@ -175,11 +175,7 @@ namespace MonoTests.System.Windows.Forms.DataBinding
                        // Console.WriteLine (event_log);
 
                        Assert.AreEqual (
-#if NET_2_0
                                 "0: PositionChanged (to -1)\n1: ItemChanged (index = -1)\n2: PositionChanged (to -1)\n3: CurrentChanged\n4: CurrentItemChanged\n5: ItemChanged (index = -1)\n"
-#else // NET_1_0
-                                "0: PositionChanged (to -1)\n1: ItemChanged (index = -1)\n2: ItemChanged (index = -1)\n"
-#endif
                                 , event_log, "2");
 
                        Assert.AreEqual (0, cm.Count, "3");
@@ -229,18 +225,10 @@ namespace MonoTests.System.Windows.Forms.DataBinding
 
                        Assert.AreEqual (
 
-#if NET_2_0
 #if WITH_BINDINGS
                                 "0: CurrentChanged\n1: CurrentItemChanged\n2: PositionChanged (to 0)\n3: ItemChanged (index = -1)\n4: Binding.Format\n"
 #else
                                 "0: CurrentChanged\n1: CurrentItemChanged\n2: PositionChanged (to 0)\n3: ItemChanged (index = -1)\n"
-#endif
-#else // NET_1_0
-#if WITH_BINDINGS
-                                "0: CurrentChanged\n1: PositionChanged (to 0)\n2: ItemChanged (index = -1)\n3: Binding.Format\n"
-#else
-                                "0: CurrentChanged\n1: PositionChanged (to 0)\n2: ItemChanged (index = -1)\n"
-#endif
 #endif
                                 , event_log, "2");
                }

diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs
index acaa4a3fdd1c117059d3cd9f22f62f46e46851b2..fbe483cbb2572d5d97fb486642d7eb55a06084e8 100644 (file)
--- a/mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs
@@ -57,15 +57,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../mono.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)]

diff --git a/mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs
index 9ebe8b89076593c60e45c7256273554a048ae5ee..891fbfafc56a3e70eec79e2e667dce28c758eb66 100644 (file)
--- a/mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs
@@ -57,15 +57,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../mono.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)]

diff --git a/mcs/class/Mono.Security/Mono.Security.X509/X509Chain.cs b/mcs/class/Mono.Security/Mono.Security.X509/X509Chain.cs
index 027005ca2cb8c5d5220f0b74fd87327ba6eb2336..6edd5feac45daf9370011441f7dc66de3ce02e65 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.X509/X509Chain.cs
+++ b/mcs/class/Mono.Security/Mono.Security.X509/X509Chain.cs
@@ -203,7 +203,7 @@ namespace Mono.Security.X509 {
 
                        // TODO - we should check for CRITICAL but unknown extensions
                        // X509ChainStatusFlags.InvalidExtension
-#if (!NET_1_0 && !INSIDE_CORLIB)
+#if !INSIDE_CORLIB
                        if (ServicePointManager.CheckCertificateRevocationList) {
                                // TODO - check revocation (CRL, OCSP ...)
                                // X509ChainStatusFlags.RevocationStatusUnknown

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
index 97d5e35e768fe3c2695051ec03be1d7e8680a664..ca4f4905c9d161ec62b4401fd101d3cef933e61a 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
@@ -133,23 +133,13 @@ namespace System.Data.Odbc
                }
 
                [OdbcDescriptionAttribute ("Time to wait for command to execute")]
-#if NET_1_0 || ONLY_1_1
-               [DefaultValue (DEFAULT_COMMAND_TIMEOUT)]
-#endif
-               public
-#if NET_2_0
-               override
-#endif
+               public override
                int CommandTimeout {
                        get { return timeout; }
                        set {
                                if (value < 0)
-#if NET_2_0
                                        throw new ArgumentException ("The property value assigned is less than 0.",
                                                "CommandTimeout");
-#else
-                                       throw new ArgumentException ("The property value assigned is less than 0.");
-#endif
                                timeout = value;
                        }
                }

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcInfoMessageEventHandler.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcInfoMessageEventHandler.cs
index 24d45c1c3b938e2c7ad32a22f71f1df9bfe21f85..4849969f1a5dc9be4d220ca3aa7d472be56c8837 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcInfoMessageEventHandler.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcInfoMessageEventHandler.cs
@@ -35,8 +35,5 @@ using System.Data.Common;
 
 namespace System.Data.Odbc
 {
-#if NET_1_0
-       [Serializable]
-#endif
        public delegate void OdbcInfoMessageEventHandler (object sender, OdbcInfoMessageEventArgs e);
 }

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
index 82d148ea0b06568a842a04ed4a0d0bc094bb26ba..2cf99546123cde59e1c2acd9b8e25b6574579f44 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
@@ -76,17 +76,10 @@ namespace System.Data.OleDb
                
                [DataCategory ("Data")]
                [DefaultValue ("")]
-#if NET_1_0 || ONLY_1_1
-               [DataSysDescriptionAttribute ("Information used to connect to a Data Source.")]
-#endif
                [EditorAttribute ("Microsoft.VSDesigner.Data.ADO.Design.OleDbConnectionStringEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
                [RecommendedAsConfigurable (true)]
                [RefreshPropertiesAttribute (RefreshProperties.All)]
-               public
-#if NET_2_0
-               override
-#endif
-               string ConnectionString {
+               public override string ConnectionString {
                        get {
                                if (connectionString == null)
                                        return string.Empty;
@@ -98,27 +91,14 @@ namespace System.Data.OleDb
                }
 
                [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
-               [DataSysDescriptionAttribute ("Current connection timeout value, 'Connect Timeout=X' in the ConnectionString.")]
-#endif
-               public
-#if NET_2_0
-               override
-#endif
-               int ConnectionTimeout {
+               public override int ConnectionTimeout {
                        get {
                                return connectionTimeout;
                        }
                }
 
                [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
-               [DataSysDescriptionAttribute ("Current data source catalog value, 'Initial Catalog=X' in the connection string.")]
-#endif
-               public
-#if NET_2_0
-               override
-#endif
+               public override 
                string Database {
                        get {
                                if (gdaConnection != IntPtr.Zero
@@ -130,17 +110,8 @@ namespace System.Data.OleDb
                        }
                }
 
-#if NET_2_0
                [BrowsableAttribute (true)]
-#else
-               [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-               [DataSysDescriptionAttribute ("Current data source, 'Data Source=X' in the connection string.")]
-#endif
-               public
-#if NET_2_0
-               override
-#endif
-               string DataSource {
+               public override string DataSource {
                        get {
                                if (gdaConnection != IntPtr.Zero
                                        && libgda.gda_connection_is_open (gdaConnection)) {
@@ -152,11 +123,7 @@ namespace System.Data.OleDb
                }
 
                [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if NET_2_0
                [BrowsableAttribute (true)]
-#else
-               [DataSysDescriptionAttribute ("Current OLE DB provider progid, 'Provider=X' in the connection string.")]
-#endif
                public string Provider {
                        get {
                                if (gdaConnection != IntPtr.Zero
@@ -168,16 +135,7 @@ namespace System.Data.OleDb
                        }
                }
 
-#if !NET_2_0
-               [DataSysDescriptionAttribute ("Version of the product accessed by the OLE DB Provider.")]
-               [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-               [BrowsableAttribute (false)]
-#endif
-               public
-#if NET_2_0
-               override
-#endif
-               string ServerVersion {
+               public override string ServerVersion {
                        get {
                                if (State == ConnectionState.Closed)
                                        throw ExceptionHelper.ConnectionClosed ();
@@ -186,15 +144,8 @@ namespace System.Data.OleDb
                }
 
                [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#if !NET_2_0
-               [DataSysDescriptionAttribute ("The ConnectionState indicating whether the connection is open or closed.")]
-#endif
                [BrowsableAttribute (false)]
-               public
-#if NET_2_0
-               override
-#endif
-               ConnectionState State {
+               public override ConnectionState State {
                        get {
                                if (gdaConnection != IntPtr.Zero) {
                                        if (libgda.gda_connection_is_open (gdaConnection))
@@ -229,7 +180,6 @@ namespace System.Data.OleDb
                        return new OleDbTransaction (this, isolationLevel);
                }
 
-#if NET_2_0
                protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel)
                {
                        return BeginTransaction (isolationLevel);
@@ -239,28 +189,8 @@ namespace System.Data.OleDb
                {
                        return CreateCommand ();
                }
-#else
-               IDbTransaction IDbConnection.BeginTransaction ()
-               {
-                       return BeginTransaction ();
-               }
 
-               IDbTransaction IDbConnection.BeginTransaction (IsolationLevel isolationLevel)
-               {
-                       return BeginTransaction (isolationLevel);
-               }
-
-               IDbCommand IDbConnection.CreateCommand ()
-               {
-                       return CreateCommand ();
-               }
-#endif
-
-               public
-#if NET_2_0
-               override
-#endif
-               void ChangeDatabase (string value)
+               public override void ChangeDatabase (string value)
                {
                        if (State != ConnectionState.Open)
                                throw new InvalidOperationException ();
@@ -269,11 +199,7 @@ namespace System.Data.OleDb
                                throw new OleDbException (this);
                }
 
-               public
-#if NET_2_0
-               override
-#endif
-               void Close ()
+               public override void Close ()
                {
                        if (State == ConnectionState.Open) {
                                libgda.gda_connection_close (gdaConnection);

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
index dfbc9f347405f1c23887d2fca2a441e2051f82cf..542c84d8dc7f348d00897efd826cc5df5daea275 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
@@ -102,12 +102,7 @@ namespace System.Data.OleDb
                        }
                }
 
-#if NET_1_0 || ONLY_1_1
-               override
-#else
-               new
-#endif
-               public string Message {
+               new public string Message {
                        get {
                                GdaList glist;
                                IntPtr errors;
@@ -129,12 +124,7 @@ namespace System.Data.OleDb
                        }
                }
 
-#if NET_1_0 || ONLY_1_1
-               override
-#else
-               new
-#endif
-               public string Source {
+               new public string Source {
                        get {
                                GdaList glist;
                                IntPtr errors;

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
index 2f860ddd10c29a8dd93643a702f44cd4aec282f3..4cf4df0f4bb33e22b45fd40503e17b8b2dec1bad 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
@@ -135,18 +135,11 @@ namespace System.Data.SqlClient
 
                #region Properties
 
-#if NET_1_0 || ONLY_1_1
-               [DataSysDescription ("Information used to connect to a DataSource, such as 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'.")]
-#endif
                [DefaultValue ("")]
                [EditorAttribute ("Microsoft.VSDesigner.Data.SQL.Design.SqlConnectionStringEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
                [RecommendedAsConfigurable (true)]
                [RefreshProperties (RefreshProperties.All)]
-               public
-#if NET_2_0
-               override
-#endif // NET_2_0
-               string ConnectionString {
+               public override string ConnectionString {
                        get {
                                if (connectionString == null)
                                        return string.Empty;
@@ -1737,9 +1730,6 @@ namespace System.Data.SqlClient
 
                #region Properties Net 2
 
-#if NET_1_0
-               [DataSysDescription ("Enable Asynchronous processing, 'Asynchrouse Processing=true/false' in the ConnectionString.")]   
-#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                internal bool AsyncProcessing  {
                        get { return async; }

diff --git a/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs b/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
index 0746e9b617cad002ea2686e31dcd5c1259b22b2c..896c001af77b34cac6fc7942628481052d85fe76 100644 (file)
--- a/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
@@ -47,16 +47,8 @@ using System.Runtime.InteropServices;
        [assembly: AssemblyKeyFile ("../msfinal.pub")]
 #endif
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: AllowPartiallyTrustedCallers]
-       [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-       [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: AllowPartiallyTrustedCallers]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]

diff --git a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
index a4a6cfb7542b791df1e1d9641ecb99cd69b1e725..2f10c8eb86b24834c9b9088e92835bbd1695ba49 100644 (file)
--- a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
@@ -56,14 +56,6 @@ using System.Diagnostics;
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-#elif NET_1_1
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-#elif NET_1_0
-       [assembly: AssemblyTrademark ("")]
-       [assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]