[bcl] Remove ONLY_1_1 defines from class libs

This is not used anymore.

mcs/class/System.Data/System.Data.Common/DataAdapter.cs

@@ -43,9 +43,6 @@ namespace System.Data.Common
 	/// Represents a set of data commands and a database connection that are used to fill the DataSet and update the data source.
 	/// </summary>
 	public
-#if ONLY_1_1
-	abstract
-#endif
 	class DataAdapter : Component, IDataAdapter
 	{
 		#region Fields

mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs

@@ -648,9 +648,6 @@ namespace System.Data.Common
 				try {
 					if (command != null) {
 						DataColumnMappingCollection columnMappings = tableMapping.ColumnMappings;
-#if ONLY_1_1
-						IDataParameter nullCheckParam = null;
-#endif
 						foreach (IDataParameter parameter in command.Parameters) {
 							if ((parameter.Direction & ParameterDirection.Input) == 0)
 								continue;

mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs

@@ -150,16 +150,6 @@ namespace System.Data.Odbc
 			}
 		}
 
-#if ONLY_1_1
-		[OdbcCategory ("Behavior")]
-		[OdbcDescriptionAttribute ("Connection used by the command")]
-		[DefaultValue (null)]
-		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public OdbcConnection Connection {
-			get { return connection; }
-			set { connection = value; }
-		}
-#endif // ONLY_1_1
 
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
@@ -186,11 +176,7 @@ namespace System.Data.Odbc
 		new
 		OdbcParameterCollection Parameters {
 			get {
-#if ONLY_1_1
-				return _parameters;
-#else
 				return base.Parameters as OdbcParameterCollection;
-#endif // ONLY_1_1
 			}
 		}
 		
@@ -223,38 +209,14 @@ namespace System.Data.Odbc
 		}
 
 
-#if ONLY_1_1
-		IDbConnection IDbCommand.Connection {
-			get { return Connection; }
-			set { Connection = (OdbcConnection) value; }
-		}
-
-		IDataParameterCollection IDbCommand.Parameters {
-			get { return Parameters; }
-		}
-#else
 		protected override DbParameterCollection DbParameterCollection {
 			get { return _parameters as DbParameterCollection;}
 		}
-#endif // NET_2_0
 
-#if ONLY_1_1
-		IDbTransaction IDbCommand.Transaction {
-			get { return (IDbTransaction) Transaction; }
-			set {
-				if (value is OdbcTransaction) {
-					Transaction = (OdbcTransaction) value;
-				} else {
-					throw new ArgumentException ();
-				}
-			}
-		}
-#else
 		protected override DbTransaction DbTransaction {
 			get { return transaction; }
 			set { transaction = (OdbcTransaction) value; }
 		}
-#endif // ONLY_1_1
 
 		#endregion // Properties
 
@@ -272,18 +234,10 @@ namespace System.Data.Odbc
 				throw new InvalidOperationException ();
 		}
 
-#if ONLY_1_1
-		IDbDataParameter IDbCommand.CreateParameter ()
-		{
-			return CreateParameter ();
-		}
-
-#else
 		protected override DbParameter CreateDbParameter ()
 		{
 			return CreateParameter ();
 		}
-#endif // ONLY_1_1
 
 		public new OdbcParameter CreateParameter ()
 		{
@@ -463,17 +417,10 @@ namespace System.Data.Odbc
 			return ExecuteReader (CommandBehavior.Default);
 		}
 
-#if ONLY_1_1
-		IDataReader IDbCommand.ExecuteReader ()
-		{
-			return ExecuteReader ();
-		}
-#else
 		protected override DbDataReader ExecuteDbDataReader (CommandBehavior behavior)
 		{
 			return ExecuteReader (behavior);
 		}
-#endif // ONLY_1_1
 
 		public
 		new
@@ -489,12 +436,6 @@ namespace System.Data.Odbc
 			return dataReader;
 		}
 
-#if ONLY_1_1
-		IDataReader IDbCommand.ExecuteReader (CommandBehavior behavior)
-		{
-			return ExecuteReader (behavior);
-		}
-#endif // ONLY_1_1
 
 		public
 		override

mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs

@@ -47,10 +47,6 @@ namespace System.Data.Odbc
 		#region Fields
 
 		private OdbcDataAdapter _adapter;
-#if ONLY_1_1
-		private string 			_quotePrefix;
-		private string 			_quoteSuffix;
-#endif
 
 		private DataTable		_schema;
 		private string			_tableName;
@@ -139,45 +135,6 @@ namespace System.Data.Odbc
 			}
 		}
 
-#if ONLY_1_1
-		[BrowsableAttribute (false)]
-		[OdbcDescriptionAttribute ("The prefix string wrapped around sql objects")]
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-		public string QuotePrefix {
-			get {
-				if (_quotePrefix == null)
-					return string.Empty;
-				return _quotePrefix;
-			}
-			set {
-				if (IsCommandGenerated)
-					throw new InvalidOperationException (
-						"QuotePrefix cannot be set after " +
-						"an Insert, Update or Delete command " +
-						"has been generated.");
-				_quotePrefix = value;
-			}
-		}
-
-		[BrowsableAttribute (false)]
-		[OdbcDescriptionAttribute ("The suffix string wrapped around sql objects")]
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-		public string QuoteSuffix {
-			get {
-				if (_quoteSuffix == null)
-					return string.Empty;
-				return _quoteSuffix;
-			}
-			set {
-				if (IsCommandGenerated)
-					throw new InvalidOperationException (
-						"QuoteSuffix cannot be set after " +
-						"an Insert, Update or Delete command " +
-						"has been generated.");
-				_quoteSuffix = value;
-			}
-		}
-#endif
 
 		#endregion // Properties
 
@@ -189,11 +146,7 @@ namespace System.Data.Odbc
 			throw new NotImplementedException ();
 		}
 
-#if ONLY_1_1
-		protected override
-#else
 		new
-#endif
 		void Dispose (bool disposing)
 		{
 			if (_disposed)
@@ -486,11 +439,7 @@ namespace System.Data.Odbc
 			return CreateDeleteCommand (useColumnsForParameterNames);
 		}
 
-#if ONLY_1_1
-		public
-#else
 		new
-#endif // NET_2_0
 		void RefreshSchema ()
 		{
 			// creates metadata

mcs/class/System.Data/System.Data.Odbc/OdbcConnection.cs

@@ -198,12 +198,6 @@ namespace System.Data.Odbc
 			return BeginTransaction (IsolationLevel.Unspecified);
 		}
 
-#if ONLY_1_1
-		IDbTransaction IDbConnection.BeginTransaction ()
-		{
-			return (IDbTransaction) BeginTransaction ();
-		}
-#endif // ONLY_1_1
 
 		protected override DbTransaction BeginDbTransaction (IsolationLevel isolationLevel)
 		{
@@ -224,12 +218,6 @@ namespace System.Data.Odbc
 				throw new InvalidOperationException ();
 		}
 
-#if ONLY_1_1
-		IDbTransaction IDbConnection.BeginTransaction (IsolationLevel isolevel)
-		{
-			return (IDbTransaction) BeginTransaction (isolevel);
-		}
-#endif // ONLY_1_1
 
 		public
 		override
@@ -317,12 +305,6 @@ namespace System.Data.Odbc
 			throw new NotImplementedException ();
 		}
 
