Use new ADO.NET async APIs

Fixes #9015
Fixes #15917

src/EFCore.Relational/Diagnostics/DbConnectionInterceptor.cs

@@ -109,7 +109,7 @@ public virtual void ConnectionOpened(DbConnection connection, ConnectionEndEvent
             => result;
 
         /// <summary>
-        ///     Called just before EF intends to call <see cref="DbConnection.Close()" /> in an async context.
+        ///     Called just before EF intends to call <see cref="DbConnection.CloseAsync()" /> in an async context.
         /// </summary>
         /// <param name="connection"> The connection. </param>
         /// <param name="eventData"> Contextual information about the connection. </param>
@@ -143,7 +143,7 @@ public virtual void ConnectionOpened(DbConnection connection, ConnectionEndEvent
         }
 
         /// <summary>
-        ///     Called just after EF has called <see cref="DbConnection.Close()" />.
+        ///     Called just after EF has called <see cref="DbConnection.CloseAsync()" />.
         /// </summary>
         /// <param name="connection"> The connection. </param>
         /// <param name="eventData"> Contextual information about the connection. </param>

src/EFCore.Relational/Diagnostics/DbTransactionInterceptor.cs

@@ -67,7 +67,7 @@ public abstract class DbTransactionInterceptor : IDbTransactionInterceptor
             => result;
 
         /// <summary>
-        ///     Called just before EF intends to call <see cref="DbConnection.BeginTransaction(IsolationLevel)" />.
+        ///     Called just before EF intends to call <see cref="DbConnection.BeginTransactionAsync(IsolationLevel, CancellationToken)" />.
         /// </summary>
         /// <param name="connection"> The connection. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
@@ -92,7 +92,7 @@ public abstract class DbTransactionInterceptor : IDbTransactionInterceptor
 
         /// <summary>
         ///     <para>
-        ///         Called immediately after EF calls <see cref="DbConnection.BeginTransaction(IsolationLevel)" />.
+        ///         Called immediately after EF calls <see cref="DbConnection.BeginTransactionAsync(IsolationLevel, CancellationToken)" />.
         ///     </para>
         ///     <para>
         ///         This method is still called if an interceptor suppressed creation in <see cref="IDbTransactionInterceptor.TransactionStarting" />.
@@ -102,7 +102,7 @@ public abstract class DbTransactionInterceptor : IDbTransactionInterceptor
         /// <param name="connection"> The connection. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
         /// <param name="result">
-        ///     The result of the call to <see cref="DbConnection.BeginTransaction(IsolationLevel)" />.
+        ///     The result of the call to <see cref="DbConnection.BeginTransactionAsync(IsolationLevel, CancellationToken)" />.
         ///     This value is typically used as the return value for the implementation of this method.
         /// </param>
         /// <param name="cancellationToken"> The cancellation token. </param>
@@ -197,7 +197,7 @@ public abstract class DbTransactionInterceptor : IDbTransactionInterceptor
         }
 
         /// <summary>
-        ///     Called just before EF intends to call <see cref="DbTransaction.Commit" />.
+        ///     Called just before EF intends to call <see cref="DbTransaction.CommitAsync" />.
         /// </summary>
         /// <param name="transaction"> The transaction. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
@@ -222,7 +222,7 @@ public abstract class DbTransactionInterceptor : IDbTransactionInterceptor
             => Task.FromResult(result);
 
         /// <summary>
-        ///     Called immediately after EF calls <see cref="DbTransaction.Commit" />.
+        ///     Called immediately after EF calls <see cref="DbTransaction.CommitAsync" />.
         /// </summary>
         /// <param name="transaction"> The transaction. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
@@ -269,7 +269,7 @@ public abstract class DbTransactionInterceptor : IDbTransactionInterceptor
         }
 
         /// <summary>
-        ///     Called just before EF intends to call <see cref="DbTransaction.Rollback" />.
+        ///     Called just before EF intends to call <see cref="DbTransaction.RollbackAsync" />.
         /// </summary>
         /// <param name="transaction"> The transaction. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
