Release/5.11 (#65)

* Upgrading to 3.x

* Releasing 5.11.2

Author: ENikS

package.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>5.11.1</Version>
+    <Version>5.11.2</Version>
     <PackageReleaseNotes>Bug fixes, dependency updates and minor performance optimizations </PackageReleaseNotes>
   </PropertyGroup>
 

src/Extensions/HostingExtension.cs

@@ -1,13 +1,26 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Hosting;
 
 namespace Unity.Microsoft.DependencyInjection
 {
     public static class HostingExtension
     {
         private static ServiceProviderFactory _factory;
 
+
+        public static IHostBuilder UseUnityServiceProvider(this IHostBuilder hostBuilder, IUnityContainer container = null)
+        {
+            _factory = new ServiceProviderFactory(container);
+
+            return hostBuilder.ConfigureServices((context, services) =>
+            {
+                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(_factory));
+                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(_factory));
+            });
+        }
+
         public static IWebHostBuilder UseUnityServiceProvider(this IWebHostBuilder hostBuilder, IUnityContainer container = null)
         {
             _factory = new ServiceProviderFactory(container);

src/Unity.Microsoft.DependencyInjection.csproj

@@ -51,7 +51,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" /> 
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" /> 
   </ItemGroup>
 
   <!-- Sourcelink -->

tests/Unity.Microsoft.DependencyInjection.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="3.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

tests/UnityDependencyInjectionTests.cs

@@ -15,49 +15,6 @@ protected override IServiceProvider CreateServiceProvider(IServiceCollection ser
             return serviceCollection.BuildServiceProvider();
         }
 
-        [Fact]
-#pragma warning disable xUnit1024 // Test methods cannot have overloads
-        public new void DisposesInReverseOrderOfCreation()
-#pragma warning restore xUnit1024 // Test methods cannot have overloads
-        {
-            // Arrange
-            var serviceCollection = new TestServiceCollection();
-            serviceCollection.AddSingleton<FakeDisposeCallback>();
-            serviceCollection.AddTransient<IFakeOuterService, FakeDisposableCallbackOuterService>();
-            serviceCollection.AddSingleton<IFakeMultipleService, FakeDisposableCallbackInnerService>();
-            serviceCollection.AddScoped<IFakeMultipleService, FakeDisposableCallbackInnerService>();
-            serviceCollection.AddTransient<IFakeMultipleService, FakeDisposableCallbackInnerService>();
-            serviceCollection.AddSingleton<IFakeService, FakeDisposableCallbackInnerService>();
-            var serviceProvider = CreateServiceProvider(serviceCollection);
-
-            var callback = serviceProvider.GetService<FakeDisposeCallback>();
-            var outer = serviceProvider.GetService<IFakeOuterService>();
-            var multipleServices = outer.MultipleServices.ToArray();
-
-            // Act
-            ((IDisposable)serviceProvider).Dispose();
-
-            // Assert
-            Assert.Equal(outer, callback.Disposed[0]);
-            Assert.Equal(multipleServices.Reverse(), callback.Disposed.Skip(1).Take(3).OfType<IFakeMultipleService>());
-            Assert.Equal(outer.SingleService, callback.Disposed[4]);
-        }
-
-        public class FakeDisposableCallbackOuterService : FakeDisposableCallbackService, IFakeOuterService
-        {
-            public FakeDisposableCallbackOuterService(
-                IFakeService singleService,
-                IEnumerable<IFakeMultipleService> multipleServices,
-                FakeDisposeCallback callback) : base(callback)
-            {
-                SingleService = singleService;
-                MultipleServices = multipleServices.ToArray();
-            }
-
-            public IFakeService SingleService { get; }
-            public IEnumerable<IFakeMultipleService> MultipleServices { get; }
-        }
-
         [Fact]
 #pragma warning disable xUnit1024 // Test methods cannot have overloads
         public new void ResolvesMixedOpenClosedGenericsAsEnumerable()
@@ -85,9 +42,10 @@ public FakeDisposableCallbackOuterService(
 
             Assert.Contains(instance, enumerable);
             Assert.Equal(instance, service);
-            //Assert.IsType<FakeService>(enumerable[0]);
+            Assert.IsType<FakeService>(enumerable[0]);
         }
     }
+
     internal class TestServiceCollection : List<ServiceDescriptor>, IServiceCollection
     {
     }