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

ENikS · ENikS · commit 0212d7449c14 · 2019-04-09T20:24:20.000-04:00
diff --git a/src/ServiceProvider.cs b/src/ServiceProvider.cs
@@ -25,6 +25,11 @@ internal ServiceProvider(IUnityContainer container)
 
         public object GetService(Type serviceType)
         {
+            if (null == _container)
+            {
+                throw new ObjectDisposedException(nameof(IServiceProvider));
+            }
+
             try
             {
                 return _container.Resolve(serviceType);
diff --git a/tests/Unity.Microsoft.DependencyInjection.Tests.csproj b/tests/Unity.Microsoft.DependencyInjection.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,11 @@ internal ServiceProvider(IUnityContainer container)`
`25`	`25`
`26`	`26`	`public object GetService(Type serviceType)`
`27`	`27`	`{`
	`28`	`+ if (null == _container)`
	`29`	`+ {`
	`30`	`+ throw new ObjectDisposedException(nameof(IServiceProvider));`
	`31`	`+ }`
	`32`	`+`
`28`	`33`	`try`
`29`	`34`	`{`
`30`	`35`	`return _container.Resolve(serviceType);`