diff --git a/src/libraries/System.Data.Common/ref/System.Data.Common.cs b/src/libraries/System.Data.Common/ref/System.Data.Common.cs
index d47c6f982b3f59..0b54d0b9448ecc 100644
--- a/src/libraries/System.Data.Common/ref/System.Data.Common.cs
+++ b/src/libraries/System.Data.Common/ref/System.Data.Common.cs
@@ -1786,7 +1786,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("")]
@@ -1883,7 +1883,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("")]
@@ -2040,7 +2040,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; }
@@ -2343,7 +2343,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; } }
diff --git a/src/libraries/System.Data.Common/src/System/Data/Common/DbCommand.cs b/src/libraries/System.Data.Common/src/System/Data/Common/DbCommand.cs
index 8aaf84a8ab4f9a..827ac59e8fae77 100644
--- a/src/libraries/System.Data.Common/src/System/Data/Common/DbCommand.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/Common/DbCommand.cs
@@ -8,7 +8,7 @@
 
 namespace System.Data.Common
 {
-    public abstract class DbCommand : Component, IDbCommand
+    public abstract class DbCommand : Component, IDbCommand, IAsyncDisposable
     {
         protected DbCommand() : base()
         {
diff --git a/src/libraries/System.Data.Common/src/System/Data/Common/DbConnection.cs b/src/libraries/System.Data.Common/src/System/Data/Common/DbConnection.cs
index e2ba5d65e07ec1..1afbcd92c61d5c 100644
--- a/src/libraries/System.Data.Common/src/System/Data/Common/DbConnection.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/Common/DbConnection.cs
@@ -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;
diff --git a/src/libraries/System.Data.Common/src/System/Data/Common/DbDataReader.cs b/src/libraries/System.Data.Common/src/System/Data/Common/DbDataReader.cs
index 9144c2f0061faa..bb86911e22d468 100644
--- a/src/libraries/System.Data.Common/src/System/Data/Common/DbDataReader.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/Common/DbDataReader.cs
@@ -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() { }
 
diff --git a/src/libraries/System.Data.Common/src/System/Data/Common/DbTransaction.cs b/src/libraries/System.Data.Common/src/System/Data/Common/DbTransaction.cs
index c1342b456ee3d1..484d432508dfe5 100644
--- a/src/libraries/System.Data.Common/src/System/Data/Common/DbTransaction.cs
+++ b/src/libraries/System.Data.Common/src/System/Data/Common/DbTransaction.cs
@@ -7,7 +7,7 @@
 
 namespace System.Data.Common
 {
-    public abstract class DbTransaction : MarshalByRefObject, IDbTransaction
+    public abstract class DbTransaction : MarshalByRefObject, IDbTransaction, IAsyncDisposable
     {
         protected DbTransaction() : base() { }
 
diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt b/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
index ad0639169322d2..1f2e934ccc022d 100644
--- a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
+++ b/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
@@ -11,11 +11,6 @@ CannotRemoveAttribute : Attribute 'System.ComponentModel.BrowsableAttribute' exi
 CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultValueAttribute' exists on 'System.ComponentModel.BackgroundWorker.WorkerReportsProgress' in the contract but not the implementation.
 CannotRemoveAttribute : Attribute 'System.ComponentModel.DefaultValueAttribute' exists on 'System.ComponentModel.BackgroundWorker.WorkerSupportsCancellation' in the contract but not the implementation.
 CannotRemoveAttribute : Attribute 'System.ComponentModel.BrowsableAttribute' exists on 'System.ComponentModel.RunWorkerCompletedEventArgs.UserState' 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.
 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.DesignerSerializationVisibilityAttribute' exists on 'System.Diagnostics.Process.BasePriority' in the contract but not the implementation.