Fixing tests

Author: ENikS

src/HostingExtension.cs

@@ -8,10 +8,17 @@ public static class HostingExtension
     {
         public static IWebHostBuilder UseUnityServiceProvider(this IWebHostBuilder hostBuilder, IUnityContainer container = null)
         {
+#if NETCOREAPP1_1
+            return hostBuilder.ConfigureServices((services) =>
+            {
+                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(new ServiceProviderFactory(container)));
+            });
+#else
             return hostBuilder.ConfigureServices((context, services) =>
             {
                 services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IUnityContainer>>(new ServiceProviderFactory(container)));
             });
+#endif
         }
     }
 }

src/Unity.Microsoft.DependencyInjection.csproj

@@ -19,17 +19,17 @@
     <RootNamespace>Unity.Microsoft.DependencyInjection</RootNamespace>
     <UnityAbstractions>..\..\Abstractions\src\Unity.Abstractions.csproj</UnityAbstractions>
     <UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
+    <TargetFrameworks>netcoreapp1.1;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
 
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <!--TargetFramework>netstandard2.0</TargetFramework-->
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <TargetFrameworks>netcoreapp1.1;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
 

tests/Microsoft.DependencyInjection.Tests.csproj

@@ -16,11 +16,11 @@
     <ProjectReference Include="..\src\Unity.Microsoft.DependencyInjection.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' == 'netstandard1.0' ">
+  <ItemGroup Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' == 'netcoreapp1.1' ">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="1.1.*" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' == 'netstandard2.0' ">
+  <ItemGroup Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' == 'netcoreapp2.0' ">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="2.0.*" />
   </ItemGroup>