WIP fix: dispose IServiceProvider in MicrosoftDependencyResolver

src/Splat.Microsoft.Extensions.DependencyInjection/MicrosoftDependencyResolver.cs

@@ -12,7 +12,7 @@ namespace Splat.Microsoft.Extensions.DependencyInjection;
 /// Microsoft DI implementation for <see cref="IDependencyResolver"/>.
 /// </summary>
 /// <seealso cref="IDependencyResolver" />
-public class MicrosoftDependencyResolver : IDependencyResolver
+public class MicrosoftDependencyResolver : IDependencyResolver, IAsyncDisposable
 {
     private const string ImmutableExceptionMessage = "This container has already been built and cannot be modified.";
     private readonly object _syncLock = new();
@@ -50,6 +50,38 @@ protected virtual IServiceProvider? ServiceProvider
         }
     }
 
+    /// <summary>
+    /// Updates this instance with a collection of configured services.
+    /// </summary>
+    /// <param name="services">An instance of <see cref="IServiceCollection"/>.</param>
+    public void UpdateContainer(IServiceCollection services)
+    {
+#if NETSTANDARD || NETFRAMEWORK
+        if (services is null)
+        {
+            throw new ArgumentNullException(nameof(services));
+        }
+#else
+        ArgumentNullException.ThrowIfNull(services);
+#endif
+
+        if (_isImmutable)
+        {
+            throw new InvalidOperationException(ImmutableExceptionMessage);
+        }
+
+        lock (_syncLock)
+        {
+            if (_serviceProvider is not null)
+            {
+                DisposeServiceProvider(_serviceProvider);
+                _serviceProvider = null;
+            }
+
+            _serviceCollection = services;
+        }
+    }
+
     /// <summary>
     /// Updates this instance with a configured service Provider.
     /// </summary>
@@ -67,8 +99,15 @@ public void UpdateContainer(IServiceProvider serviceProvider)
 
         lock (_syncLock)
         {
-            _serviceCollection = null;
+            // can be null if constructor using IServiceCollection was used.
+            // and no fetch of a service was called.
+            if (_serviceProvider is not null)
+            {
+                DisposeServiceProvider(_serviceProvider);
+            }
+
             _serviceProvider = serviceProvider;
+            _serviceCollection = null;
             _isImmutable = true;
         }
     }
@@ -144,6 +183,7 @@ public virtual void Register(Func<object?> factory, Type? serviceType, string? c
             }
 
             // required so that it gets rebuilt if not injected externally.
+            DisposeServiceProvider(_serviceProvider);
             _serviceProvider = null;
         }
     }
@@ -178,6 +218,7 @@ public virtual void UnregisterCurrent(Type? serviceType, string? contract = null
             }
 
             // required so that it gets rebuilt if not injected externally.
+            DisposeServiceProvider(_serviceProvider);
             _serviceProvider = null;
         }
     }
@@ -203,6 +244,7 @@ public virtual void UnregisterAll(Type? serviceType, string? contract = null)
             if (_serviceCollection is null)
             {
                 // required so that it gets rebuilt if not injected externally.
+                DisposeServiceProvider(_serviceProvider);
                 _serviceProvider = null;
                 return;
             }
@@ -220,6 +262,7 @@ public virtual void UnregisterAll(Type? serviceType, string? contract = null)
             }
 
             // required so that it gets rebuilt if not injected externally.
+            DisposeServiceProvider(_serviceProvider);
             _serviceProvider = null;
         }
     }
@@ -249,6 +292,16 @@ public virtual bool HasRegistration(Type? serviceType, string? contract = null)
                 && keyedServiceProvider.GetKeyedService(serviceType, contract) is not null;
     }
 
+    /// <inheritdoc/>
+    public async ValueTask DisposeAsync()
+    {
+        if (_serviceProvider is IAsyncDisposable d)
+        {
+            await d.DisposeAsync();
+            GC.SuppressFinalize(this);
+        }
+    }
+
     /// <inheritdoc />
     public void Dispose()
     {
@@ -262,6 +315,18 @@ public void Dispose()
     /// <param name="disposing">Whether or not the instance is disposing.</param>
     protected virtual void Dispose(bool disposing)
     {
+        if (disposing)
+        {
+            DisposeServiceProvider(_serviceProvider);
+        }
+    }
+
+    private static void DisposeServiceProvider(IServiceProvider? sp)
+    {
+        if (sp is IDisposable d)
+        {
+            d.Dispose();
+        }
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Splat.Microsoft.Extensions.DependencyInjection/SplatMicrosoftExtensions.cs

@@ -17,7 +17,10 @@ public static class SplatMicrosoftExtensions
     /// </summary>
     /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
     public static void UseMicrosoftDependencyResolver(this IServiceCollection serviceCollection) =>
+#pragma warning disable CA2000
+        // Will be disposed with the InternalLocator
         Locator.SetLocator(new MicrosoftDependencyResolver(serviceCollection));
+#pragma warning restore CA2000
 
     /// <summary>
     /// Initializes an instance of <see cref="MicrosoftDependencyResolver"/> that overrides the default <see cref="Locator"/>
@@ -37,7 +40,10 @@ public static void UseMicrosoftDependencyResolver(this IServiceProvider serviceP
         }
         else
         {
+#pragma warning disable CA2000
+            // Will be disposed with the InternalLocator
             Locator.SetLocator(new MicrosoftDependencyResolver(serviceProvider));
+#pragma warning restore CA2000
         }
     }
 }