-#if ONLY_1_1
-		IDbCommand IDbConnection.CreateCommand ()
-		{
-			return (IDbCommand) CreateCommand ();
-		}
-#endif //ONLY_1_1
 
 		protected override DbCommand CreateDbCommand ()
 		{
@@ -489,12 +471,7 @@ namespace System.Data.Odbc
 
 		private void RaiseStateChange (ConnectionState from, ConnectionState to)
 		{
-#if ONLY_1_1
-			if (StateChange != null)
-				StateChange (this, new StateChangeEventArgs (from, to));
-#else
 			base.OnStateChange (new StateChangeEventArgs (from, to));
-#endif
 		}
 
 		private OdbcInfoMessageEventArgs CreateOdbcInfoMessageEvent (OdbcErrorCollection errors)
@@ -590,11 +567,6 @@ namespace System.Data.Odbc
 
 		#region Events and Delegates
 
-#if ONLY_1_1
-		[OdbcDescription ("DbConnection_StateChange")]
-		[OdbcCategory ("DataCategory_StateChange")]
-		public event StateChangeEventHandler StateChange;
-#endif // ONLY_1_1
 
 		[OdbcDescription ("DbConnection_InfoMessage")]
 		[OdbcCategory ("DataCategory_InfoMessage")]

mcs/class/System.Data/System.Data.Odbc/OdbcDataAdapter.cs

@@ -47,9 +47,6 @@ namespace System.Data.Odbc
 	{
 		#region Fields
 
-#if ONLY_1_1
-		bool disposed;
-#endif
 		OdbcCommand deleteCommand;
 		OdbcCommand insertCommand;
 		OdbcCommand selectCommand;
@@ -153,19 +150,6 @@ namespace System.Data.Odbc
 			return new OdbcRowUpdatingEventArgs (dataRow, command, statementType, tableMapping);
 		}
 
-#if ONLY_1_1
-		protected override void Dispose (bool disposing)
-		{
-			if (!disposed) {
-				if (disposing) {
-					// Release managed resources
-				}
-				// Release unmanaged resources
-				disposed = true;
-			}
-			base.Dispose (true);
-		}
-#endif
 
 		protected override void OnRowUpdated (RowUpdatedEventArgs value)
 		{

mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs

@@ -222,12 +222,6 @@ namespace System.Data.Odbc
 				this.command.Connection.Close ();
 		}
 
-#if ONLY_1_1
-		~OdbcDataReader ()
-		{
-			this.Dispose (false);
-		}
-#endif
 
 		public 
 		override
@@ -336,9 +330,6 @@ namespace System.Data.Odbc
 
 		[MonoTODO]
 		[EditorBrowsableAttribute (EditorBrowsableState.Never)]
-#if ONLY_1_1
-		public
-#endif
 		new
 		IDataReader GetData (int i)
 		{
@@ -829,18 +820,6 @@ namespace System.Data.Odbc
 			return numValues;
 		}
 
-#if ONLY_1_1
-		void IDisposable.Dispose ()
-		{
-			Dispose (true);
-			GC.SuppressFinalize (this);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return new DbEnumerator (this);
-		}
-#endif // ONLY_1_1
 
 		public override IEnumerator GetEnumerator ()
 		{

mcs/class/System.Data/System.Data.Odbc/OdbcParameter.cs

@@ -136,11 +136,6 @@ namespace System.Data.Odbc
 			set { container = value; }
 		}
 
-#if ONLY_1_1
-		[BrowsableAttribute (false)]
-		[RefreshPropertiesAttribute (RefreshProperties.All)]
-		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
-#endif
 		[OdbcCategory ("Data")]
 		[OdbcDescriptionAttribute ("The parameter generic type")]
 		public
@@ -165,12 +160,6 @@ namespace System.Data.Odbc
 			set { direction = value; }
 		}
 
-#if ONLY_1_1
-		[BrowsableAttribute (false)]
-		[DesignOnlyAttribute (true)]
-		[EditorBrowsableAttribute (EditorBrowsableState.Advanced)]
-		[DefaultValue (false)]
-#endif
 		[OdbcDescriptionAttribute ("A design-time property used for strongly typed code generation")]
 		public
 		override
@@ -195,9 +184,6 @@ namespace System.Data.Odbc
 		}
 
 		[OdbcDescription ("DataParameter_ParameterName")]
