Performance optimizations

Author: ENikS

src/ServiceProvider.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using Unity.Lifetime;
 
 namespace Unity.Microsoft.DependencyInjection
 {
@@ -14,9 +15,9 @@ public class ServiceProvider : IServiceProvider,
         internal ServiceProvider(IUnityContainer container)
         {
             _container = container;
-            _container.RegisterInstance<IServiceScope>(this);
-            _container.RegisterInstance<IServiceProvider>(this);
-            _container.RegisterInstance<IServiceScopeFactory>(this);
+            _container.RegisterInstance<IServiceScope>(this, new ExternallyControlledLifetimeManager());
+            _container.RegisterInstance<IServiceProvider>(this, new ExternallyControlledLifetimeManager());
+            _container.RegisterInstance<IServiceScopeFactory>(this, new ExternallyControlledLifetimeManager());
         }
 
         #region IServiceProvider
@@ -39,8 +40,7 @@ public object GetService(Type serviceType)
 
         public IServiceScope CreateScope()
         {
-            return new ServiceProvider(_container.CreateChildContainer()
-                                                 .AddNewExtension<MdiExtension>());
+            return new ServiceProvider(_container.CreateChildContainer());
         }
 
         #endregion

tests/Microsoft.DependencyInjection.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>