Skip to content

Commit

Permalink
Add missing IAsyncDisposable interfaces to System.Data
Browse files Browse the repository at this point in the history
Part of #35012
  • Loading branch information
roji committed Sep 6, 2019
1 parent 8bcf07a commit ec423d8
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 18 deletions.
8 changes: 4 additions & 4 deletions src/System.Data.Common/ref/System.Data.Common.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1796,7 +1796,7 @@ protected DbColumn() { }
public int? NumericScale { get { throw null; } protected set { } }
public string UdtAssemblyQualifiedName { get { throw null; } protected set { } }
}
public abstract partial class DbCommand : System.ComponentModel.Component, System.Data.IDbCommand, System.IDisposable
public abstract partial class DbCommand : System.ComponentModel.Component, System.Data.IDbCommand, System.IDisposable, System.IAsyncDisposable
{
protected DbCommand() { }
[System.ComponentModel.DefaultValueAttribute("")]
Expand Down Expand Up @@ -1893,7 +1893,7 @@ protected void RowUpdatingHandler(System.Data.Common.RowUpdatingEventArgs rowUpd
protected abstract void SetRowUpdatingHandler(System.Data.Common.DbDataAdapter adapter);
public virtual string UnquoteIdentifier(string quotedIdentifier) { throw null; }
}
public abstract partial class DbConnection : System.ComponentModel.Component, System.Data.IDbConnection, System.IDisposable
public abstract partial class DbConnection : System.ComponentModel.Component, System.Data.IDbConnection, System.IDisposable, System.IAsyncDisposable
{
protected DbConnection() { }
[System.ComponentModel.DefaultValueAttribute("")]
Expand Down Expand Up @@ -2050,7 +2050,7 @@ protected virtual void TerminateBatching() { }
public int Update(System.Data.DataSet dataSet, string srcTable) { throw null; }
public int Update(System.Data.DataTable dataTable) { throw null; }
}
public abstract partial class DbDataReader : System.MarshalByRefObject, System.Collections.IEnumerable, System.Data.IDataReader, System.Data.IDataRecord, System.IDisposable
public abstract partial class DbDataReader : System.MarshalByRefObject, System.Collections.IEnumerable, System.Data.IDataReader, System.Data.IDataRecord, System.IDisposable, System.IAsyncDisposable
{
protected DbDataReader() { }
public abstract int Depth { get; }
Expand Down Expand Up @@ -2353,7 +2353,7 @@ public sealed partial class DbProviderSpecificTypePropertyAttribute : System.Att
public DbProviderSpecificTypePropertyAttribute(bool isProviderSpecificTypeProperty) { }
public bool IsProviderSpecificTypeProperty { get { throw null; } }
}
public abstract partial class DbTransaction : System.MarshalByRefObject, System.Data.IDbTransaction, System.IDisposable
public abstract partial class DbTransaction : System.MarshalByRefObject, System.Data.IDbTransaction, System.IDisposable, System.IAsyncDisposable
{
protected DbTransaction() { }
public System.Data.Common.DbConnection Connection { get { throw null; } }
Expand Down
2 changes: 1 addition & 1 deletion src/System.Data.Common/src/System/Data/Common/DbCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace System.Data.Common
{
public abstract class DbCommand : Component, IDbCommand
public abstract class DbCommand : Component, IDbCommand, IAsyncDisposable
{
protected DbCommand() : base()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace System.Data.Common
{
public abstract class DbConnection : Component, IDbConnection
public abstract class DbConnection : Component, IDbConnection, IAsyncDisposable
{
#pragma warning disable 649 // ignore unassigned field warning
internal bool _suppressStateChangeForReconnection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace System.Data.Common
{
public abstract class DbDataReader : MarshalByRefObject, IDataReader, IEnumerable
public abstract class DbDataReader : MarshalByRefObject, IDataReader, IEnumerable, IAsyncDisposable
{
protected DbDataReader() : base() { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace System.Data.Common
{
public abstract class DbTransaction : MarshalByRefObject, IDbTransaction
public abstract class DbTransaction : MarshalByRefObject, IDbTransaction, IAsyncDisposable
{
protected DbTransaction() : base() { }

Expand Down
5 changes: 0 additions & 5 deletions src/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultEventAttribute'
CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultEventAttribute' exists on 'System.Diagnostics.Process' in the contract but not the implementation.
CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultPropertyAttribute' exists on 'System.Diagnostics.Process' in the contract but not the implementation.
CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultEventAttribute' exists on 'System.IO.FileSystemWatcher' in the contract but not the implementation.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.DataTableReader' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.Common.DbCommand' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.Common.DbConnection' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.Common.DbDataReader' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.Common.DbTransaction' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Runtime.InteropServices.ManagedToNativeComInteropStubAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Method, Inherited=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Method, Inherited=false, AllowMultiple=false)]' in the implementation.
CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xml.Serialization.XmlAnyAttributeAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]' in the implementation.
CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xml.Serialization.XmlNamespaceDeclarationsAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]' in the implementation.
Expand Down
5 changes: 0 additions & 5 deletions src/shims/ApiCompatBaseline.uap.netstandardOnly.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ TypesMustExist : Type 'System.Diagnostics.Tracing.PollingCounter' does not exist
TypesMustExist : Type 'System.IO.Compression.BrotliDecoder' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.IO.Compression.BrotliEncoder' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'System.IO.Compression.BrotliStream' does not exist in the implementation but it does exist in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.DataTableReader' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.Common.DbCommand' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.Common.DbConnection' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.Common.DbDataReader' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Data.Common.DbTransaction' does not implement interface 'System.IAsyncDisposable' in the implementation but it does in the contract.
CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Runtime.InteropServices.ManagedToNativeComInteropStubAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Method, Inherited=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Method, Inherited=false, AllowMultiple=false)]' in the implementation.
CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xml.Serialization.XmlAnyAttributeAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]' in the implementation.
CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xml.Serialization.XmlNamespaceDeclarationsAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]' in the implementation.
Expand Down

0 comments on commit ec423d8

Please sign in to comment.