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

ENikS · ENikS · commit 09697b6b651c · 2019-03-23T17:56:10.000-04:00
diff --git a/src/ServiceProvider.cs b/src/ServiceProvider.cs
@@ -75,12 +75,9 @@ public static explicit operator UnityContainer(ServiceProvider c)
 
         public void Dispose()
         {
-            // TODO: Disabled until these issues are resolved
-            // https://github.com/unitycontainer/microsoft-dependency-injection/issues/40
-            // https://github.com/aspnet/Extensions/issues/1301
-            //IDisposable disposable = _container;
-            //_container = null;
-            //disposable?.Dispose();
+            IDisposable disposable = _container;
+            _container = null;
+            disposable?.Dispose();
         }
 
         #endregion

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,9 @@ public static explicit operator UnityContainer(ServiceProvider c)`
`75`	`75`
`76`	`76`	`public void Dispose()`
`77`	`77`	`{`
`78`		`- // TODO: Disabled until these issues are resolved`
`79`		`- // https://github.com/unitycontainer/microsoft-dependency-injection/issues/40`
`80`		`- // https://github.com/aspnet/Extensions/issues/1301`
`81`		`- //IDisposable disposable = _container;`
`82`		`- //_container = null;`
`83`		`- //disposable?.Dispose();`
	`78`	`+ IDisposable disposable = _container;`
	`79`	`+ _container = null;`
	`80`	`+ disposable?.Dispose();`
`84`	`81`	`}`
`85`	`82`
`86`	`83`	`#endregion`