diff options
author | Martin Baulig <martin@novell.com> | 2004-04-23 06:24:02 +0400 |
---|---|---|
committer | Martin Baulig <martin@novell.com> | 2004-04-23 06:24:02 +0400 |
commit | dfedf08d980d94226d3633164af1696343cbf717 (patch) | |
tree | 0c821cc1e7c35951cb6cd047ac434461b4898c32 /mcs/class/System.Data | |
parent | 84ce456dd22c91479af29f81fd6125bfe196e26b (diff) |
2004-04-22 Martin Baulig <martin@ximian.com>
Renamed the `NET_1_2' conditional to `NET_2_0' in all files.
svn path=/trunk/mcs/; revision=25877
Diffstat (limited to 'mcs/class/System.Data')
121 files changed, 190 insertions, 190 deletions
diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog index 304f4c1752f..7afbd2aca9b 100644 --- a/mcs/class/System.Data/ChangeLog +++ b/mcs/class/System.Data/ChangeLog @@ -66,7 +66,7 @@ 2003-11-26 Tim Coleman <tim@timcoleman.com> * System.Data.dll.sources: - Add many new System.Data classes for NET_1_2 build. + Add many new System.Data classes for NET_2_0 build. 2003-11-25 Tim Coleman <tim@timcoleman.com> * System.Data.dll.sources: diff --git a/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs b/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs index b71c8085bd3..82097e49da3 100644 --- a/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs +++ b/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum CatalogLocation diff --git a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs index 127edaa46a7..512fdd65b4d 100644 --- a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs +++ b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs @@ -27,7 +27,7 @@ namespace System.Data.Common private MissingSchemaAction missingSchemaAction; private DataTableMappingCollection tableMappings; -#if NET_1_2 +#if NET_2_0 private bool acceptChangesDuringUpdate; private LoadOption fillLoadOption; private bool returnProviderSpecificTypes; @@ -58,7 +58,7 @@ namespace System.Data.Common set { acceptChangesDuringFill = value; } } -#if NET_1_2 +#if NET_2_0 public bool AcceptChangesDuringUpdate { get { return acceptChangesDuringUpdate; } set { acceptChangesDuringUpdate = value; } @@ -73,7 +73,7 @@ namespace System.Data.Common set { continueUpdateOnError = value; } } -#if NET_1_2 +#if NET_2_0 public LoadOption FillLoadOption { get { return fillLoadOption; } set { fillLoadOption = value; } @@ -100,7 +100,7 @@ namespace System.Data.Common set { missingSchemaAction = value; } } -#if NET_1_2 +#if NET_2_0 public virtual bool ReturnProviderSpecificTypes { get { return returnProviderSpecificTypes; } set { returnProviderSpecificTypes = value; } @@ -118,7 +118,7 @@ namespace System.Data.Common #region Events -#if NET_1_2 +#if NET_2_0 public event FillErrorEventHandler FillError; #endif @@ -149,7 +149,7 @@ namespace System.Data.Common public abstract int Fill (DataSet dataSet); -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual int Fill (DataTable dataTable, IDataReader dataReader) { @@ -183,7 +183,7 @@ namespace System.Data.Common public abstract DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType); -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual DataTable FillSchema (DataTable dataTable, SchemaType schemaType, IDataReader dataReader) { @@ -199,7 +199,7 @@ namespace System.Data.Common public abstract IDataParameter[] GetFillParameters (); -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected bool HasTableMappings () { diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs index e1204ba7939..b1bcc68641b 100644 --- a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs +++ b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs @@ -71,7 +71,7 @@ namespace System.Data.Common { return new DataColumn (dataSetColumn, dataType); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public static DataColumn GetDataColumnBySchemaAction (string sourceColumn, string dataSetColumn, DataTable dataTable, Type dataType, MissingSchemaAction schemaAction) { diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs index 0f89115a21c..7d9111842a0 100644 --- a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs +++ b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs @@ -122,7 +122,7 @@ namespace System.Data.Common { return mapping; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void AddRange (Array values) { @@ -173,7 +173,7 @@ namespace System.Data.Common { return new DataColumnMapping (sourceColumn, sourceColumn); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public static DataColumn GetDataColumn (DataColumnMappingCollection columnMappings, string sourceColumn, Type dataType, DataTable dataTable, MissingMappingAction mappingAction, MissingSchemaAction schemaAction) { diff --git a/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs b/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs index cadf2dc8dab..1990228d835 100644 --- a/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs +++ b/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs @@ -84,7 +84,7 @@ namespace System.Data.Common { return DataColumnMappingCollection.GetColumnMappingBySchemaAction (columnMappings, sourceColumn, mappingAction); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataColumn GetDataColumn (string sourceColumn, Type dataType, DataTable dataTable, MissingMappingAction mappingAction, MissingSchemaAction schemaAction) { diff --git a/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs index 675580968e9..0df6d9b098b 100644 --- a/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs +++ b/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs @@ -122,7 +122,7 @@ namespace System.Data.Common { return mapping; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void AddRange (Array values) { diff --git a/mcs/class/System.Data/System.Data.Common/DbCommand.cs b/mcs/class/System.Data/System.Data.Common/DbCommand.cs index 4bd058ce304..21eea6f94b5 100644 --- a/mcs/class/System.Data/System.Data.Common/DbCommand.cs +++ b/mcs/class/System.Data/System.Data.Common/DbCommand.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; using System.Data; diff --git a/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs b/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs index 58cda0aab23..24bc9dd9953 100644 --- a/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs +++ b/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; using System.Data; diff --git a/mcs/class/System.Data/System.Data.Common/DbCommandOptionalFeatures.cs b/mcs/class/System.Data/System.Data.Common/DbCommandOptionalFeatures.cs index 97493e5bbaf..42e64e224b6 100644 --- a/mcs/class/System.Data/System.Data.Common/DbCommandOptionalFeatures.cs +++ b/mcs/class/System.Data/System.Data.Common/DbCommandOptionalFeatures.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum DbCommandOptionalFeatures diff --git a/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs b/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs index 9318cb7fcf3..22cd6f423a3 100644 --- a/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs +++ b/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; using System.Data; diff --git a/mcs/class/System.Data/System.Data.Common/DbConnection.cs b/mcs/class/System.Data/System.Data.Common/DbConnection.cs index 91f046e1c91..2f95e67458b 100644 --- a/mcs/class/System.Data/System.Data.Common/DbConnection.cs +++ b/mcs/class/System.Data/System.Data.Common/DbConnection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; using System.Data; diff --git a/mcs/class/System.Data/System.Data.Common/DbConnectionString.cs b/mcs/class/System.Data/System.Data.Common/DbConnectionString.cs index 606927c0be5..9483693aa1f 100644 --- a/mcs/class/System.Data/System.Data.Common/DbConnectionString.cs +++ b/mcs/class/System.Data/System.Data.Common/DbConnectionString.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; diff --git a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs index 8ba194e61ed..ed947af38aa 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs @@ -35,7 +35,7 @@ namespace System.Data.Common { #region Properties -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual IDbConnection BaseConnection { get { throw new NotImplementedException (); } @@ -52,7 +52,7 @@ namespace System.Data.Common { get { return ((IDbDataAdapter) this).DeleteCommand; } } -#if NET_1_2 +#if NET_2_0 protected internal CommandBehavior FillCommandBehavior { get { throw new NotImplementedException (); } set { throw new NotImplementedException (); } @@ -63,7 +63,7 @@ namespace System.Data.Common { get { return ((IDbDataAdapter) this).InsertCommand; } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual IDbCommand this [[Optional] StatementType statementType] { get { throw new NotImplementedException (); } @@ -79,7 +79,7 @@ namespace System.Data.Common { get { return ((IDbDataAdapter) this).SelectCommand; } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public IDbTransaction Transaction { get { throw new NotImplementedException (); } @@ -112,7 +112,7 @@ namespace System.Data.Common { #region Methods -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual void BeginInit () { @@ -154,7 +154,7 @@ namespace System.Data.Common { } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual void EndInit () { @@ -180,7 +180,7 @@ namespace System.Data.Common { return Fill (dataSet, 0, 0, srcTable, SelectCommand, CommandBehavior.Default); } -#if NET_1_2 +#if NET_2_0 protected override int Fill (DataTable dataTable, IDataReader dataReader) #else protected virtual int Fill (DataTable dataTable, IDataReader dataReader) @@ -218,7 +218,7 @@ namespace System.Data.Common { return Fill (dataTable, command.ExecuteReader (commandBehavior)); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public int Fill (int startRecord, int maxRecords, DataTable[] dataTables) { @@ -231,7 +231,7 @@ namespace System.Data.Common { return this.Fill (dataSet, startRecord, maxRecords, srcTable, SelectCommand, CommandBehavior.Default); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual int Fill (DataTable[] dataTables, int startRecord, int maxRecords, IDbCommand command, CommandBehavior behavior) { @@ -239,7 +239,7 @@ namespace System.Data.Common { } #endif -#if NET_1_2 +#if NET_2_0 protected override int Fill (DataSet dataSet, string srcTable, IDataReader dataReader, int startRecord, int maxRecords) #else protected virtual int Fill (DataSet dataSet, string srcTable, IDataReader dataReader, int startRecord, int maxRecords) @@ -412,7 +412,7 @@ namespace System.Data.Common { return (DataTable[]) output.ToArray (typeof (DataTable)); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataSet GetDataSet () { diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs index 57d953e2abd..0c98c455b7c 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs @@ -26,7 +26,7 @@ namespace System.Data.Common { #region Constructors -#if NET_1_2 +#if NET_2_0 [Obsolete ("use DBDataPermission (PermissionState.None)", true)] #endif protected DBDataPermission () @@ -34,7 +34,7 @@ namespace System.Data.Common { { } -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected DBDataPermission (DbConnectionString constr) { @@ -46,7 +46,7 @@ namespace System.Data.Common { { } -#if NET_1_2 +#if NET_2_0 [Obsolete ("use DBDataPermission (PermissionState.None)", true)] #endif public DBDataPermission (PermissionState state, bool allowBlankPassword) @@ -86,7 +86,7 @@ namespace System.Data.Common { } #endif -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected void AddConnectionString (DbConnectionString constr) { @@ -130,7 +130,7 @@ namespace System.Data.Common { return (state == PermissionState.Unrestricted); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected void SetConnectionString (DbConnectionString constr) { diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs index 5863bf90327..a2265dcd585 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs @@ -61,7 +61,7 @@ namespace System.Data.Common { #endregion // Properties #region // Methods -#if NET_1_2 +#if NET_2_0 [MonoTODO] public bool ShouldSerializeConnectionString () { diff --git a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs index cf8fded17ed..efdf7897ff3 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data; @@ -86,4 +86,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs b/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs index a5a2b8d524e..f173e7e4537 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs @@ -25,7 +25,7 @@ namespace System.Data.Common { #region Constructors -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DbDataRecord (object[] values, PropertyDescriptorCollection descriptors, FieldNameLookup fieldNameLookup) { @@ -182,7 +182,7 @@ namespace System.Data.Common { return (string) lookup [i]; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual object GetObjectRef (int i) { @@ -319,7 +319,7 @@ namespace System.Data.Common { { return GetValue (i) == null; } -#if NET_1_2 +#if NET_2_0 public virtual bool IsSetAsDefault (int i) { throw new NotImplementedException (); diff --git a/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs b/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs index a9a593dce56..c5a16e176e1 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public abstract class DbDataSourceEnumerator @@ -29,4 +29,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs b/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs index c61a90b23e4..1f9c3bf5b02 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; @@ -375,4 +375,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbParameter.cs b/mcs/class/System.Data/System.Data.Common/DbParameter.cs index 46de6f82e03..0aa19304f7c 100644 --- a/mcs/class/System.Data/System.Data.Common/DbParameter.cs +++ b/mcs/class/System.Data/System.Data.Common/DbParameter.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public abstract class DbParameter : MarshalByRefObject, IDbDataParameter, IDataParameter @@ -46,4 +46,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs b/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs index b54f6aae2fd..778fa378861 100644 --- a/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs +++ b/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Runtime.InteropServices; @@ -81,4 +81,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderConfigurationHandler.cs b/mcs/class/System.Data/System.Data.Common/DbProviderConfigurationHandler.cs index 637c4ce987d..fb40fd82a37 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderConfigurationHandler.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderConfigurationHandler.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Configuration; using System.Xml; @@ -36,4 +36,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs b/mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs index 0964c5b2957..646740aa75d 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; @@ -38,4 +38,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs b/mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs index 89a4d98cc3a..2bf46a1442d 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Configuration; using System.Xml; @@ -36,4 +36,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs b/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs index c9e572eee14..0fefbda3185 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Security; @@ -95,4 +95,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs b/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs index 1e3968820c6..d00d5f53e08 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum DbProviderSupportedClasses diff --git a/mcs/class/System.Data/System.Data.Common/DbTable.cs b/mcs/class/System.Data/System.Data.Common/DbTable.cs index d0b2feceef0..ea856c7418c 100644 --- a/mcs/class/System.Data/System.Data.Common/DbTable.cs +++ b/mcs/class/System.Data/System.Data.Common/DbTable.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; @@ -218,4 +218,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbTransaction.cs b/mcs/class/System.Data/System.Data.Common/DbTransaction.cs index 7dc0155fa5c..1a124b6c801 100644 --- a/mcs/class/System.Data/System.Data.Common/DbTransaction.cs +++ b/mcs/class/System.Data/System.Data.Common/DbTransaction.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public abstract class DbTransaction : MarshalByRefObject, IDbTransaction, IDisposable @@ -47,4 +47,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs b/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs index 5782bc82657..3fa3d2db04a 100644 --- a/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs +++ b/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs @@ -11,7 +11,7 @@ using System.Collections; using System.Data; namespace System.Data.Common { -#if NET_1_2 +#if NET_2_0 // FIXME: Need to clean this up public sealed class FieldNameLookup #else diff --git a/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs b/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs index e8490e9174a..7f7a181d402 100644 --- a/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs +++ b/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum GroupByBehavior diff --git a/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs b/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs index fe901e9ed34..ed9424bebcc 100644 --- a/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs +++ b/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum IdentifierCase diff --git a/mcs/class/System.Data/System.Data.Common/SchemaInfo.cs b/mcs/class/System.Data/System.Data.Common/SchemaInfo.cs index 30b6b38b3e2..ba237322ab4 100644 --- a/mcs/class/System.Data/System.Data.Common/SchemaInfo.cs +++ b/mcs/class/System.Data/System.Data.Common/SchemaInfo.cs @@ -10,7 +10,7 @@ using System; namespace System.Data.Common { -#if NET_1_2 +#if NET_2_0 // FIXME: This needs to be cleaned up to be compatible with both versions. // Unfortunately, the SchemaInfo class we made is different from the MS // version which is now public. diff --git a/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs b/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs index d7bf68b5764..474ede877de 100644 --- a/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs +++ b/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum SchemaLocation diff --git a/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs b/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs index 218f4a9636a..fb73bf7c1b2 100644 --- a/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs +++ b/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public sealed class SchemaTableColumn @@ -34,4 +34,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs b/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs index f1789082a6b..e9b77f2dab2 100644 --- a/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs +++ b/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public sealed class SchemaTableOptionalColumn @@ -25,4 +25,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.OleDb/ChangeLog b/mcs/class/System.Data/System.Data.OleDb/ChangeLog index 0c09615530c..7eccaf5456e 100644 --- a/mcs/class/System.Data/System.Data.OleDb/ChangeLog +++ b/mcs/class/System.Data/System.Data.OleDb/ChangeLog @@ -5,7 +5,7 @@ 2004-01-10 Atsushi Enomoto <atsushi@ximian.com> - * OleDbPermission.cs : NET_1_2 fix not to call obsolete .ctor. + * OleDbPermission.cs : NET_2_0 fix not to call obsolete .ctor. 2002-11-01 Daniel Morgan <danmorg@sc.rr.com> diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs index 37fc0399310..058b8e9412f 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs index 05d809ecf39..d0a7d6261a7 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; using System.EnterpriseServices; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionFactory.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionFactory.cs index 29694168ecf..23314405bb3 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionFactory.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionFactory.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionInternal.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionInternal.cs index ee3206b57d0..466174fc1e3 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionInternal.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionInternal.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; using System.EnterpriseServices; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolCounters.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolCounters.cs index 6c7f2772ed1..1d7f64d2e98 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolCounters.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolCounters.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolOptions.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolOptions.cs index d02cccf39b4..266fd0887ff 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolOptions.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs index 2deeb64208c..d29c4af01ec 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbMetaDataFactory.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbMetaDataFactory.cs index 5b4b6c9324b..0114f31c866 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbMetaDataFactory.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbMetaDataFactory.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; using System.IO; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs index 4ab02cd6331..0db80e8886b 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs index 18599e8a17c..651c239e921 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbReferenceCollection.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbReferenceCollection.cs index 37f415de5f8..08d024a476b 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbReferenceCollection.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbReferenceCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.Sql/DataAccessKind.cs b/mcs/class/System.Data/System.Data.Sql/DataAccessKind.cs index 99808bd55f6..df37ea27f2e 100644 --- a/mcs/class/System.Data/System.Data.Sql/DataAccessKind.cs +++ b/mcs/class/System.Data/System.Data.Sql/DataAccessKind.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum DataAccessKind diff --git a/mcs/class/System.Data/System.Data.Sql/Format.cs b/mcs/class/System.Data/System.Data.Sql/Format.cs index 8aa4266cedc..d1e195fdb1e 100644 --- a/mcs/class/System.Data/System.Data.Sql/Format.cs +++ b/mcs/class/System.Data/System.Data.Sql/Format.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum Format diff --git a/mcs/class/System.Data/System.Data.Sql/IBinarySerialize.cs b/mcs/class/System.Data/System.Data.Sql/IBinarySerialize.cs index 8066de97293..462bde30843 100644 --- a/mcs/class/System.Data/System.Data.Sql/IBinarySerialize.cs +++ b/mcs/class/System.Data/System.Data.Sql/IBinarySerialize.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.IO; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlCommand.cs b/mcs/class/System.Data/System.Data.Sql/ISqlCommand.cs index 5b65d834555..bc5b14d190b 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlCommand.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlCommand.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlConnection.cs b/mcs/class/System.Data/System.Data.Sql/ISqlConnection.cs index eb69d91e9a3..1c8a8e58775 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlConnection.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlConnection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlConnection : IDbConnection, IDisposable diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlExecutionContext.cs b/mcs/class/System.Data/System.Data.Sql/ISqlExecutionContext.cs index 9db30fe6744..ff9db0b9faf 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlExecutionContext.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlExecutionContext.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlGetTypedData.cs b/mcs/class/System.Data/System.Data.Sql/ISqlGetTypedData.cs index 4937b775a74..0ba3abc942b 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlGetTypedData.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlGetTypedData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.SqlTypes; using System.Xml; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlParameter.cs b/mcs/class/System.Data/System.Data.Sql/ISqlParameter.cs index 36d1b8e4feb..92b86707c5a 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlParameter.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlParameter.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.SqlTypes; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlParameterCollection.cs b/mcs/class/System.Data/System.Data.Sql/ISqlParameterCollection.cs index 6d43f9b87a5..60ff8e4f6c9 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlParameterCollection.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlParameterCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Runtime.InteropServices; using System.Collections; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlReader.cs b/mcs/class/System.Data/System.Data.Sql/ISqlReader.cs index c7a9eb3681d..20f0bfd450b 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlReader.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlReader.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlReader : IDisposable, ISqlRecord, ISqlGetTypedData, IGetTypedData diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlRecord.cs b/mcs/class/System.Data/System.Data.Sql/ISqlRecord.cs index 3a3205a907b..aada212819f 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlRecord.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlRecord.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlRecord : ISqlGetTypedData, IGetTypedData diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlResultSet.cs b/mcs/class/System.Data/System.Data.Sql/ISqlResultSet.cs index 25993e33238..a2c2771ba28 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlResultSet.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlResultSet.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlResultSet : ISqlReader, IDisposable, ISqlUpdatableRecord, ISqlRecord, ISqlGetTypedData, IGetTypedData diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlSetTypedData.cs b/mcs/class/System.Data/System.Data.Sql/ISqlSetTypedData.cs index f9d18dcc7ed..779f35c70f7 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlSetTypedData.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlSetTypedData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.SqlTypes; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlTransaction.cs b/mcs/class/System.Data/System.Data.Sql/ISqlTransaction.cs index f0893efbb25..4a3fe022b6d 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlTransaction.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlTransaction.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlTransaction : IDbTransaction, IDisposable diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlUpdatableRecord.cs b/mcs/class/System.Data/System.Data.Sql/ISqlUpdatableRecord.cs index a7631ac6257..e869d0e4041 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlUpdatableRecord.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlUpdatableRecord.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlUpdatableRecord : ISqlRecord, ISqlGetTypedData, ISqlSetTypedData, ISetTypedData diff --git a/mcs/class/System.Data/System.Data.Sql/InvalidUdtException.cs b/mcs/class/System.Data/System.Data.Sql/InvalidUdtException.cs index dc3e86b6ae4..05d61946f74 100644 --- a/mcs/class/System.Data/System.Data.Sql/InvalidUdtException.cs +++ b/mcs/class/System.Data/System.Data.Sql/InvalidUdtException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SerializationHelper.cs b/mcs/class/System.Data/System.Data.Sql/SerializationHelper.cs index 91de0db4405..d2d656e632a 100644 --- a/mcs/class/System.Data/System.Data.Sql/SerializationHelper.cs +++ b/mcs/class/System.Data/System.Data.Sql/SerializationHelper.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.IO; diff --git a/mcs/class/System.Data/System.Data.Sql/SerializationVersion.cs b/mcs/class/System.Data/System.Data.Sql/SerializationVersion.cs index 53f57976846..c545f8896d0 100644 --- a/mcs/class/System.Data/System.Data.Sql/SerializationVersion.cs +++ b/mcs/class/System.Data/System.Data.Sql/SerializationVersion.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum SerializationVersion diff --git a/mcs/class/System.Data/System.Data.Sql/SqlContextBase.cs b/mcs/class/System.Data/System.Data.Sql/SqlContextBase.cs index 62b922bd8f5..2c23dfb1dd7 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlContextBase.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlContextBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs b/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs index 7e45f7d1794..68eeb25a2ce 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlDefinition.cs b/mcs/class/System.Data/System.Data.Sql/SqlDefinition.cs index 62d31a6a843..6c5097db3bb 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlDefinition.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlDefinition.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlFunctionAttribute.cs b/mcs/class/System.Data/System.Data.Sql/SqlFunctionAttribute.cs index a1095eb174c..5528d518baa 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlFunctionAttribute.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlFunctionAttribute.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlMetaData.cs b/mcs/class/System.Data/System.Data.Sql/SqlMetaData.cs index 1d34ad71785..bec244fa590 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlMetaData.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlMetaData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.SqlTypes; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlMethodAttribute.cs b/mcs/class/System.Data/System.Data.Sql/SqlMethodAttribute.cs index a055e8eff90..2e6837ddf43 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlMethodAttribute.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlMethodAttribute.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs b/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs index 95de363710f..20f4f5c644b 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlPipeBase.cs b/mcs/class/System.Data/System.Data.Sql/SqlPipeBase.cs index c42c3c69f7d..b1359b48181 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlPipeBase.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlPipeBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.SqlClient; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlServerFactoryBase.cs b/mcs/class/System.Data/System.Data.Sql/SqlServerFactoryBase.cs index 355659e88f6..f4b70650fe2 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlServerFactoryBase.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlServerFactoryBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlTriggerContextBase.cs b/mcs/class/System.Data/System.Data.Sql/SqlTriggerContextBase.cs index 5d7a4cd568c..770853c7806 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlTriggerContextBase.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlTriggerContextBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.SqlTypes; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedAggregateAttribute.cs b/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedAggregateAttribute.cs index 416a8dfe090..ed211839ca9 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedAggregateAttribute.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedAggregateAttribute.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedTypeAttribute.cs b/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedTypeAttribute.cs index 87ce99dbb71..f3cf19229a5 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedTypeAttribute.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedTypeAttribute.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SystemDataAccessKind.cs b/mcs/class/System.Data/System.Data.Sql/SystemDataAccessKind.cs index 789b1920762..8f84ee4c109 100644 --- a/mcs/class/System.Data/System.Data.Sql/SystemDataAccessKind.cs +++ b/mcs/class/System.Data/System.Data.Sql/SystemDataAccessKind.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum SystemDataAccessKind diff --git a/mcs/class/System.Data/System.Data.Sql/TriggerAction.cs b/mcs/class/System.Data/System.Data.Sql/TriggerAction.cs index 7fa76332a44..ac8bf154e92 100644 --- a/mcs/class/System.Data/System.Data.Sql/TriggerAction.cs +++ b/mcs/class/System.Data/System.Data.Sql/TriggerAction.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum TriggerAction diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog index 9c412157571..3b58b978a7e 100755 --- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog +++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog @@ -18,7 +18,7 @@ 2004-01-10 Atsushi Enomoto <atsushi@ximian.com> - * SqlClientPermission.cs : Fixed NET_1_2 build related to + * SqlClientPermission.cs : Fixed NET_2_0 build related to obsolete attribute problem (see DbDataPermission.cs) 2003-12-28 Tim Coleman <tim@timcoleman.com> diff --git a/mcs/class/System.Data/System.Data.SqlClient/ISqlNotificationReceiver.cs b/mcs/class/System.Data/System.Data.SqlClient/ISqlNotificationReceiver.cs index 605a274bee3..e89c2bf6675 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/ISqlNotificationReceiver.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/ISqlNotificationReceiver.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlNotificationReceiver diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs index f581bc36f02..a05e1eb3ee7 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs @@ -604,7 +604,7 @@ namespace System.Data.SqlClient { case "MIN POOL SIZE" : minPoolSize = Int32.Parse (value); break; -#if NET_1_2 +#if NET_2_0 case "MULTIPLEACTIVERESULTSETS": break; #endif diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlResultSet.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlResultSet.cs index 8632c132c60..596498f4c98 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlResultSet.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlResultSet.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlBytes.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlBytes.cs index 93091e35c1c..b51395aaff0 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlBytes.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlBytes.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlChars.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlChars.cs index 076af263ad3..d83988e0107 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlChars.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlChars.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDate.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDate.cs index 4bb65c74aae..2f971472028 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlDate.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDate.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlStreamChars.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlStreamChars.cs index 742e7251f26..1acf1aaf7c5 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlStreamChars.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlStreamChars.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlTime.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlTime.cs index d549f43644d..a31829a003c 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlTime.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlTime.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlUtcDateTime.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlUtcDateTime.cs index 1c3ea55ba3b..eddc80cf732 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlUtcDateTime.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlUtcDateTime.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlXmlReader.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlXmlReader.cs index de9c5bb3df0..37c2ea47476 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlXmlReader.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlXmlReader.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data/AdapterMappingException.cs b/mcs/class/System.Data/System.Data/AdapterMappingException.cs index 73d7781d3f7..f27707e224c 100644 --- a/mcs/class/System.Data/System.Data/AdapterMappingException.cs +++ b/mcs/class/System.Data/System.Data/AdapterMappingException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Globalization; using System.Runtime.Serialization; @@ -41,4 +41,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog index 90bcd87a822..3e87117408c 100644 --- a/mcs/class/System.Data/System.Data/ChangeLog +++ b/mcs/class/System.Data/System.Data/ChangeLog @@ -463,10 +463,10 @@ * LoadOption.cs OperationAbortedException.cs ResultSetOptions.cs * ResultSetSensitivity.cs StatementCompletedEventArgs.cs * StatementCompletedEventHandler.cs UpdateOptions.cs: - New classes added for NET_1_2 + New classes added for NET_2_0 * DBConcurrencyException.cs DataRelation.cs DataSet.cs DataTable.cs * DataTableCollection.cs DataView.cs ForeignKeyConstraint.cs: - Modifications to add new NET_1_2 functions + Modifications to add new NET_2_0 functions 2003-11-25 Tim Coleman <tim@timcoleman.com> * IDataSources.cs: diff --git a/mcs/class/System.Data/System.Data/ConflictOptions.cs b/mcs/class/System.Data/System.Data/ConflictOptions.cs index 79628d8f3bf..90e49e34d10 100644 --- a/mcs/class/System.Data/System.Data/ConflictOptions.cs +++ b/mcs/class/System.Data/System.Data/ConflictOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum ConflictOptions @@ -29,4 +29,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs index 7bf504af06c..3a74a3b187e 100644 --- a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs +++ b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs @@ -32,7 +32,7 @@ namespace System.Data { { } -#if NET_1_2 +#if NET_2_0 public DBConcurrencyException (DataRow[] dataRows, string message, Exception inner) : base (message, inner) { @@ -47,7 +47,7 @@ namespace System.Data { set { row = value;} // setting the row has no effect } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public int RowCount { get { throw new NotImplementedException (); } @@ -58,7 +58,7 @@ namespace System.Data { #region Methods -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void CopyToRows (DataRow[] array) { @@ -66,7 +66,7 @@ namespace System.Data { } #endif -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void CopyToRows (DataRow[] array, int ArrayIndex) { diff --git a/mcs/class/System.Data/System.Data/DataAdapterException.cs b/mcs/class/System.Data/System.Data/DataAdapterException.cs index 13ebb8516aa..33a879e5081 100644 --- a/mcs/class/System.Data/System.Data/DataAdapterException.cs +++ b/mcs/class/System.Data/System.Data/DataAdapterException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Globalization; using System.Runtime.Serialization; @@ -41,4 +41,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/DataRelation.cs b/mcs/class/System.Data/System.Data/DataRelation.cs index f41537297bd..06ebe7cdbb2 100644 --- a/mcs/class/System.Data/System.Data/DataRelation.cs +++ b/mcs/class/System.Data/System.Data/DataRelation.cs @@ -84,7 +84,7 @@ namespace System.Data throw new NotImplementedException (); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataRelation (string relationName, string parentTableName, string parentTableNamespace, string childTableName, string childTableNamespace, string[] parentColumnNames, string[] childColumnNames, bool nested) { diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs index 523ff53b9bf..27e36f5eafc 100644 --- a/mcs/class/System.Data/System.Data/DataSet.cs +++ b/mcs/class/System.Data/System.Data/DataSet.cs @@ -466,7 +466,7 @@ namespace System.Data { addedRows.Add (row,row); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataTableReader GetDataReader (DataTable[] dataTables) { @@ -554,7 +554,7 @@ namespace System.Data { } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void Load (IDataReader reader, LoadOption loadOption, DataTable[] tables) { diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs index 7ca9c85498c..aa45e346f50 100644 --- a/mcs/class/System.Data/System.Data/DataTable.cs +++ b/mcs/class/System.Data/System.Data/DataTable.cs @@ -142,7 +142,7 @@ namespace System.Data { loader.Load (xtr); } -#if NET_1_2 +#if NET_2_0 public DataTable (string tableName, string tbNamespace) : this (tableName) { @@ -864,7 +864,7 @@ namespace System.Data { return copyTable; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataTableReader GetDataReader () { @@ -958,7 +958,7 @@ namespace System.Data { info.AddValue ("XmlDiffGram", sw.ToString(), typeof(string)); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void Load (IDataReader reader) { @@ -1013,7 +1013,7 @@ namespace System.Data { return row; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataRow LoadDataRow (object[] values, LoadOption loadOption) { @@ -1072,7 +1072,7 @@ namespace System.Data { -#if NET_1_2 +#if NET_2_0 [MonoTODO] XmlReadMode ReadXml (Stream stream) { @@ -1326,7 +1326,7 @@ namespace System.Data { return retVal; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void WriteXml (Stream stream) { diff --git a/mcs/class/System.Data/System.Data/DataTableCollection.cs b/mcs/class/System.Data/System.Data/DataTableCollection.cs index 1c7aac27805..b74ddcdb2dd 100644 --- a/mcs/class/System.Data/System.Data/DataTableCollection.cs +++ b/mcs/class/System.Data/System.Data/DataTableCollection.cs @@ -49,7 +49,7 @@ namespace System.Data { } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataTable this [string name, string tbNamespace] { get { throw new NotImplementedException (); } @@ -110,7 +110,7 @@ namespace System.Data { return table; } -#if NET_1_2 +#if NET_2_0 public virtual DataTable Add (string name, string tbNamespace) { DataTable table = new DataTable (name, tbNamespace); diff --git a/mcs/class/System.Data/System.Data/DataTableReader.cs b/mcs/class/System.Data/System.Data/DataTableReader.cs index 12d2bcb0394..cd3af2eb8ba 100644 --- a/mcs/class/System.Data/System.Data/DataTableReader.cs +++ b/mcs/class/System.Data/System.Data/DataTableReader.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data.Common; @@ -263,4 +263,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/DataView.cs b/mcs/class/System.Data/System.Data/DataView.cs index 8c3e38641ab..b5c7829aae4 100644 --- a/mcs/class/System.Data/System.Data/DataView.cs +++ b/mcs/class/System.Data/System.Data/DataView.cs @@ -318,7 +318,7 @@ namespace System.Data OnListChanged (new ListChangedEventArgs (ListChangedType.ItemDeleted, index)); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual bool Equals (DataView dv) { @@ -474,7 +474,7 @@ namespace System.Data OnListChanged (new ListChangedEventArgs (ListChangedType.Reset, -1)); }
-#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataTable ToTable () { diff --git a/mcs/class/System.Data/System.Data/DbMetaData.cs b/mcs/class/System.Data/System.Data/DbMetaData.cs index 2a15b599629..ada8fac2403 100644 --- a/mcs/class/System.Data/System.Data/DbMetaData.cs +++ b/mcs/class/System.Data/System.Data/DbMetaData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public class DbMetaData @@ -61,4 +61,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/FillOptions.cs b/mcs/class/System.Data/System.Data/FillOptions.cs index 7263a527840..f8b1c4d8825 100644 --- a/mcs/class/System.Data/System.Data/FillOptions.cs +++ b/mcs/class/System.Data/System.Data/FillOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum FillOptions @@ -19,4 +19,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs index 20ac1434fe0..21c9c9f3a3b 100644 --- a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs +++ b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs @@ -135,7 +135,7 @@ namespace System.Data { _childColumns = childColumns; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public ForeignKeyConstraint (string constraintName, string parentTableName, string parentTableNamespace, string[] parentColumnNames, string[] childColumnNames, AcceptRejectRule acceptRejectRule, Rule deleteRule, Rule updateRule) { diff --git a/mcs/class/System.Data/System.Data/IDataReader2.cs b/mcs/class/System.Data/System.Data/IDataReader2.cs index f40a90f7525..b018e9911a3 100644 --- a/mcs/class/System.Data/System.Data/IDataReader2.cs +++ b/mcs/class/System.Data/System.Data/IDataReader2.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDataReader2 diff --git a/mcs/class/System.Data/System.Data/IDataRecord2.cs b/mcs/class/System.Data/System.Data/IDataRecord2.cs index 888d804280b..86057fa0089 100644 --- a/mcs/class/System.Data/System.Data/IDataRecord2.cs +++ b/mcs/class/System.Data/System.Data/IDataRecord2.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDataRecord2 diff --git a/mcs/class/System.Data/System.Data/IDataSources.cs b/mcs/class/System.Data/System.Data/IDataSources.cs index 4cc9fca9f86..cdf1b1bd2a8 100644 --- a/mcs/class/System.Data/System.Data/IDataSources.cs +++ b/mcs/class/System.Data/System.Data/IDataSources.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDataSources @@ -31,4 +31,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs b/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs index 1b3767424e5..58a4f306fae 100644 --- a/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs +++ b/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDataUpdatableRecord @@ -26,4 +26,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs b/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs index 2e8369c2a1b..8fdf30769c8 100644 --- a/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs +++ b/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDbAsyncCommand @@ -23,4 +23,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs b/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs index 6dc19661809..d7b4516cc6c 100644 --- a/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs +++ b/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDbAsyncConnection @@ -21,4 +21,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IDbExecutionContext.cs b/mcs/class/System.Data/System.Data/IDbExecutionContext.cs index 2144eda3090..01b85a3334c 100644 --- a/mcs/class/System.Data/System.Data/IDbExecutionContext.cs +++ b/mcs/class/System.Data/System.Data/IDbExecutionContext.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDbExecutionContext @@ -41,4 +41,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IGetTypedData.cs b/mcs/class/System.Data/System.Data/IGetTypedData.cs index 0ca85b79465..a20ef1d787a 100644 --- a/mcs/class/System.Data/System.Data/IGetTypedData.cs +++ b/mcs/class/System.Data/System.Data/IGetTypedData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IGetTypedData @@ -37,4 +37,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ISetTypedData.cs b/mcs/class/System.Data/System.Data/ISetTypedData.cs index 87bd35386ad..c18c6a853b6 100644 --- a/mcs/class/System.Data/System.Data/ISetTypedData.cs +++ b/mcs/class/System.Data/System.Data/ISetTypedData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface ISetTypedData @@ -35,4 +35,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/LoadOption.cs b/mcs/class/System.Data/System.Data/LoadOption.cs index c275b70e10c..3cf2a19cbfa 100644 --- a/mcs/class/System.Data/System.Data/LoadOption.cs +++ b/mcs/class/System.Data/System.Data/LoadOption.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum LoadOption @@ -18,4 +18,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/OperationAbortedException.cs b/mcs/class/System.Data/System.Data/OperationAbortedException.cs index 4dee0ee99ac..b6b6a1c261d 100644 --- a/mcs/class/System.Data/System.Data/OperationAbortedException.cs +++ b/mcs/class/System.Data/System.Data/OperationAbortedException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Globalization; using System.Runtime.Serialization; @@ -41,4 +41,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ResultSetOptions.cs b/mcs/class/System.Data/System.Data/ResultSetOptions.cs index a7c0056a7bb..2bd26bf0b9f 100644 --- a/mcs/class/System.Data/System.Data/ResultSetOptions.cs +++ b/mcs/class/System.Data/System.Data/ResultSetOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum ResultSetOptions @@ -20,4 +20,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ResultSetSensitivity.cs b/mcs/class/System.Data/System.Data/ResultSetSensitivity.cs index c2478f75dd3..e94572b76eb 100644 --- a/mcs/class/System.Data/System.Data/ResultSetSensitivity.cs +++ b/mcs/class/System.Data/System.Data/ResultSetSensitivity.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum ResultSetSensitivity @@ -18,4 +18,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs b/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs index 6c7b2148fba..7eaae2d9084 100644 --- a/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs +++ b/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public class StatementCompletedEventArgs : EventArgs @@ -37,4 +37,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/StatementCompletedEventHandler.cs b/mcs/class/System.Data/System.Data/StatementCompletedEventHandler.cs index c22631fa17e..b1bdbbe662a 100644 --- a/mcs/class/System.Data/System.Data/StatementCompletedEventHandler.cs +++ b/mcs/class/System.Data/System.Data/StatementCompletedEventHandler.cs @@ -7,10 +7,10 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public delegate void StatementCompletedEventHandler (object sender, StatementCompletedEventArgs e); } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/UpdateOptions.cs b/mcs/class/System.Data/System.Data/UpdateOptions.cs index fdd971e5c0d..3cbc9c586ae 100644 --- a/mcs/class/System.Data/System.Data/UpdateOptions.cs +++ b/mcs/class/System.Data/System.Data/UpdateOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum UpdateOptions @@ -19,4 +19,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 |