Updatin dependencies

Author: ENikS

src/HostingExtension.cs

@@ -6,17 +6,23 @@ namespace Unity.Microsoft.DependencyInjection
 {
     public static class HostingExtension
     {
+        private static ServiceProviderFactory _factory;
+
         public static IWebHostBuilder UseUnityServiceProvider(this IWebHostBuilder hostBuilder, IUnityContainer container = null)
         {
+            _factory = new ServiceProviderFactory(container);
+
 #if NETCOREAPP1_1
             return hostBuilder.ConfigureServices((services) =>
             {
-                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(new ServiceProviderFactory(container)));
+                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(_factory));
+                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(_factory));
             });
 #else
             return hostBuilder.ConfigureServices((context, services) =>
             {
-                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(new ServiceProviderFactory(container)));
+                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(_factory));
+                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(_factory));
             });
 #endif
         }

src/ServiceProvider.cs

@@ -77,7 +77,7 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        private void Dispose(bool mode)
+        private void Dispose(bool _)
         {
             IDisposable disposable = _container;
             _container = null;

src/ServiceProviderFactory.cs

@@ -1,27 +1,50 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Unity.Lifetime;
 
 namespace Unity.Microsoft.DependencyInjection
 {
-    public class ServiceProviderFactory : IServiceProviderFactory<IUnityContainer>
+    public class ServiceProviderFactory : IServiceProviderFactory<IUnityContainer>,
+                                          IServiceProviderFactory<IServiceCollection>
     {
         private readonly IUnityContainer _container;
 
         public ServiceProviderFactory(IUnityContainer container)
         {
             _container = container ?? new UnityContainer();
-        }
 
-        public IUnityContainer CreateBuilder(IServiceCollection services)
-        {
-            return _container.CreateChildContainer()
-                             .AddExtension(new MdiExtension())
-                             .AddServices(services);
+            _container.RegisterInstance<IServiceProviderFactory<IUnityContainer>>(this, new ContainerControlledLifetimeManager());
+            _container.RegisterInstance<IServiceProviderFactory<IServiceCollection>>(this, new ExternallyControlledLifetimeManager());
         }
 
         public IServiceProvider CreateServiceProvider(IUnityContainer container)
         {
             return new ServiceProvider(container);
         }
+
+        public IServiceProvider CreateServiceProvider(IServiceCollection containerBuilder)
+        {
+            return new ServiceProvider(CreateServiceProviderContainer(containerBuilder));
+        }
+
+        IUnityContainer IServiceProviderFactory<IUnityContainer>.CreateBuilder(IServiceCollection services)
+        {
+            return CreateServiceProviderContainer(services);
+        }
+
+        IServiceCollection IServiceProviderFactory<IServiceCollection>.CreateBuilder(IServiceCollection services)
+        {
+            return services;
+        }
+
+
+        private IUnityContainer CreateServiceProviderContainer(IServiceCollection services)
+        {
+            var container = _container.CreateChildContainer();
+            new ServiceProviderFactory(container);
+
+            return container.AddExtension(new MdiExtension())
+                            .AddServices(services);
+        }
     }
 }

src/Unity.Microsoft.DependencyInjection.csproj

@@ -56,11 +56,11 @@
 
 
   <ItemGroup Condition="!Exists('$(UnityAbstractions)')">
-    <PackageReference Include="Unity.Abstractions" Version="$(UnityAbstractionsVersion)" />
+    <PackageReference Include="Unity.Abstractions" Version="3.3.1" />
   </ItemGroup>
 
   <ItemGroup Condition="!Exists('$(UnityContainer)')">
-    <PackageReference Include="Unity.Container" Version="$(UnityContainerVersion)" />      
+    <PackageReference Include="Unity.Container" Version="5.8.9" />      
   </ItemGroup>
 
 </Project>