[Blazor] OwningComponentBase Dispose method in .NET 10 gets back the original behavior

src/Components/Components/src/OwningComponentBase.cs

@@ -44,7 +44,7 @@ protected IServiceProvider ScopedServices
         }
     }
 
-    /// <inhertidoc />
+    /// <inheritdoc />
     void IDisposable.Dispose()
     {
         Dispose(disposing: true);
@@ -69,12 +69,14 @@ protected virtual void Dispose(bool disposing)
         }
     }
 
-    /// <inhertidoc />
+    /// <inheritdoc />
     async ValueTask IAsyncDisposable.DisposeAsync()
     {
-        await DisposeAsyncCore().ConfigureAwait(false);
-
-        Dispose(disposing: false);
+        if (!IsDisposed)
+        {
+            await DisposeAsyncCore().ConfigureAwait(false);
+            Dispose(disposing: true);
+        }
         GC.SuppressFinalize(this);
     }
 
@@ -84,13 +86,11 @@ async ValueTask IAsyncDisposable.DisposeAsync()
     /// <returns>A task that represents the asynchronous dispose operation.</returns>
     protected virtual async ValueTask DisposeAsyncCore()
     {
-        if (!IsDisposed && _scope.HasValue)
+        if (_scope.HasValue)
         {
             await _scope.Value.DisposeAsync().ConfigureAwait(false);
             _scope = null;
         }
-
-        IsDisposed = true;
     }
 }
 

src/Components/Components/test/OwningComponentBaseTest.cs

@@ -111,6 +111,34 @@ public MyService(Counter counter)
         void IDisposable.Dispose() => Counter.DisposedCount++;
     }
 
+    [Fact]
+    public async Task DisposeAsync_CallsDispose_WithDisposingTrue()
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton<Counter>();
+        services.AddTransient<MyService>();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var renderer = new TestRenderer(serviceProvider);
+        var component = (ComponentWithDispose)renderer.InstantiateComponent<ComponentWithDispose>();
+
+        _ = component.MyService;
+        await ((IAsyncDisposable)component).DisposeAsync();
+        Assert.True(component.DisposingParameter);
+    }
+
+    private class ComponentWithDispose : OwningComponentBase<MyService>
+    {
+        public MyService MyService => Service;
+        public bool? DisposingParameter { get; private set; }
+
+        protected override void Dispose(bool disposing)
+        {
+            DisposingParameter = disposing;
+            base.Dispose(disposing);
+        }
+    }
+
     private class MyOwningComponent : OwningComponentBase<MyService>
     {
         public MyService MyService => Service;