Change IResettableService.ResetStateAsync() to return Task

src/EFCore.Cosmos/Storage/Internal/CosmosTransactionManager.cs

@@ -91,7 +91,8 @@ public virtual void ResetState()
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public virtual ValueTask ResetStateAsync()
+        /// <param name="cancellationToken"> A <see cref="CancellationToken" /> to observe while waiting for the task to complete. </param>
+        public virtual Task ResetStateAsync(CancellationToken cancellationToken = default)
         {
             ResetState();
 

src/EFCore.InMemory/Storage/Internal/InMemoryTransactionManager.cs

@@ -133,7 +133,8 @@ public virtual void ResetState()
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public virtual ValueTask ResetStateAsync()
+        /// <param name="cancellationToken"> A <see cref="CancellationToken" /> to observe while waiting for the task to complete. </param>
+        public virtual Task ResetStateAsync(CancellationToken cancellationToken = default)
         {
             ResetState();
 

src/EFCore.Relational/Storage/RelationalConnection.cs

@@ -726,7 +726,7 @@ private bool ShouldClose()
 
         void IResettableService.ResetState() => Dispose();
 
-        ValueTask IResettableService.ResetStateAsync() => DisposeAsync();
+        Task IResettableService.ResetStateAsync(CancellationToken cancellationToken) => DisposeAsync().AsTask();
 
         /// <summary>
         ///     Gets a semaphore used to serialize access to this connection.

src/EFCore/ChangeTracking/ChangeTracker.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
@@ -380,7 +381,7 @@ void IResettableService.ResetState()
             DeleteOrphansTiming = CascadeTiming.Immediate;
         }
 
-        ValueTask IResettableService.ResetStateAsync()
+        Task IResettableService.ResetStateAsync(CancellationToken cancellationToken)
         {
             ((IResettableService)this).ResetState();
 

src/EFCore/ChangeTracking/Internal/StateManager.cs

@@ -709,7 +709,8 @@ public virtual void ResetState()
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public virtual ValueTask ResetStateAsync()
+        /// <param name="cancellationToken"> A <see cref="CancellationToken" /> to observe while waiting for the task to complete. </param>
+        public virtual Task ResetStateAsync(CancellationToken cancellationToken = default)
         {
             ResetState();
 

src/EFCore/DbContext.cs

@@ -661,7 +661,7 @@ void IDbContextPoolable.Resurrect(DbContextPoolConfigurationSnapshot configurati
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        void IDbContextPoolable.ResetState()
+        void IResettableService.ResetState()
         {
             foreach (var service in GetResettableServices())
             {
@@ -677,11 +677,12 @@ void IDbContextPoolable.ResetState()
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        async ValueTask IDbContextPoolable.ResetStateAsync()
+        /// <param name="cancellationToken"> A <see cref="CancellationToken" /> to observe while waiting for the task to complete. </param>
+        async Task IResettableService.ResetStateAsync(CancellationToken cancellationToken)
         {
             foreach (var service in GetResettableServices())
             {
-                await service.ResetStateAsync();
+                await service.ResetStateAsync(cancellationToken);
             }
 
             _disposed = true;

src/EFCore/Infrastructure/IResettableService.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -33,7 +34,8 @@ public interface IResettableService
         /// <summary>
         ///     Resets the service so that it can be used from the pool.
         /// </summary>
+        /// <param name="cancellationToken"> A <see cref="CancellationToken" /> to observe while waiting for the task to complete. </param>
         /// <returns> A task that represents the asynchronous operation. </returns>
-        ValueTask ResetStateAsync();
+        Task ResetStateAsync(CancellationToken cancellationToken = default);
     }
 }

src/EFCore/Internal/IDbContextPoolable.cs

@@ -1,8 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace Microsoft.EntityFrameworkCore.Internal
 {
@@ -12,7 +12,7 @@ namespace Microsoft.EntityFrameworkCore.Internal
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public interface IDbContextPoolable
+    public interface IDbContextPoolable : IResettableService
     {
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -37,21 +37,5 @@ public interface IDbContextPoolable
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         void Resurrect([NotNull] DbContextPoolConfigurationSnapshot configurationSnapshot);
-
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     any release. You should only use it directly in your code with extreme caution and knowing that
-        ///     doing so can result in application failures when updating to a new Entity Framework Core release.
-        /// </summary>
-        void ResetState();
-
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     any release. You should only use it directly in your code with extreme caution and knowing that
-        ///     doing so can result in application failures when updating to a new Entity Framework Core release.
-        /// </summary>
-        ValueTask ResetStateAsync();
     }
 }

src/EFCore/Internal/InternalDbSet.cs

@@ -391,7 +391,8 @@ IServiceProvider IInfrastructure<IServiceProvider>.Instance
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        ValueTask IResettableService.ResetStateAsync()
+        /// <param name="cancellationToken"> A <see cref="CancellationToken" /> to observe while waiting for the task to complete. </param>
+        Task IResettableService.ResetStateAsync(CancellationToken cancellationToken)
         {
             ((IResettableService)this).ResetState();
 

test/EFCore.Relational.Tests/RelationalDatabaseFacadeExtensionsTest.cs

@@ -153,7 +153,7 @@ public void ResetState()
             {
             }
 
-            public ValueTask ResetStateAsync() => default;
+            public Task ResetStateAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
 
             public IDbContextTransaction BeginTransaction()
             {

test/EFCore.Relational.Tests/RelationalEventIdTest.cs

@@ -167,7 +167,7 @@ public Task<bool> OpenAsync(CancellationToken cancellationToken, bool errorsExpe
                 throw new NotImplementedException();
 
             public void ResetState() => throw new NotImplementedException();
-            public ValueTask ResetStateAsync() => throw new NotImplementedException();
+            public Task ResetStateAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException();
 
             public void RollbackTransaction() => throw new NotImplementedException();
             public IDbContextTransaction UseTransaction(DbTransaction transaction) => throw new NotImplementedException();

test/EFCore.Sqlite.FunctionalTests/Query/BadDataSqliteTest.cs

@@ -354,7 +354,7 @@ public void ResetState()
             {
             }
 
-            public ValueTask ResetStateAsync() => default;
+            public Task ResetStateAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
 
             public IDbContextTransaction BeginTransaction() => throw new NotImplementedException();
 

test/EFCore.Tests/DatabaseFacadeTest.cs

@@ -171,7 +171,7 @@ public Task<IDbContextTransaction> BeginTransactionAsync(CancellationToken cance
             public void EnlistTransaction(Transaction transaction) => throw new NotImplementedException();
 
             public void ResetState() => throw new NotImplementedException();
-            public ValueTask ResetStateAsync() => throw new NotImplementedException();
+            public Task ResetStateAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException();
         }
 
         private class FakeDbContextTransaction : IDbContextTransaction

test/EFCore.Tests/Infrastructure/EntityFrameworkServicesBuilderTest.cs

@@ -345,7 +345,7 @@ public void ResetState()
             {
             }
 
-            public ValueTask ResetStateAsync() => default;
+            public Task ResetStateAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
         }
 
         private static DbContext CreateContext(IServiceProvider serviceProvider)

test/EFCore.Tests/TestUtilities/FakeStateManager.cs

@@ -34,7 +34,7 @@ public void ResetState()
         {
         }
 
-        public ValueTask ResetStateAsync() => default;
+        public Task ResetStateAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
 
         public void Unsubscribe()
         {