Merge branch 'master' of https://github.com/unitycontainer/microsoft-dependency-injection into v5.x

Author: ENikS

src/ServiceProvider.cs

@@ -16,7 +16,7 @@ internal ServiceProvider(IUnityContainer container)
         {
             _container = container;
             _container.RegisterInstance<IServiceScope>(this, new ExternallyControlledLifetimeManager());
-            _container.RegisterInstance<IServiceProvider>(this, new ExternallyControlledLifetimeManager());
+            _container.RegisterInstance<IServiceProvider>(this, new ContainerControlledLifetimeManager());
             _container.RegisterInstance<IServiceScopeFactory>(this, new ExternallyControlledLifetimeManager());
         }
 
@@ -73,12 +73,6 @@ public static explicit operator UnityContainer(ServiceProvider c)
         #region Disposable
 
         public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        private void Dispose(bool _)
         {
             IDisposable disposable = _container;
             _container = null;