@@ -294,7 +294,7 @@ public abstract class DbTransactionInterceptor : IDbTransactionInterceptor
             => Task.FromResult(result);
 
         /// <summary>
-        ///     Called immediately after EF calls <see cref="DbTransaction.Rollback" />.
+        ///     Called immediately after EF calls <see cref="DbTransaction.RollbackAsync" />.
         /// </summary>
         /// <param name="transaction"> The transaction. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>

src/EFCore.Relational/Diagnostics/IDbConnectionInterceptor.cs

@@ -99,7 +99,7 @@ public interface IDbConnectionInterceptor : IInterceptor
             CancellationToken cancellationToken = default);
 
         /// <summary>
-        ///     Called just before EF intends to call <see cref="DbConnection.Close()" />.
+        ///     Called just before EF intends to call <see cref="DbConnection.CloseAsync()" />.
         /// </summary>
         /// <param name="connection"> The connection. </param>
         /// <param name="eventData"> Contextual information about the connection. </param>
@@ -152,7 +152,7 @@ public interface IDbConnectionInterceptor : IInterceptor
             [NotNull] ConnectionEndEventData eventData);
 
         /// <summary>
-        ///     Called just after EF has called <see cref="DbConnection.Close()" />.
+        ///     Called just after EF has called <see cref="DbConnection.CloseAsync()" />.
         /// </summary>
         /// <param name="connection"> The connection. </param>
         /// <param name="eventData"> Contextual information about the connection. </param>

src/EFCore.Relational/Diagnostics/IDbTransactionInterceptor.cs

@@ -82,7 +82,7 @@ public interface IDbTransactionInterceptor : IInterceptor
             [CanBeNull] DbTransaction result);
 
         /// <summary>
-        ///     Called just before EF intends to call <see cref="DbConnection.BeginTransaction(IsolationLevel)" />.
+        ///     Called just before EF intends to call <see cref="DbConnection.BeginTransactionAsync(IsolationLevel, CancellationToken)" />.
         /// </summary>
         /// <param name="connection"> The connection. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
@@ -108,7 +108,7 @@ public interface IDbTransactionInterceptor : IInterceptor
 
         /// <summary>
         ///     <para>
-        ///         Called immediately after EF calls <see cref="DbConnection.BeginTransaction(IsolationLevel)" />.
+        ///         Called immediately after EF calls <see cref="DbConnection.BeginTransactionAsync(IsolationLevel, CancellationToken)" />.
         ///     </para>
         ///     <para>
         ///         This method is still called if an interceptor suppressed creation in <see cref="TransactionStarting" />.
@@ -118,7 +118,7 @@ public interface IDbTransactionInterceptor : IInterceptor
         /// <param name="connection"> The connection. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
         /// <param name="result">
-        ///     The result of the call to <see cref="DbConnection.BeginTransaction(IsolationLevel)" />.
+        ///     The result of the call to <see cref="DbConnection.BeginTransactionAsync(IsolationLevel, CancellationToken)" />.
         ///     This value is typically used as the return value for the implementation of this method.
         /// </param>
         /// <param name="cancellationToken"> The cancellation token. </param>
@@ -210,7 +210,7 @@ public interface IDbTransactionInterceptor : IInterceptor
             [NotNull] TransactionEndEventData eventData);
 
         /// <summary>
-        ///     Called just before EF intends to call <see cref="DbTransaction.Commit" />.
+        ///     Called just before EF intends to call <see cref="DbTransaction.CommitAsync" />.
         /// </summary>
         /// <param name="transaction"> The transaction. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
@@ -234,7 +234,7 @@ public interface IDbTransactionInterceptor : IInterceptor
             CancellationToken cancellationToken = default);
 
         /// <summary>
-        ///     Called immediately after EF calls <see cref="DbTransaction.Commit" />.
+        ///     Called immediately after EF calls <see cref="DbTransaction.CommitAsync" />.
         /// </summary>
         /// <param name="transaction"> The transaction. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
