Merge pull request #71 from unitycontainer/release/5.11

Release/5.11
unitycontainer · Dec 12, 2019 · 7c23b47 · 7c23b47
2 parents 5cf79bc + ef0d013
commit 7c23b47
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-image: Visual Studio 2019 Preview
+image: Visual Studio 2019
 configuration: Release
 platform: Any CPU
 

diff --git a/package.props b/package.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>5.11.4</Version>
+    <Version>5.11.5</Version>
     <PackageReleaseNotes>This release is compatible with Core 3.1</PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/Extensions/HostingExtension.cs b/src/Extensions/HostingExtension.cs
@@ -14,11 +14,12 @@ public static IHostBuilder UseUnityServiceProvider(this IHostBuilder hostBuilder
         {
             _factory = new ServiceProviderFactory(container);
 
-            return hostBuilder.ConfigureServices((context, services) =>
-            {
-                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(_factory));
-                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(_factory));
-            });
+            return hostBuilder.UseServiceProviderFactory<IUnityContainer>(_factory)
+                              .ConfigureServices((context, services) =>
+                              {
+                                  services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(_factory));
+                                  services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(_factory));
+                              });
         }
 
         public static IWebHostBuilder UseUnityServiceProvider(this IWebHostBuilder hostBuilder, IUnityContainer container = null)

diff --git a/src/Unity.Microsoft.DependencyInjection.csproj b/src/Unity.Microsoft.DependencyInjection.csproj
@@ -25,7 +25,7 @@
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <DebugType>Full</DebugType>
   </PropertyGroup>