Fixing build

Author: ENikS

src/Configuration.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 
 using Microsoft.Extensions.DependencyInjection;
 

src/MDIExtension.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Unity.Extension;
+using Unity.Extension;
 using Unity.Policy;
 
 namespace Unity.Microsoft.DependencyInjection

tests/Microsoft.DependencyInjection.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

tests/UnityDependencyInjectionTests.cs

@@ -1,7 +1,10 @@
 using System;
-
+using System.Collections;
+using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Specification;
+using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
+using Xunit;
 
 namespace Unity.Microsoft.DependencyInjection.Tests
 {
@@ -12,23 +15,67 @@ protected override IServiceProvider CreateServiceProvider(IServiceCollection ser
             var container = new UnityContainer();
             return container.Configure(serviceCollection);
         }
+
+        internal class TestServiceCollection : List<ServiceDescriptor>, IServiceCollection, IList<ServiceDescriptor>, ICollection<ServiceDescriptor>, IEnumerable<ServiceDescriptor>, IEnumerable
+        {
+        }
+
+        [Fact]
+        public void Disposing_ScopeDisposesService()
+        {
+
+            // Arrange
+
+            var collection = new TestServiceCollection();
+
+            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
+
+            var transient3 = Assert.IsType<FakeService>(provider.GetService<IFakeService>());
+
+            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);
+                Assert.True(transient3.Disposed);
+            }
+
+        }
     }
-    //public sealed class UnityDependencyInjectionTests : DependencyInjectionSpecificationTests
-    //{
-    //    /// <inheritdoc />
-    //    protected override IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
-    //    {
-    //        var container = new UnityContainer();
-    //        var provider = new ServiceProvider(container);
-
-    //        foreach (ServiceDescriptor service in serviceCollection)
-    //        {
-    //            container.RegisterType(
-    //              service.ServiceType,
-    //              service.ImplementationType);
-    //        }
-
-    //        return provider;
-    //    }
-    //}
 }