Allowed multiple Simple Injector containers, coupled to a single service collection, to be disposed on shutdown. Fixes #32

Author: dotnetjunkie

src/SimpleInjector.Integration.AspNetCore/SimpleInjectorAddOptionsAspNetCoreExtensions.cs

@@ -4,6 +4,7 @@
 namespace SimpleInjector
 {
     using System;
+    using System.Linq;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -116,19 +117,24 @@ private static IServiceProviderAccessor CreateServiceProviderAccessor(
         private static void AddContainerDisposalOnShutdown(
             SimpleInjectorAddOptions options, IServiceCollection services)
         {
-            // DisposeContainerWithServiceProvider only support synchronous disposal, so we replace this with an
+            // The core implementation only support synchronous disposal, so we replace this with an
             // ASP.NET Core-specific implementation that actually supports asynchronous disposal. This can be done
             // with an IHostedService implementation.
-            services.AddSingleton<ContainerDisposeWrapper>();
+
+            // #32. By calling AddSingleton<T>(_ => new ...) we allow multiple wrappers to be registered, in case the
+            // user want to couple multiple container instances to one MS.DI instance. This isn't possible when calling
+            // AddSingleton<T>().
+            var wrapper = new ContainerDisposeWrapper(options.Container);
+            services.AddSingleton(_ => wrapper);
 
             options.Container.Options.ContainerLocking += (_, __) =>
             {
                 // If there's no IServiceProvider, the property will throw, which is something we want to do at this
                 // point, not later on, when an unregistered type is resolved.
                 IServiceProvider provider = options.ApplicationServices;
 
-                // In order for the wrapper to get disposed of, it needs to be resolved once.
-                provider.GetRequiredService<ContainerDisposeWrapper>();
+                // In order for the wrappers to get disposed of, they needs to be resolved once.
+                provider.GetServices<ContainerDisposeWrapper>().ToArray();
             };
 
             // By setting the property to false, we prevent the AddSimpleInjector method from adding its own shutdown

src/SimpleInjector.Integration.ServiceCollection/SimpleInjectorServiceCollectionExtensions.cs

@@ -22,9 +22,9 @@ namespace SimpleInjector
     /// </summary>
     public static class SimpleInjectorServiceCollectionExtensions
     {
-        private static readonly object AddOptionsKey = new object();
-        private static readonly object AddLoggingKey = new object();
-        private static readonly object AddLocalizationKey = new object();
+        private static readonly object AddOptionsKey = new();
+        private static readonly object AddLoggingKey = new();
+        private static readonly object AddLocalizationKey = new();
 
         /// <summary>
         /// Sets up the basic configuration that allows Simple Injector to be used in frameworks that require
@@ -457,17 +457,20 @@ private static void AddContainerDisposalOnShutdown(
             // #32. By calling AddSingleton<T>(_ => new ...) we allow multiple wrappers to be registered, in case the
             // user want to couple multiple container instances to one MS.DI instance. This isn't possible when calling
             // AddSingleton<T>().
-            services.AddSingleton(_ => new ContainerDisposeWrapper(options.Container));
+            var wrapper = new ContainerDisposeWrapper(options.Container);
+            services.AddSingleton(_ => wrapper);
 
             options.Container.Options.ContainerLocking += (_, __) =>
             {
                 // If there's no IServiceProvider, the property will throw, which is something we want to do
                 // at this point, not later on, when an unregistered type is resolved.
                 IServiceProvider provider = options.ApplicationServices;
 
-                // In order for the wrapper to get disposed of, it needs to be resolved once.
-                var wrapper = provider.GetRequiredService<ContainerDisposeWrapper>();
-                wrapper.FrameworkProviderType = provider.GetType();
+                // In order for the wrappers to get disposed of, they needs to be resolved once.
+                foreach (var wrapper in provider.GetServices<ContainerDisposeWrapper>())
+                {
+                    wrapper.FrameworkProviderType = provider.GetType();
+                }
             };
         }