2007-09-25 Nagappan A <[email protected]>

	* OleDbConnection.cs: 2.0 attribute changes.

	* OleDbException.cs: 2.0 attribute changes.

	* OleDbDataReader.cs: 2.0 attribute changes.

	* OleDbCommandBuilder.cs: 2.0 attribute changes.

	* OleDbParameter.cs: 2.0 attribute changes.


svn path=/trunk/mcs/; revision=86298

mcs/class/System.Data/System.Data.OleDb/ChangeLog

@@ -1,3 +1,15 @@
+2007-09-25  Nagappan A  <[email protected]>
+
+	* OleDbConnection.cs: 2.0 attribute changes.
+
+	* OleDbException.cs: 2.0 attribute changes.
+
+	* OleDbDataReader.cs: 2.0 attribute changes.
+
+	* OleDbCommandBuilder.cs: 2.0 attribute changes.
+
+	* OleDbParameter.cs: 2.0 attribute changes.
+
 2007-07-22  Nagappan A  <[email protected]>
 
 	* OleDbDataReader.cs: Fixed compilation warning.

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

@@ -134,7 +134,7 @@ namespace System.Data.OleDb
 			throw new NotImplementedException ();
 		}
 
-#if !NET_2_0
+#if ONLY_1_1
 		[MonoTODO]
 		protected override void Dispose (bool disposing)
 		{

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

@@ -82,11 +82,7 @@ namespace System.Data.OleDb
 		[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 )]
-#if NET_2_0
-		[SettingsBindableAttribute (true)]
-#else
 		[RecommendedAsConfigurable (true)]
-#endif
 		[RefreshPropertiesAttribute (RefreshProperties.All)]
 		public
 #if NET_2_0

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

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

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

@@ -42,7 +42,11 @@ using System.Runtime.Serialization;
 namespace System.Data.OleDb
 {
 	[Serializable]
+#if NET_2_0
+	public sealed class OleDbException : DbException
+#else
 	public sealed class OleDbException : ExternalException
+#endif
 	{
 		private OleDbConnection connection;
 
@@ -98,7 +102,13 @@ namespace System.Data.OleDb
 			}
 		}
 
-		public override string Message {
+#if NET_1_0 || ONLY_1_1
+		public
+		override
+#else
+		new
+#endif
+		string Message {
 			get {
 				GdaList glist;
 				IntPtr errors;
@@ -120,7 +130,13 @@ namespace System.Data.OleDb
 			}
 		}
 
-		public override string Source {
+#if NET_1_0 || ONLY_1_1
+		public
+		override
+#else
+		new
+#endif
+		string Source {
 			get {
 				GdaList glist;
 				IntPtr errors;

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

@@ -39,10 +39,11 @@ using System.ComponentModel;
 
 namespace System.Data.OleDb
 {
-	[TypeConverterAttribute (typeof (OleDbParameterConverter))]
 #if NET_2_0
+	[TypeConverterAttribute ("System.Data.OleDb.OleDbParameter+OleDbParameterConverter, " + Consts.AssemblySystem_Data)]
 	public sealed class OleDbParameter : DbParameter, IDbDataParameter, ICloneable
 #else
+	[TypeConverterAttribute (typeof (OleDbParameterConverter))]
 	public sealed class OleDbParameter : MarshalByRefObject, IDbDataParameter, IDataParameter, ICloneable
 #endif
 	{