Update Generic Host projects for .NET Standard 2.1 / .NET Core 3.0

Author: fredrikhr

samples/HostingPlayground/HostingPlayground.csproj

@@ -7,17 +7,9 @@
     <LangVersion>8</LangVersion>
   </PropertyGroup>
 
-  
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.CommandLine.Hosting\System.CommandLine.Hosting.csproj" />
     <ProjectReference Include="..\..\src\System.CommandLine\System.CommandLine.csproj" />
   </ItemGroup>
 
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
-    <PackageReference Include="microsoft.extensions.hosting" Version="3.1.4" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.4" />
-  </ItemGroup>
-
 </Project>

src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj

@@ -15,6 +15,9 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp3.1'">
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
   </ItemGroup>
 

src/System.CommandLine.Hosting/HostingExtensions.cs

@@ -39,16 +39,15 @@ public static CommandLineBuilder UseHost(this CommandLineBuilder builder,
                 hostBuilder.UseInvocationLifetime(invocation);
                 configureHost?.Invoke(hostBuilder);
 
-                using (var host = hostBuilder.Build())
-                {
-                    invocation.BindingContext.AddService(typeof(IHost), _ => host);
+                using var host = hostBuilder.Build();
+
+                invocation.BindingContext.AddService(typeof(IHost), _ => host);
 
-                    await host.StartAsync();
+                await host.StartAsync();
 
-                    await next(invocation);
+                await next(invocation);
 
-                    await host.StopAsync();
-                }
+                await host.StopAsync();
             });
 
         public static CommandLineBuilder UseHost(this CommandLineBuilder builder,

src/System.CommandLine.Hosting/InvocationLifetime.cs

@@ -7,6 +7,11 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 
+#if NETSTANDARD2_0
+using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment;
+using IHostApplicationLifetime = Microsoft.Extensions.Hosting.IApplicationLifetime;
+#endif
+
 namespace System.CommandLine.Hosting
 {
     public class InvocationLifetime : IHostLifetime
@@ -18,8 +23,8 @@ public class InvocationLifetime : IHostLifetime
 
         public InvocationLifetime(
             IOptions<InvocationLifetimeOptions> options,
-            IHostingEnvironment environment,
-            IApplicationLifetime applicationLifetime,
+            IHostEnvironment environment,
+            IHostApplicationLifetime applicationLifetime,
             InvocationContext context = null,
             ILoggerFactory loggerFactory = null)
         {
@@ -40,8 +45,8 @@ public InvocationLifetime(
 
         public InvocationLifetimeOptions Options { get; }
         private ILogger Logger { get; }
-        public IHostingEnvironment Environment { get; }
-        public IApplicationLifetime ApplicationLifetime { get; }
+        public IHostEnvironment Environment { get; }
+        public IHostApplicationLifetime ApplicationLifetime { get; }
 
         public Task WaitForStartAsync(CancellationToken cancellationToken)
         {

src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Description>This package provides support for using System.CommandLine with Microsoft.Extensions.Hosting.</Description>
   </PropertyGroup>
@@ -11,9 +11,12 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\System.CommandLine\System.CommandLine.csproj" />