-#if ONLY_1_1
-		[DefaultValue ("")]
-#endif
 		public 
 		override
 		string ParameterName {
@@ -223,9 +209,6 @@ namespace System.Data.Odbc
 		
 		[OdbcDescription ("DbDataParameter_Size")]
 		[OdbcCategory ("DataCategory_Data")]
-#if ONLY_1_1
-		[DefaultValue (0)]
-#endif
 		public
 		override
 		int Size {
@@ -235,9 +218,6 @@ namespace System.Data.Odbc
 
 		[OdbcDescription ("DataParameter_SourceColumn")]
 		[OdbcCategory ("DataCategory_Data")]
-#if ONLY_1_1
-		[DefaultValue ("")]
-#endif
 		public
 		override
 		string SourceColumn {
@@ -247,9 +227,6 @@ namespace System.Data.Odbc
 		
 		[OdbcDescription ("DataParameter_SourceVersion")]
 		[OdbcCategory ("DataCategory_Data")]
-#if ONLY_1_1
-		[DefaultValue ("Current")]
-#endif
 		public
 		override
 		DataRowVersion SourceVersion {
@@ -260,11 +237,7 @@ namespace System.Data.Odbc
 		[TypeConverter (typeof(StringConverter))]
 		[OdbcDescription ("DataParameter_Value")]
 		[OdbcCategory ("DataCategory_Data")]
-#if ONLY_1_1
-		[DefaultValue (null)]
-#else
 		[RefreshPropertiesAttribute (RefreshProperties.All)]
-#endif
 		public
 		override
 		object Value {

mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs

@@ -61,10 +61,6 @@ namespace System.Data.Odbc
 	
 		#region Properties
 
-#if ONLY_1_1
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-#endif
 		public
 		override
 		int Count {
@@ -94,54 +90,22 @@ namespace System.Data.Odbc
 			}
 		}
 
-#if ONLY_1_1
-		bool IList.IsFixedSize {
-#else
 		public override bool IsFixedSize {
-#endif
 			get { return false; }
 		}
 
-#if ONLY_1_1
-		bool IList.IsReadOnly {
-#else
 		public override bool IsReadOnly {
-#endif
 			get { return false; }
 		}
 
-#if ONLY_1_1
-		bool ICollection.IsSynchronized {
-#else
 		public override bool IsSynchronized {
-#endif
 			get { return list.IsSynchronized; }
 		}
 
-#if ONLY_1_1
-		object ICollection.SyncRoot {
-#else
 		public override object SyncRoot {
-#endif
 			get { return list.SyncRoot; }
 		}
 		
-#if ONLY_1_1
-		object IList.this [int index] {
-			get { return list [index]; }
-			set { list [index] = value; }
-		}
-
-		object IDataParameterCollection.this [string index]
-		{
-			get { return this [index]; }
-			set {
-				if (!(value is OdbcParameter))
-					throw new InvalidCastException ("Only OdbcParameter objects can be used.");
-				this [index] = (OdbcParameter) value;
-			}
-		}
-#endif // ONLY_1_1
 
 		#endregion // Properties
 

mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs

@@ -174,9 +174,6 @@ namespace System.Data.OleDb
 		}
 
 		[DataCategory ("Data")]
-#if ONLY_1_1
-		[DataSysDescriptionAttribute ("The parameters collection.")]
-#endif
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Content)]
 		public new OleDbParameterCollection Parameters {
 			get { return parameters; }
@@ -184,9 +181,6 @@ namespace System.Data.OleDb
 		}
 
 		[BrowsableAttribute (false)]
-#if ONLY_1_1
-		[DataSysDescriptionAttribute ("The transaction used by the command.")]
-#endif
 		[DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
 		public new OleDbTransaction Transaction {
 			get {

mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs

@@ -47,17 +47,6 @@ namespace System.Data.OleDb
 		#region Fields
 
 		OleDbDataAdapter adapter;
-#if ONLY_1_1
-		string quotePrefix;
-		string quoteSuffix;
-		private DataTable		_schema;
-		private string			_tableName;
-		private OleDbCommand	_insertCommand;
-		private OleDbCommand	_updateCommand;
-		private OleDbCommand	_deleteCommand;
-
-		bool _disposed;
-#endif
 		#endregion // Fields
 
 		#region Constructors
@@ -119,26 +108,6 @@ namespace System.Data.OleDb
 			throw new NotImplementedException ();
 		}
 
-#if ONLY_1_1
-		protected override void Dispose (bool disposing)
-		{
-			if (_disposed)
-				return;
-			
-			if (disposing) {
-				// dispose managed resource
-				if (_insertCommand != null) _insertCommand.Dispose ();
-				if (_updateCommand != null) _updateCommand.Dispose ();
-				if (_deleteCommand != null) _deleteCommand.Dispose ();
-
-				_insertCommand = null;
-				_updateCommand = null;
-				_deleteCommand = null;
-				_schema = null;
-			}
-			_disposed = true;
-		}
-#endif
 
 		[MonoTODO]
 		public new OleDbCommand GetDeleteCommand ()

mcs/class/System.Data/System.Data.OleDb/OleDbDataReader.cs

@@ -769,11 +769,6 @@ namespace System.Data.OleDb
 			Dispose (true);
 		}
 
-#if ONLY_1_1
-		~OleDbDataReader () {
-			Dispose (false);
-		}
-#endif
 		#endregion // Destructors
 	}
 }

mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs

@@ -62,10 +62,6 @@ namespace System.Data.OleDb
 	
 		#region Properties
 
-#if ONLY_1_1
-		[Browsable (false)]
-		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-#endif
 		public
 		override
 		int Count {

mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs

@@ -159,13 +159,6 @@ namespace System.Data.OleDb
 			isOpen = false;
 		}
 
-#if ONLY_1_1
-		~OleDbTransaction ()
-		{
-			libgda.FreeObject (gdaTransaction);
-			gdaTransaction = IntPtr.Zero;
-		}
-#endif
 
 		protected override
 		void Dispose (bool disposing)

mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs

@@ -182,10 +182,6 @@ namespace System.Data.SqlClient {
 			get { return connection; }
 			set
 			{
-#if ONLY_1_1
-				if (connection != null && connection.DataReader != null)
-					throw new InvalidOperationException ("The connection is busy fetching data.");
-#endif
 				connection = value;
 			}
 		}
@@ -223,10 +219,6 @@ namespace System.Data.SqlClient {
 			}
 			set
 			{
-#if ONLY_1_1
-				if (connection != null && connection.DataReader != null)
-					throw new InvalidOperationException ("The connection is busy fetching data.");
-#endif
 				transaction = value;
 			}
 		}

mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs

@@ -45,26 +45,9 @@ namespace System.Data.SqlClient
 	{
 		#region Fields
 
-#if ONLY_1_1
-		bool disposed;
-
-		DataTable dbSchemaTable;
-		string quotePrefix;
-		string quoteSuffix;
-		string tableName;
-		SqlDataAdapter adapter;
-		SqlCommand insertCommand;
-		SqlCommand deleteCommand;
-		SqlCommand updateCommand;
-		// Used to construct WHERE clauses
-		static readonly string clause1 = "({0} = 1 AND {1} IS NULL)";
-		static readonly string clause2 = "({0} = {1})";
-
-#else
 		readonly string _catalogSeparator = ".";
 		readonly string _schemaSeparator = ".";
 		readonly CatalogLocation _catalogLocation = CatalogLocation.Start;
-#endif
 	
 		#endregion // Fields
 
@@ -89,22 +72,9 @@ namespace System.Data.SqlClient
 		[DefaultValue (null)]
 		public new SqlDataAdapter DataAdapter {
 			get { 
-#if ONLY_1_1
-				return adapter;
-#else
 				return (SqlDataAdapter)base.DataAdapter;
-#endif
 			} set {
-#if ONLY_1_1
-               if (adapter != null)
-                       adapter.RowUpdating -= new SqlRowUpdatingEventHandler (RowUpdatingHandler);
-
-               adapter = value; 
-               if (adapter != null)
-                       adapter.RowUpdating += new SqlRowUpdatingEventHandler (RowUpdatingHandler);
-#else
 				base.DataAdapter = value;
-#endif
 			}
 		}
 
@@ -115,30 +85,14 @@ namespace System.Data.SqlClient
 		override
 		string QuotePrefix {
 			get {
-#if ONLY_1_1
-				if (quotePrefix == null)
-					return string.Empty;
-				return quotePrefix;
-#else
 				return base.QuotePrefix;
-#endif
 			}
 			set {
-#if ONLY_1_1
-				if (dbSchemaTable != null)
-					throw new InvalidOperationException (
-						"The QuotePrefix and QuoteSuffix " +
-						"properties cannot be changed once " +
-						"an Insert, Update, or Delete " +
-						"command has been generated.");
-				quotePrefix = value;
-#else
 				if (value != "[" && value != "\"")
 					throw new ArgumentException ("Only '[' " +
 						"and '\"' are allowed as value " +
 						"for the 'QuoteSuffix' property.");
 				base.QuotePrefix = value;
-#endif
 			}
 		}
 
@@ -149,30 +103,14 @@ namespace System.Data.SqlClient
 		override
 		string QuoteSuffix {
 			get {
-#if ONLY_1_1
-				if (quoteSuffix == null)
-					return string.Empty;
-				return quoteSuffix;
-#else
 				return base.QuoteSuffix;
-#endif
 			}
 			set {
-#if ONLY_1_1
-				if (dbSchemaTable != null)
-					throw new InvalidOperationException (
-						"The QuotePrefix and QuoteSuffix " +
-						"properties cannot be changed once " +
-						"an Insert, Update, or Delete " +
-						"command has been generated.");
-				quoteSuffix = value;
-#else
 				if (value != "]" && value != "\"")
 					throw new ArgumentException ("Only ']' " +
 						"and '\"' are allowed as value " +
 						"for the 'QuoteSuffix' property.");
 				base.QuoteSuffix = value;
-#endif
 			}
 		}
 
@@ -219,344 +157,17 @@ namespace System.Data.SqlClient
 		}
 
 
-#if ONLY_1_1
-		private SqlCommand SourceCommand {
-			get {
-				if (adapter != null)
-					return adapter.SelectCommand;
-				return null;
-			}
-		}
-#endif
 
 		#endregion // Properties
 
 		#region Methods
 
-#if ONLY_1_1
-		private void BuildCache (bool closeConnection)
-		{
-			SqlCommand sourceCommand = SourceCommand;
-			if (sourceCommand == null)
-				throw new InvalidOperationException ("The DataAdapter.SelectCommand property needs to be initialized.");
-			SqlConnection connection = sourceCommand.Connection;
-			if (connection == null)
-				throw new InvalidOperationException ("The DataAdapter.SelectCommand.Connection property needs to be initialized.");
-
-			if (dbSchemaTable == null) {
-				if (connection.State == ConnectionState.Open)
-					closeConnection = false;
-				else
-					connection.Open ();
-
-				SqlDataReader reader = sourceCommand.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo);
-				dbSchemaTable = reader.GetSchemaTable ();
-				reader.Close ();
-				if (closeConnection)
-					connection.Close ();
-				BuildInformation (dbSchemaTable);
-			}
-		}
-		
-		private void BuildInformation (DataTable schemaTable)
-		{
-			tableName = String.Empty;
-			foreach (DataRow schemaRow in schemaTable.Rows) {
-				if (schemaRow.IsNull ("BaseTableName") ||
-				    (string) schemaRow ["BaseTableName"] == String.Empty)
-					continue;
-
-				if (tableName == String.Empty) 
-					tableName = (string) schemaRow ["BaseTableName"];
-				else if (tableName != (string) schemaRow["BaseTableName"])
-					throw new InvalidOperationException ("Dynamic SQL generation is not supported against multiple base tables.");
-			}
-			if (tableName == String.Empty)
-				throw new InvalidOperationException ("Dynamic SQL generation is not supported with no base table.");
-			dbSchemaTable = schemaTable;
-		}
-
-		private SqlCommand CreateDeleteCommand (bool useColumnsForParameterNames)
-		{
-			// If no table was found, then we can't do an delete
-			if (QuotedTableName == String.Empty)
-				return null;
-
-			CreateNewCommand (ref deleteCommand);
-
-			string command = String.Format ("DELETE FROM  {0}", QuotedTableName);
-			StringBuilder whereClause = new StringBuilder ();
-			bool keyFound = false;
-			int parmIndex = 1;
-
-			foreach (DataRow schemaRow in dbSchemaTable.Rows) {
-				if ((bool)schemaRow["IsExpression"] == true)
-					continue;
-				if (!IncludedInWhereClause (schemaRow)) 
-					continue;
-
-				if (whereClause.Length > 0) 
-					whereClause.Append (" AND ");
-
-				bool isKey = (bool) schemaRow ["IsKey"];
-				SqlParameter parameter = null;
-
-				if (isKey)
-					keyFound = true;
-
-				bool allowNull = (bool) schemaRow ["AllowDBNull"];
-				if (!isKey) {
-					string sourceColumnName = (string) schemaRow ["BaseColumnName"];
-					if (useColumnsForParameterNames) {
-						parameter = deleteCommand.Parameters.Add (
-							GetNullCheckParameterName (sourceColumnName),
-							SqlDbType.Int);
-					} else {
-						parameter = deleteCommand.Parameters.Add (
-							GetParameterName (parmIndex++),
-							SqlDbType.Int);
-					}
-					parameter.IsNullable = allowNull;
-					parameter.SourceVersion = DataRowVersion.Current;
-					parameter.Value = 1;
-
-					whereClause.Append ("(");
-					whereClause.Append (String.Format (clause1, parameter.ParameterName,
-									GetQuotedString (sourceColumnName)));
-					whereClause.Append (" OR ");
-				}
-
-				if (useColumnsForParameterNames)
-					parameter = CreateParameter (schemaRow, true);
-				else
-					parameter = CreateParameter (parmIndex++, schemaRow);
-				deleteCommand.Parameters.Add (parameter);
-				ApplyParameterInfo (parameter, schemaRow, StatementType.Delete, true);
-				parameter.IsNullable = allowNull;
-				parameter.SourceVersion = DataRowVersion.Original;
-
-				whereClause.Append (String.Format (clause2, GetQuotedString (parameter.SourceColumn), parameter.ParameterName));
-
-				if (!isKey)
-					whereClause.Append (")");
-			}
-			if (!keyFound)
-				throw new InvalidOperationException ("Dynamic SQL generation for the DeleteCommand is not supported against a SelectCommand that does not return any key column information.");
-
-			// We're all done, so bring it on home
-			string sql = String.Format ("{0} WHERE ( {1} )", command, whereClause.ToString ());
-			deleteCommand.CommandText = sql;
-			return deleteCommand;
-		}
-
-		private SqlCommand CreateInsertCommand (bool useColumnsForParameterNames)
-		{
-			if (QuotedTableName == String.Empty)
-				return null;
-
-			CreateNewCommand (ref insertCommand);
-
-			string command = String.Format ("INSERT INTO {0}", QuotedTableName);
-			string sql;
-			StringBuilder columns = new StringBuilder ();
-			StringBuilder values = new StringBuilder ();
-
-			int parmIndex = 1;
-			foreach (DataRow schemaRow in dbSchemaTable.Rows) {
-				if (!IncludedInInsert (schemaRow))
-					continue;
-
-				if (parmIndex > 1) {
-					columns.Append (" , ");
-					values.Append (" , ");
-				}
-
-				SqlParameter parameter = null;
-				if (useColumnsForParameterNames) {
-					parameter = CreateParameter (schemaRow, false);
-				} else {
-					parameter = CreateParameter (parmIndex, schemaRow);
-				}
-
-				insertCommand.Parameters.Add (parameter);
-				ApplyParameterInfo (parameter, schemaRow, StatementType.Insert, false);
-				parameter.SourceVersion = DataRowVersion.Current;
-				parameter.IsNullable = (bool) schemaRow ["AllowDBNull"];
-
-				columns.Append (GetQuotedString (parameter.SourceColumn));
-				values.Append (parameter.ParameterName);
-
-				parmIndex++;
-			}
-
-			sql = String.Format ("{0}( {1} ) VALUES ( {2} )", command, columns.ToString (), values.ToString ());
-			insertCommand.CommandText = sql;
-			return insertCommand;
-		}
-
-		private void CreateNewCommand (ref SqlCommand command)
-		{
-			SqlCommand sourceCommand = SourceCommand;
-			if (command == null) {
-				command = sourceCommand.Connection.CreateCommand ();
-				command.CommandTimeout = sourceCommand.CommandTimeout;
-				command.Transaction = sourceCommand.Transaction;
-			}
-			command.CommandType = CommandType.Text;
-			command.UpdatedRowSource = UpdateRowSource.None;
-			command.Parameters.Clear ();
-		}
-
-		private SqlCommand CreateUpdateCommand (bool useColumnsForParameterNames)
-		{
-			// If no table was found, then we can't do an update
-			if (QuotedTableName == String.Empty)
-				return null;
-
-			CreateNewCommand (ref updateCommand);
-
-			string command = String.Format ("UPDATE {0} SET ", QuotedTableName);
-			StringBuilder columns = new StringBuilder ();
-			StringBuilder whereClause = new StringBuilder ();
-			int parmIndex = 1;
-			bool keyFound = false;
-
-			// First, create the X=Y list for UPDATE
-			foreach (DataRow schemaRow in dbSchemaTable.Rows) {
-				if (!IncludedInUpdate (schemaRow))
-					continue;
-				if (columns.Length > 0)
-					columns.Append (" , ");
-
-				SqlParameter parameter = null;
-				if (useColumnsForParameterNames) {
-					parameter = CreateParameter (schemaRow, false);
-				} else {
-					parameter = CreateParameter (parmIndex++, schemaRow);
-				}
-				updateCommand.Parameters.Add (parameter);
-				ApplyParameterInfo (parameter, schemaRow, StatementType.Update, false);
-				parameter.IsNullable = (bool) schemaRow ["AllowDBNull"];
-				parameter.SourceVersion = DataRowVersion.Current;
-
-				columns.Append (String.Format ("{0} = {1}", GetQuotedString (parameter.SourceColumn), parameter.ParameterName));
-			}
-
-			// Now, create the WHERE clause.  This may be optimizable, but it would be ugly to incorporate
-			// into the loop above.  "Premature optimization is the root of all evil." -- Knuth
-			foreach (DataRow schemaRow in dbSchemaTable.Rows) {
-				if ((bool)schemaRow["IsExpression"] == true)
-					continue;
-
-				if (!IncludedInWhereClause (schemaRow)) 
-					continue;
-
-				if (whereClause.Length > 0) 
-					whereClause.Append (" AND ");
-
-				bool isKey = (bool) schemaRow ["IsKey"];
-				SqlParameter parameter = null;
-
-				if (isKey)
-					keyFound = true;
-
-				bool allowNull = (bool) schemaRow ["AllowDBNull"];
-				if (!isKey) {
-					string sourceColumnName = (string) schemaRow ["BaseColumnName"];
-					if (useColumnsForParameterNames) {
-						parameter = updateCommand.Parameters.Add (
-							GetNullCheckParameterName (sourceColumnName),
-							SqlDbType.Int);
-					} else {
-						parameter = updateCommand.Parameters.Add (
-							GetParameterName (parmIndex++),
-							SqlDbType.Int);
-					}
-					parameter.IsNullable = allowNull;
-					parameter.SourceVersion = DataRowVersion.Current;
-					parameter.Value = 1;
-					
-					whereClause.Append ("(");
-					whereClause.Append (String.Format (clause1, parameter.ParameterName,
-									GetQuotedString (sourceColumnName)));
-					whereClause.Append (" OR ");
-					
-				}
-
-				if (useColumnsForParameterNames) {
-					parameter = CreateParameter (schemaRow, true);
-				} else {
-					parameter = CreateParameter (parmIndex++, schemaRow);
-				}
-				updateCommand.Parameters.Add (parameter);
-				ApplyParameterInfo (parameter, schemaRow, StatementType.Update, true);
-				parameter.IsNullable = allowNull;
-				parameter.SourceVersion = DataRowVersion.Original;
-
-				whereClause.Append (String.Format (clause2, GetQuotedString (parameter.SourceColumn), parameter.ParameterName));
-
-				if (!isKey)
-					whereClause.Append (")");
-			}
-			if (!keyFound)
-				throw new InvalidOperationException ("Dynamic SQL generation for the UpdateCommand is not supported against a SelectCommand that does not return any key column information.");
-
-			// We're all done, so bring it on home
-			string sql = String.Format ("{0}{1} WHERE ( {2} )", command, columns.ToString (), whereClause.ToString ());
-			updateCommand.CommandText = sql;
-			return updateCommand;
-		}
-
-		private SqlParameter CreateParameter (DataRow schemaRow, bool whereClause)
-		{
-			string sourceColumn = (string) schemaRow ["BaseColumnName"];
-			string name;
-			if (whereClause)
-				name = GetParameterName ("Original_" + sourceColumn);
-			else
-				name = GetParameterName (sourceColumn);
-
-			SqlParameter param = new SqlParameter ();
-			param.ParameterName = name;
-			param.SourceColumn = sourceColumn;
-			return param;
-		}
-
-		private SqlParameter CreateParameter (int paramIndex, DataRow schemaRow)
-		{
-			string sourceColumn = (string) schemaRow ["BaseColumnName"];
-			string name = GetParameterName (paramIndex);
-
-			SqlParameter param = new SqlParameter ();
-			param.ParameterName = name;
-			param.SourceColumn = sourceColumn;
-			return param;
-		}
-#endif // ONLY_1_1
 				
 		public static void DeriveParameters (SqlCommand command)
 		{
 			command.DeriveParameters ();
 		}
 
-#if ONLY_1_1
-		protected override void Dispose (bool disposing)
-		{
-			if (!disposed) {
-				if (disposing) {
-					if (insertCommand != null)
-						insertCommand.Dispose ();
-					if (deleteCommand != null)
-						deleteCommand.Dispose ();
-					if (updateCommand != null)
-						updateCommand.Dispose ();
-					if (dbSchemaTable != null)
-						dbSchemaTable.Dispose ();
-				}
-				disposed = true;
-			}
-		}
-#endif
 
 		public
 		new
@@ -660,40 +271,6 @@ namespace System.Data.SqlClient
 			return true;
 		}
 
-#if ONLY_1_1				
-		private string GetQuotedString (string value)
-		{
-			if (value == null || value.Length == 0)
-				return value;
-
-			string prefix = QuotePrefix;
-			string suffix = QuoteSuffix;
-
-			if (prefix.Length == 0 && suffix.Length == 0)
-				return value;
-			return String.Format ("{0}{1}{2}", prefix, value, suffix);
-		}
-
-		string GetNullCheckParameterName (string parameterName)
-		{
-			return GetParameterName ("IsNull_" + parameterName);
-		}
-
-
-		private string QuotedTableName {
-			get { return GetQuotedString (tableName); }
-		}
-
-		public void RefreshSchema ()
-		{
-			// FIXME: "Figure out what else needs to be cleaned up when we refresh."
-			tableName = String.Empty;
-			dbSchemaTable = null;
-			deleteCommand = null;
-			insertCommand = null;
-			updateCommand = null;
-		}
-#endif
 
 		protected override void ApplyParameterInfo (DbParameter parameter,
 		                                            DataRow datarow,

mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs

@@ -229,14 +229,8 @@ namespace System.Data.SqlClient {
 
 		#region Events and Delegates
 
-#if ONLY_1_1
-		[DataSysDescription ("Event triggered before every DataRow during Update.")]
-#endif
 		public event SqlRowUpdatedEventHandler RowUpdated;
 
-#if ONLY_1_1
-		[DataSysDescription ("Event triggered after every DataRow during Update.")]
-#endif
 		public event SqlRowUpdatingEventHandler RowUpdating;
 
 		#endregion // Events and Delegates

mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs

@@ -33,9 +33,6 @@ using System.Configuration;
 using System.Data;
 using System.Data.Common;
 
-#if ONLY_1_1
-using Mono.Data;
-#endif
 
 namespace MonoTests.System.Data
 {

mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs

@@ -222,9 +222,6 @@ namespace MonoTests.System.Data
 		}
 
 		[Test]
-#if ONLY_1_1
-		[Ignore ("dataIndex is ignored")]
-#endif
 		public void GetBytes_DataIndex_Negative ()
 		{
 			IDbCommand cmd = conn.CreateCommand ();

mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs

@@ -1128,21 +1128,6 @@ namespace MonoTests.System.Data
 			Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (0)");
 			Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (0)");
 
-#if ONLY_1_1
-			param = cmd.Parameters [1];
-			Assert.AreEqual (DbType.Int32, param.DbType, prefix + "DbType (1)");
-			Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (1)");
-			Assert.IsFalse (param.IsNullable, prefix + "IsNullable (1)");
-			Assert.AreEqual (0, param.Offset, prefix + "Offset (1)");
-			Assert.AreEqual ("@p2", param.ParameterName, prefix + "ParameterName (1)");
-			Assert.AreEqual (0, param.Precision, prefix + "Precision (1)");
-			Assert.AreEqual (0, param.Scale, prefix + "Scale (1)");
-			//Assert.AreEqual (0, param.Size, prefix + "Size (1)");
-			Assert.AreEqual (string.Empty, param.SourceColumn, prefix + "SourceColumn (1)");
-			Assert.AreEqual (DataRowVersion.Current, param.SourceVersion, prefix + "SourceVersion (1)");
-			Assert.AreEqual (SqlDbType.Int, param.SqlDbType, prefix + "SqlDbType (1)");
-			Assert.AreEqual (1, param.Value, prefix + "Value (1)");
-#endif
 
 			param = cmd.Parameters [1];
 			Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (2)");
@@ -1403,21 +1388,6 @@ namespace MonoTests.System.Data
 			Assert.AreEqual (string.Empty, param.XmlSchemaCollectionName, prefix + "XmlSchemaCollectionName (3)");
 			Assert.AreEqual (string.Empty, param.XmlSchemaCollectionOwningSchema, prefix + "XmlSchemaCollectionOwningSchema (3)");
 
-#if ONLY_1_1
-			param = cmd.Parameters [4];
-			Assert.AreEqual (DbType.Int32, param.DbType, prefix + "DbType (4)");
-			Assert.AreEqual (ParameterDirection.Input, param.Direction, prefix + "Direction (4)");
-			Assert.IsFalse (param.IsNullable, prefix + "IsNullable (4)");
-			Assert.AreEqual (0, param.Offset, prefix + "Offset (4)");
-			Assert.AreEqual ("@p5", param.ParameterName, prefix + "ParameterName (4)");
-			Assert.AreEqual (0, param.Precision, prefix + "Precision (4)");
-			Assert.AreEqual (0, param.Scale, prefix + "Scale (4)");
-			//Assert.AreEqual (0, param.Size, prefix + "Size (4)");
-			Assert.AreEqual (string.Empty, param.SourceColumn, prefix + "SourceColumn (4)");
-			Assert.AreEqual (DataRowVersion.Current, param.SourceVersion, prefix + "SourceVersion (4)");
-			Assert.AreEqual (SqlDbType.Int, param.SqlDbType, prefix + "SqlDbType (4)");
-			Assert.AreEqual (1, param.Value, prefix + "Value (4)");
-#endif
 
 			param = cmd.Parameters [4];
 			Assert.AreEqual (DbType.AnsiString, param.DbType, prefix + "DbType (5)");

mcs/class/System.Data/Test/System.Data.Common/DataAdapterTest.cs

@@ -199,26 +199,5 @@ namespace MonoTests.System.Data.Common
 
 	class MyAdapter : DataAdapter
 	{
-#if ONLY_1_1
-		public override int Fill (DataSet dataSet)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override IDataParameter[] GetFillParameters ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override int Update (DataSet dataSet)
-		{
-			throw new NotImplementedException ();
-		}
-#endif
 	}
 }

mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs

@@ -262,31 +262,6 @@ sqliteDataAdapter.Update (dataSet, "Primus");
 
 		class MyAdapter : DbDataAdapter
 		{
-#if ONLY_1_1
-			protected override RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command,
-										     StatementType statementType,
-										     DataTableMapping tableMapping)
-			{
-				throw new NotImplementedException ();
-			}
-
-			protected override RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command,
-										       StatementType statementType,
-										       DataTableMapping tableMapping)
-			{
-				throw new NotImplementedException ();
-			}
-
-			protected override void OnRowUpdated (RowUpdatedEventArgs value)
-			{
-				throw new NotImplementedException ();
-			}
-
-			protected override void OnRowUpdating (RowUpdatingEventArgs value)
-			{
-				throw new NotImplementedException ();
-			}
-#endif
 
 			public new int AddToBatch (IDbCommand command)
 			{

mcs/class/System.Data/Test/System.Data/DataRowTest2.cs

@@ -1240,14 +1240,6 @@ namespace MonoTests.System.Data
 			Assert.IsNull (colChangeArgs.ProposedValue, "#J3");
 			Assert.AreSame (dt.Rows [0], colChangeArgs.Row, "#J4");
 
-#if ONLY_1_1
-			evt = (EventInfo) _eventsFired [index++];
-			Assert.AreEqual ("ColumnChanging", evt.Name, "#K1");
-			colChangeArgs = (DataColumnChangeEventArgs) evt.Args;
-			Assert.AreSame (dc1, colChangeArgs.Column, "#K2");
-			Assert.AreSame (DBNull.Value, colChangeArgs.ProposedValue, "#K3");
-			Assert.AreSame (dt.Rows [0], colChangeArgs.Row, "#K4");
-#endif
 
 			evt = (EventInfo) _eventsFired [index++];
 			Assert.AreEqual ("ColumnChanged", evt.Name, "#L1");

mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs

@@ -702,9 +702,6 @@ namespace MonoTests.System.Data
 		}
 
 		[Test] // bug #80048
-#if ONLY_1_1
-		[Category ("NotWorking")]
-#endif
 		public void XmlSpace ()
 		{
 			string xml = "<?xml version=\"1.0\" standalone=\"yes\"?>" +

mcs/class/System.Drawing/System.Drawing.Design/PropertyValueUIHandler.cs

@@ -31,8 +31,5 @@ using System.ComponentModel;
 
 namespace System.Drawing.Design {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public delegate void PropertyValueUIHandler (ITypeDescriptorContext context, PropertyDescriptor propDesc, ArrayList valueUIItemList);
 }

mcs/class/System.Drawing/System.Drawing.Design/PropertyValueUIItemInvokeHandler.cs

@@ -30,9 +30,6 @@ using System.ComponentModel;
 
 namespace System.Drawing.Design {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public delegate void PropertyValueUIItemInvokeHandler (
 				   ITypeDescriptorContext context,
     	                           PropertyDescriptor descriptor,

mcs/class/System.Drawing/System.Drawing.Design/ToolboxComponentsCreatedEventHandler.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Design {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public delegate void ToolboxComponentsCreatedEventHandler (object sender, ToolboxComponentsCreatedEventArgs e);
 }
 

mcs/class/System.Drawing/System.Drawing.Design/ToolboxComponentsCreatingEventHandler.cs

@@ -28,8 +28,5 @@
 
 namespace System.Drawing.Design {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public delegate void ToolboxComponentsCreatingEventHandler (object sender, ToolboxComponentsCreatingEventArgs e);
 }

mcs/class/System.Drawing/System.Drawing.Design/ToolboxItemCreatorCallback.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Design {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public delegate ToolboxItem ToolboxItemCreatorCallback(
 				   object serializedObject,
 		        	   string format);

mcs/class/System.Drawing/System.Drawing.Drawing2D/CombineMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum CombineMode	{
 		Complement = 5,
 		Exclude = 4,

mcs/class/System.Drawing/System.Drawing.Drawing2D/CompostingMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum CompositingMode {
 		SourceCopy = 1,
 		SourceOver = 0

mcs/class/System.Drawing/System.Drawing.Drawing2D/CompostingQuality.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum CompositingQuality {
 		AssumeLinear = 4,
 		Default = 0,

mcs/class/System.Drawing/System.Drawing.Drawing2D/CoordinateSpace.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum CoordinateSpace {
 		Device = 2,
 		Page = 1,

mcs/class/System.Drawing/System.Drawing.Drawing2D/DashCap.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum DashCap {
 		Flat,
 		Round = 2,

mcs/class/System.Drawing/System.Drawing.Drawing2D/DashStyle.cs

@@ -29,9 +29,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum DashStyle {
 		Custom = 5,
 		Dash = 1,

mcs/class/System.Drawing/System.Drawing.Drawing2D/FillMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum FillMode {
 		Alternate = 0,
 		Winding = 1

mcs/class/System.Drawing/System.Drawing.Drawing2D/FlushIntention.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum FlushIntention {
 		Flush = 0,
 		Sync = 1

mcs/class/System.Drawing/System.Drawing.Drawing2D/HatchStyle.cs

@@ -31,9 +31,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum HatchStyle {
 		BackwardDiagonal = 3,
 		Cross = LargeGrid,

mcs/class/System.Drawing/System.Drawing.Drawing2D/InterpolationMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum InterpolationMode {
 		Bicubic = 4,
 		Bilinear = 3,

mcs/class/System.Drawing/System.Drawing.Drawing2D/LineCap.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum LineCap {
 		AnchorMask = 240,
 		ArrowAnchor = 20,

mcs/class/System.Drawing/System.Drawing.Drawing2D/LineJoin.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum LineJoin {
 		Bevel = 1,
 		Miter = 0,

mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum LinearGradientMode {
 		BackwardDiagonal = 3,
 		ForwardDiagonal = 2,

mcs/class/System.Drawing/System.Drawing.Drawing2D/MatrixOrder.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum MatrixOrder {
 		Append = 1,
 		Prepend = 0

mcs/class/System.Drawing/System.Drawing.Drawing2D/PathPointType.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum PathPointType {
 		Bezier = 3,
 		Bezier3 = 3,

mcs/class/System.Drawing/System.Drawing.Drawing2D/PenAlignment.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum PenAlignment {
 		Center = 0,
 		Inset = 1,

mcs/class/System.Drawing/System.Drawing.Drawing2D/PenType.cs

@@ -29,9 +29,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum PenType {
 		HatchFill = 1,
 		LinearGradient = 4,

mcs/class/System.Drawing/System.Drawing.Drawing2D/PixelOffsetMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum PixelOffsetMode {
 		Default = 0,
 		Half = 4,

mcs/class/System.Drawing/System.Drawing.Drawing2D/QualityMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum QualityMode {
 		Default = 0,
 		High = 2,

mcs/class/System.Drawing/System.Drawing.Drawing2D/SmoothingMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum SmoothingMode {
 		AntiAlias = 4,
 		Default = 0,

mcs/class/System.Drawing/System.Drawing.Drawing2D/WarpMode.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum WarpMode {
 		Bilinear = 1,
 		Perspective = 0

mcs/class/System.Drawing/System.Drawing.Drawing2D/WrapMode.cs

@@ -31,9 +31,6 @@
 
 namespace System.Drawing.Drawing2D {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum WrapMode {
 		Tile,
 		TileFlipX,

mcs/class/System.Drawing/System.Drawing.Imaging/ColorAdjustType.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum ColorAdjustType {
 		Any = 6,
 		Bitmap = 1,

mcs/class/System.Drawing/System.Drawing.Imaging/ColorChannelFlag.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum ColorChannelFlag {
 		ColorChannelC = 0,
 		ColorChannelK = 3,

mcs/class/System.Drawing/System.Drawing.Imaging/ColorMapType.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum  ColorMapType {
 		Brush = 1,
 		Default = 0

mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrixFlag.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum  ColorMatrixFlag{
 		AltGrays = 2,
 		Default = 0,

mcs/class/System.Drawing/System.Drawing.Imaging/ColorMode.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum ColorMode {
 		Argb32Mode = 0,
 		Argb64Mode = 1

mcs/class/System.Drawing/System.Drawing.Imaging/EmfPlusRecordType.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum EmfPlusRecordType {
 		BeginContainer = 16423,
 		BeginContainerNoParams = 16424,

mcs/class/System.Drawing/System.Drawing.Imaging/EmfType.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum EmfType {
 		EmfOnly = 3,
 		EmfPlusDual = 5,

mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameterValueType.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum EncoderParameterValueType {
 		ValueTypeAscii = 2,
 		ValueTypeByte = 1,

mcs/class/System.Drawing/System.Drawing.Imaging/EncoderValue.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum EncoderValue {
 		ColorTypeCMYK = 0,
 		ColorTypeYCCK = 1,

mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecFlags.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	[Flags]
 	public enum ImageCodecFlags {
 		BlockingDecode = 32,

mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecInfo.cs

@@ -37,9 +37,6 @@ using System.IO;
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[ComVisible (false)]
-#endif
 	public sealed class ImageCodecInfo {
 		private Guid clsid;
 		private string codecName;

mcs/class/System.Drawing/System.Drawing.Imaging/ImageFlags.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	[Flags]
 	public enum ImageFlags {
 		Caching = 131072,

mcs/class/System.Drawing/System.Drawing.Imaging/ImageLockMode.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum ImageLockMode {
 		ReadOnly = 1,
 		ReadWrite = 3,

mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs

@@ -38,9 +38,6 @@ namespace System.Drawing.Imaging {
 
 	[MonoTODO ("Metafiles, both WMF and EMF formats, are only partially supported.")]
 	[Serializable]
-#if ONLY_1_1
-	[ComVisible (false)]
-#endif
 	[Editor ("System.Drawing.Design.MetafileEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
 	public sealed class Metafile : Image {
 

mcs/class/System.Drawing/System.Drawing.Imaging/MetafileFrameUnit.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum MetafileFrameUnit {
 		Document = 5,
 		GdiCompatible = 7,

mcs/class/System.Drawing/System.Drawing.Imaging/MetafileType.cs

@@ -29,9 +29,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum MetafileType {
 		Invalid = 0,
 		Wmf = 1,

mcs/class/System.Drawing/System.Drawing.Imaging/PixelFormat.cs

@@ -32,9 +32,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum PixelFormat {
 		Alpha = 262144,
 		Canonical = 2097152,

mcs/class/System.Drawing/System.Drawing.Imaging/PlayRecordCallback.cs

@@ -29,9 +29,6 @@
 
 namespace System.Drawing.Imaging {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public delegate void PlayRecordCallback(
 		EmfPlusRecordType recordType,
 		int flags,

mcs/class/System.Drawing/System.Drawing.Text/GenericFontFamilies.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Text {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum GenericFontFamilies {
 		Monospace = 2,
 		SansSerif = 1,

mcs/class/System.Drawing/System.Drawing.Text/HotkeyPrefix.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Text {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum HotkeyPrefix {
 		Hide = 2,
 		None = 0,

mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing.Text {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum TextRenderingHint {
 		AntiAlias = 4,
 		AntiAliasGridFit = 3,

mcs/class/System.Drawing/System.Drawing/Color.cs

@@ -39,9 +39,6 @@ using System.Runtime.InteropServices;
 namespace System.Drawing 
 {
 	[TypeConverter(typeof(ColorConverter))]
-#if ONLY_1_1
-	[ComVisible (true)]
-#endif
 	[Editor ("System.Drawing.Design.ColorEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
 	[Serializable]
 	public struct Color {

mcs/class/System.Drawing/System.Drawing/ContentAlignment.cs

@@ -30,9 +30,6 @@ using System.ComponentModel;
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	[Editor ("System.Drawing.Design.ContentAlignmentEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
 	public enum ContentAlignment {
 		TopLeft      = 0x001,

mcs/class/System.Drawing/System.Drawing/Font.cs

@@ -55,10 +55,6 @@ namespace System.Drawing
 
 		private void CreateFont (string familyName, float emSize, FontStyle style, GraphicsUnit unit, byte charSet, bool isVertical)
 		{
-#if ONLY_1_1
-			if (familyName == null)
-				throw new ArgumentNullException ("familyName");
-#endif
 			originalFontName = familyName;
                         FontFamily family;
 			// NOTE: If family name is null, empty or invalid,

mcs/class/System.Drawing/System.Drawing/FontStyle.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	[Flags]
 	public enum FontStyle {
 		Regular   = 0,

mcs/class/System.Drawing/System.Drawing/GraphicsUnit.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum GraphicsUnit {
 		World      = 0,
 		Display    = 1,

mcs/class/System.Drawing/System.Drawing/KnownColor.cs

@@ -30,9 +30,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum KnownColor {
 		ActiveBorder = 1,
 		ActiveCaption = 2,

mcs/class/System.Drawing/System.Drawing/KnownColors.cs

@@ -272,9 +272,6 @@ namespace System.Drawing {
 			if ((n <= 0) || (n >= ArgbValues.Length)) {
 				// This is what it returns!
 				c = Color.FromArgb (0, 0, 0, 0);
-#if ONLY_1_1
-				c.name = kc.ToString ();
-#endif
 				c.state |= (short) Color.ColorType.Named;
 			} else {
 				c = new Color ();
@@ -282,9 +279,6 @@ namespace System.Drawing {
 				if ((n < 27) || (n > 169))
 					c.state |= (short) Color.ColorType.System;
 				c.Value = ArgbValues [n];
-#if ONLY_1_1
-				c.name = GetName (n);
-#endif
 			}
 			c.knownColor = n;
 			return c;

mcs/class/System.Drawing/System.Drawing/RotateFlipType.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum RotateFlipType {
 		RotateNoneFlipNone = 0,
 		Rotate180FlipXY    = 0,

mcs/class/System.Drawing/System.Drawing/StringAligment.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum StringAlignment {
 		Near = 0,
 		Center = 1,

mcs/class/System.Drawing/System.Drawing/StringDigitSubstitute.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum StringDigitSubstitute {
 		User        = 0,
 		None        = 1,

mcs/class/System.Drawing/System.Drawing/StringFormatFlags.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	[Flags]
 	public enum StringFormatFlags {
 		DirectionRightToLeft  = 0x0001,

mcs/class/System.Drawing/System.Drawing/StringTrimming.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum  StringTrimming {
 		None              = 0,
 		Character         = 1,

mcs/class/System.Drawing/System.Drawing/StringUnit.cs

@@ -28,9 +28,6 @@
 
 namespace System.Drawing {
 
-#if ONLY_1_1
-	[Serializable]
-#endif
 	public enum  StringUnit{
 		World      = 0x00,
 		Display    = 0x01,

mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/GraphicsPathTest.cs

@@ -2527,9 +2527,6 @@ namespace MonoTests.System.Drawing.Drawing2D {
 		}
 
 		[Test]
-#if ONLY_1_1
-		[ExpectedException (typeof (OutOfMemoryException))]
-#endif
 		public void Widen_NoPoint ()
 		{
 			using (GraphicsPath gp = new GraphicsPath ()) {

mcs/class/System.Drawing/Test/System.Drawing/TestFont.cs

@@ -195,9 +195,6 @@ namespace MonoTests.System.Drawing{
 			f.ToLogFont (null);
 		}
 		[Test]
-#if ONLY_1_1
-		[ExpectedException (typeof (ArgumentNullException))]
-#endif
 		public void Font_StringNull_Float ()
 		{
 			string family = null;

mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigXPathTransformTest.cs

@@ -95,9 +95,6 @@ namespace MonoTests.System.Security.Cryptography.Xml {
 		}
 
 		[Test]
-#if ONLY_1_1
-		[ExpectedException (typeof (NullReferenceException))]
-#endif
 		public void OnlyInner () 
 		{
 			XmlNodeList inner = InnerXml (""); // empty

mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs

@@ -41,9 +41,6 @@ using System.Threading;
 
 namespace System.ServiceProcess
 {
-#if ONLY_1_1
-	[Designer ("Microsoft.VisualStudio.Install.UserNTServiceDesigner, " + Consts.AssemblyMicrosoft_VisualStudio, "System.ComponentModel.Design.IRootDesigner")]
-#endif
 	[InstallerType (typeof (ServiceProcessInstaller))]
 	public class ServiceBase : Component
 	{

mcs/class/System.Web.Services/System.Web.Services.Configuration/WebServicesConfigurationSectionHandler.cs

@@ -78,16 +78,6 @@ namespace System.Web.Services.Configuration
 			WSProtocol proto;
 			error = null;
 
-#if ONLY_1_1
-			switch (protoName) {
-				case "HttpSoap1.2":
-					protoName = "HttpSoap12";
-					break;
-				case "HttpSoap12":
-					protoName = null;
-					break;
-			}
-#endif
 			try {
 				proto = (WSProtocol) Enum.Parse (typeof (WSProtocol), protoName);
 			} catch {

mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionReflector.cs

@@ -87,11 +87,7 @@ namespace System.Web.Services.Description {
 			if (WSConfig.IsSupported (WSProtocol.HttpGet))
 				new HttpGetProtocolReflector ().Reflect (this, type, url, schemaExporter, soapSchemaExporter);
 			
-#if ONLY_1_1
-			if (WSConfig.IsSupported (WSProtocol.HttpPost) || WSConfig.IsSupported (WSProtocol.HttpPostLocalhost))
-#else
 			if (WSConfig.IsSupported (WSProtocol.HttpPost))
-#endif
 				new HttpPostProtocolReflector ().Reflect (this, type, url, schemaExporter, soapSchemaExporter);
 				
 			int i=0;

mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionReflectorTest.cs

@@ -184,9 +184,6 @@ namespace MonoTests.System.Web.Services.Description
 				"    </wsdl:operation>{0}" +
 				"  </wsdl:binding>{0}" +
 				"  <wsdl:service name=\"IncludeTestServices\">{0}" +
-#if ONLY_1_1
-				"    <documentation xmlns=\"http://schemas.xmlsoap.org/wsdl/\" />{0}" +
-#endif
 				"    <wsdl:port name=\"IncludeTestServicesSoap\" binding=\"tns:IncludeTestServicesSoap\">{0}" +
 				"      <soap:address location=\"http://localhost/IncludeTestServices.asmx\" />{0}" +
 				"    </wsdl:port>{0}" +

mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs

@@ -81,9 +81,6 @@ namespace System.Web.UI.WebControls {
 			set { base.BorderWidth = value; }
 		}
 
-#if ONLY_1_1
-		[Bindable(true)]
-#endif		
 		[DefaultValue(4)]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
@@ -113,16 +110,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable(false)]
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public override string ToolTip {
-			get { return String.Empty; }
-			set { /* Tooltip is always String.Empty */ }
-		}
-#endif		
 
 		public virtual int[] GetSelectedIndices ()
 		{
@@ -166,23 +153,6 @@ namespace System.Web.UI.WebControls {
 			return options;
 		}
 
-#if ONLY_1_1
-		protected override void RenderContents (HtmlTextWriter writer)
-		{
-			foreach (ListItem item in Items) {
-				if (item.Selected) {
-					writer.AddAttribute (HtmlTextWriterAttribute.Selected, "selected", false);
-				}
-				writer.AddAttribute (HtmlTextWriterAttribute.Value, item.Value, true);
-				writer.RenderBeginTag (HtmlTextWriterTag.Option);
-				
-				string encoded = HttpUtility.HtmlEncode (item.Text);
-				writer.Write (encoded);
-				writer.RenderEndTag ();
-				writer.WriteLine ();
-			}
-		}
-#endif
 
 		protected internal
 		override void OnPreRender (EventArgs e)

mcs/class/System.Web/System.Web.UI.WebControls/Style.cs

@@ -580,12 +580,6 @@ namespace System.Web.UI.WebControls {
 			viewstate.Remove (BitStateKey);
 			stylesTraked = 0;
 		}
-#if ONLY_1_1
-		public override string ToString() 
-		{
-			return string.Empty;
-		}
-#endif
 		#endregion	// Public Instance Methods
 
 		#region Protected Instance Methods

mcs/class/System.Web/System.Web.UI.WebControls/Table.cs

@@ -102,9 +102,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (-1)]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
@@ -117,9 +114,6 @@ namespace System.Web.UI.WebControls {
 			set { TableStyle.CellPadding = value; }
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (-1)]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
@@ -132,9 +126,6 @@ namespace System.Web.UI.WebControls {
 			set { TableStyle.CellSpacing = value; }
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (GridLines.None)]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
@@ -147,9 +138,6 @@ namespace System.Web.UI.WebControls {
 			set { TableStyle.GridLines = value; }
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (HorizontalAlign.NotSet)]
 		[WebSysDescription ("")]
 		[WebCategory ("Layout")]

mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs

@@ -76,9 +76,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (0)]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
@@ -95,9 +92,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (HorizontalAlign.NotSet)]
 		[WebSysDescription ("")]
 		[WebCategory ("Layout")]
@@ -110,9 +104,6 @@ namespace System.Web.UI.WebControls {
 			set { TableItemStyle.HorizontalAlign = value; }
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (0)]
 		[WebSysDescription ("")]
 		[WebCategory ("Layout")]
@@ -150,9 +141,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (VerticalAlign.NotSet)]
 		[WebSysDescription ("")]
 		[WebCategory ("Layout")]
@@ -165,9 +153,6 @@ namespace System.Web.UI.WebControls {
 			set { TableItemStyle.VerticalAlign = value; }
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (true)]
 		[WebSysDescription ("")]
 		[WebCategory ("Layout")]

mcs/class/System.Web/System.Web.UI.WebControls/TableItemStyle.cs

@@ -54,9 +54,6 @@ namespace System.Web.UI.WebControls {
 		{
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (HorizontalAlign.NotSet)]
 		[NotifyParentProperty (true)]
 		[WebSysDescription ("")]
@@ -78,9 +75,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (VerticalAlign.NotSet)]
 		[NotifyParentProperty (true)]
 		[WebSysDescription ("")]
@@ -102,9 +96,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (true)]
 		[NotifyParentProperty (true)]
 		[WebSysDescription ("")]

mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs

@@ -69,9 +69,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (HorizontalAlign.NotSet)]
 		[WebSysDescription ("")]
 		[WebCategory ("Layout")]
@@ -84,9 +81,6 @@ namespace System.Web.UI.WebControls {
 			set { TableItemStyle.HorizontalAlign = value; }
 		}
 
-#if ONLY_1_1
-		[Bindable (true)]
-#endif
 		[DefaultValue (VerticalAlign.NotSet)]
 		[WebSysDescription ("")]
 		[WebCategory ("Layout")]

mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs

@@ -300,9 +300,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable(true)]
-#endif		
 		[DefaultValue(0)]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
@@ -318,9 +315,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable(true)]
-#endif		
 		[DefaultValue(0)]
 		[Themeable (false)]
 		[WebSysDescription ("")]
@@ -351,9 +345,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable(true)]
-#endif		
 		[DefaultValue(0)]
 		[Themeable (false)]
 		[WebSysDescription ("")]
@@ -394,10 +385,6 @@ namespace System.Web.UI.WebControls {
 			}
 			set {
 				ViewState ["Text"] = value;
-#if ONLY_1_1
-				if (TextMode == TextBoxMode.Password)
-					ViewState.SetItemDirty ("Text", false);
-#endif
 			}
 		}
 	

mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs

@@ -44,9 +44,6 @@ namespace System.Web.UI.WebControls {
 		#endregion	// Public Constructors
 
 		#region Public Instance Properties
-#if ONLY_1_1
-		[Bindable(true)]
-#endif		
 		[DefaultValue(ValidationSummaryDisplayMode.BulletList)]
 		[WebSysDescription ("")]
 		[WebCategory ("Appearance")]
@@ -91,9 +88,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable(true)]
-#endif		
 		[DefaultValue("")]
 		[Localizable (true)]
 		[WebSysDescription ("")]
@@ -108,9 +102,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable(true)]
-#endif		
 		[DefaultValue(false)]
 		[WebSysDescription ("")]
 		[WebCategory ("Behavior")]
@@ -124,9 +115,6 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-#if ONLY_1_1
-		[Bindable(true)]
-#endif		
 		[DefaultValue(true)]
 		[WebSysDescription ("")]
 		[WebCategory ("Behavior")]