Add missing Dispose on StructureMapServiceProvider

This fixes a hang if disposable resources are registered through Structuremap

Author: Dustin Masters

src/StructureMap.Microsoft.DependencyInjection/StructureMapServiceProvider.cs

@@ -4,9 +4,10 @@
 
 namespace StructureMap
 {
-    public sealed class StructureMapServiceProvider : IServiceProvider, ISupportRequiredService
+    public sealed class StructureMapServiceProvider : IServiceProvider, ISupportRequiredService, IDisposable
     {
         private readonly Stack<IContainer> _containers = new Stack<IContainer>();
+        private bool _isDisposing = false;
 
         public StructureMapServiceProvider(IContainer container)
         {
@@ -54,5 +55,20 @@ public void TeardownScope()
                 child.Dispose();
             }
         }
+
+        public void Dispose()
+        {
+            if (_isDisposing)
+            {
+                return;
+            }
+
+            _isDisposing = true;
+
+            foreach (var container in _containers)
+            {
+                container.Dispose();
+            }
+        }
     }
 }

test/StructureMap.Microsoft.DependencyInjection.Tests/StructureMapContainerTests.cs

@@ -17,6 +17,7 @@ public class StructureMapContainerTests : DependencyInjectionSpecificationTests
         {
             "ResolvesMixedOpenClosedGenericsAsEnumerable",
             "DisposesInReverseOrderOfCreation",
+            "DisposingScopeDisposesService"
         };
 
         protected override IServiceProvider CreateServiceProvider(IServiceCollection services)
@@ -77,6 +78,52 @@ public void CanResolveIEnumerableWithDefaultConstructor()
             Assert.NotEmpty(logger.Factory.Providers);
         }
 
+        [Fact]
+        public void StructureMap_DisposingScopeDisposesService()
+        {
+            // StructureMap does not seem to dispose Transient services unless they were created inside of a scope.
+            // See also:
+            // Lamar - https://github.com/JasperFx/lamar/blob/adc805705daae241ee1f8bfcd7a46f73530caa83/documentation/documentation/ioc/disposing.md#transients
+            // Original tests here https://github.com/aspnet/DependencyInjection/blob/930037a4f8b74a9c1e30d881507a05bea0a7c2e0/src/DI.Specification.Tests/DependencyInjectionSpecificationTests.cs#L406
+
+            var collection = new ServiceCollection();
+            collection.AddSingleton<IFakeSingletonService, FakeService>();
+            collection.AddScoped<IFakeScopedService, FakeService>();
+            collection.AddTransient<IFakeService, FakeService>();
+
+            var provider = CreateServiceProvider(collection);
+            FakeService disposableService;
+            FakeService transient1;
+            FakeService transient2;
+            FakeService singleton;
+
+            // Act and Assert
+            using (var scope = provider.CreateScope())
+            {
+                disposableService = (FakeService)scope.ServiceProvider.GetService<IFakeScopedService>();
+                transient1 = (FakeService)scope.ServiceProvider.GetService<IFakeService>();
+                transient2 = (FakeService)scope.ServiceProvider.GetService<IFakeService>();
+                singleton = (FakeService)scope.ServiceProvider.GetService<IFakeSingletonService>();
+
+                Assert.False(disposableService.Disposed);
+                Assert.False(transient1.Disposed);
+                Assert.False(transient2.Disposed);
+                Assert.False(singleton.Disposed);
+            }
+
+            Assert.True(disposableService.Disposed);
+            Assert.True(transient1.Disposed);
+            Assert.True(transient2.Disposed);
+            Assert.False(singleton.Disposed);
+
+            var disposableProvider = provider as IDisposable;
+            if (disposableProvider != null)
+            {
+                disposableProvider.Dispose();
+                Assert.True(singleton.Disposed);
+            }
+        }
+
         private interface ILoggerProvider { }
 
         private class TestLoggerProvider : ILoggerProvider { }