@@ -277,7 +277,7 @@ public interface IDbTransactionInterceptor : IInterceptor
             [NotNull] TransactionEndEventData eventData);
 
         /// <summary>
-        ///     Called just before EF intends to call <see cref="DbTransaction.Rollback" />.
+        ///     Called just before EF intends to call <see cref="DbTransaction.RollbackAsync" />.
         /// </summary>
         /// <param name="transaction"> The transaction. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>
@@ -301,7 +301,7 @@ public interface IDbTransactionInterceptor : IInterceptor
             CancellationToken cancellationToken = default);
 
         /// <summary>
-        ///     Called immediately after EF calls <see cref="DbTransaction.Rollback" />.
+        ///     Called immediately after EF calls <see cref="DbTransaction.RollbackAsync" />.
         /// </summary>
         /// <param name="transaction"> The transaction. </param>
         /// <param name="eventData"> Contextual information about connection and transaction. </param>

src/EFCore.Relational/Storage/RelationalConnection.cs

@@ -268,7 +268,7 @@ public virtual IDbContextTransaction BeginTransaction(System.Data.IsolationLevel
 
             var dbTransaction = interceptionResult.HasValue
                 ? interceptionResult.Value.Result
-                : DbConnection.BeginTransaction(isolationLevel); // Use BeginTransactionAsync when available
+                : await DbConnection.BeginTransactionAsync(isolationLevel, cancellationToken);
 
             dbTransaction = await Dependencies.TransactionLogger.TransactionStartedAsync(
                 this,
@@ -451,7 +451,7 @@ public virtual async Task<bool> OpenAsync(CancellationToken cancellationToken, b
         {
             if (DbConnection.State == ConnectionState.Broken)
             {
-                DbConnection.Close();
+                await DbConnection.CloseAsync();
             }
 
             var wasOpened = false;
@@ -684,7 +684,7 @@ public virtual async Task<bool> CloseAsync()
                     {
                         if (interceptionResult == null)
                         {
-                            DbConnection.Close(); // Since no CloseAsync yet
+                            await DbConnection.CloseAsync();
                         }
 
                         wasClosed = true;

src/EFCore.Relational/Storage/RelationalTransaction.cs

@@ -192,7 +192,7 @@ public virtual async Task CommitAsync(CancellationToken cancellationToken = defa
 
                 if (interceptionResult == null)
                 {
-                    _dbTransaction.Commit();
+                    await _dbTransaction.CommitAsync(cancellationToken);
                 }
 
                 await Logger.TransactionCommittedAsync(
@@ -242,7 +242,7 @@ public virtual async Task RollbackAsync(CancellationToken cancellationToken = de
 
                 if (interceptionResult == null)
                 {
-                    _dbTransaction.Rollback(); // Use RollbackAsync when available
+                    await _dbTransaction.RollbackAsync(cancellationToken);
                 }
 
                 await Logger.TransactionRolledBackAsync(

test/EFCore.SqlServer.FunctionalTests/TestUtilities/SqlServerTestStore.cs

@@ -394,21 +394,24 @@ private static Task<IEnumerable<T>> QueryAsync<T>(DbConnection connection, strin
         {
             if (connection.State != ConnectionState.Closed)
             {
-                connection.Close();
+                await connection.CloseAsync();
             }
 
             await connection.OpenAsync();
             try
             {
-                using (var transaction = useTransaction ? connection.BeginTransaction() : null)
+                using (var transaction = useTransaction ? await connection.BeginTransactionAsync() : null)
                 {
                     T result;
                     using (var command = CreateCommand(connection, sql, parameters))
                     {
                         result = await executeAsync(command);
                     }
 
-                    transaction?.Commit();
+                    if (transaction != null)
+                    {
+                        await transaction.CommitAsync();
+                    }
 
                     return result;
                 }
@@ -417,7 +420,7 @@ private static Task<IEnumerable<T>> QueryAsync<T>(DbConnection connection, strin
             {
                 if (connection.State != ConnectionState.Closed)
                 {
-                    connection.Close();
+                    await connection.CloseAsync();
                 }
             }
         }