Update to latest dependency versions

natemcmaster · natemcmaster · commit e4e124b8893b · 2021-12-26T16:11:02.000-08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
           name: packages
           path: artifacts/
           if-no-files-found: error
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
         with:
           name: unittests-${{ matrix.os }}
           fail_ci_if_error: true
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,11 +1,11 @@
 <Project InitialTargets="UpdateCiSettings">
 
-  <ItemGroup Condition=" '$(CI)' == 'true' ">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DisablePublicApiAnalyzer)' != 'true'">
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3" PrivateAssets="All" />
     <AdditionalFiles Include="PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="PublicAPI.Unshipped.txt" />
   </ItemGroup>
diff --git a/src/Hosting.CommandLine/HostBuilderExtensions.cs b/src/Hosting.CommandLine/HostBuilderExtensions.cs
@@ -139,7 +139,7 @@ private static IServiceCollection AddCommonServices(this IServiceCollection serv
                 .AddSingleton<IHostLifetime, CommandLineLifetime>()
                 .AddSingleton(provider =>
                 {
-                    state.SetConsole(provider.GetService<IConsole>());
+                    state.SetConsole(provider.GetRequiredService<IConsole>());
                     return state;
                 })
                 .AddSingleton<CommandLineContext>(state);
diff --git a/src/Hosting.CommandLine/Internal/CommandLineLifetime.cs b/src/Hosting.CommandLine/Internal/CommandLineLifetime.cs
@@ -16,15 +16,15 @@ namespace McMaster.Extensions.Hosting.CommandLine.Internal
     /// </summary>
     internal class CommandLineLifetime : IHostLifetime, IDisposable
     {
-        private readonly IApplicationLifetime _applicationLifetime;
+        private readonly IHostApplicationLifetime _applicationLifetime;
         private readonly ICommandLineService _cliService;
         private readonly IConsole _console;
         private readonly IUnhandledExceptionHandler? _unhandledExceptionHandler;
 
         /// <summary>
         ///     Creates a new instance.
         /// </summary>
-        public CommandLineLifetime(IApplicationLifetime applicationLifetime,
+        public CommandLineLifetime(IHostApplicationLifetime applicationLifetime,
             ICommandLineService cliService,
             IConsole console,
             IUnhandledExceptionHandler? unhandledExceptionHandler = null)
diff --git a/src/Hosting.CommandLine/Internal/CommandLineService.cs b/src/Hosting.CommandLine/Internal/CommandLineService.cs
@@ -17,7 +17,7 @@ namespace McMaster.Extensions.Hosting.CommandLine.Internal
     internal class CommandLineService : IDisposable, ICommandLineService
     {
         private readonly CommandLineApplication _application;
-        private readonly ILogger _logger;
+        private readonly ILogger<CommandLineService>? _logger;
         private readonly CommandLineState _state;
 
         /// <summary>
@@ -27,13 +27,16 @@ internal class CommandLineService : IDisposable, ICommandLineService
         /// <param name="state">The command line state</param>
         /// <param name="serviceProvider">The DI service provider</param>
         /// <param name="configure">The delegate to configure the app</param>
-        public CommandLineService(ILogger<CommandLineService> logger, CommandLineState state,
-            IServiceProvider serviceProvider, Action<CommandLineApplication> configure)
+        public CommandLineService(
+            CommandLineState state,
+            IServiceProvider serviceProvider,
+            Action<CommandLineApplication> configure,
+            ILogger<CommandLineService>? logger = null)
         {
             _logger = logger;
             _state = state;
 
-            logger.LogDebug("Constructing CommandLineApplication with args [{args}]", string.Join(",", state.Arguments));
+            logger?.LogDebug("Constructing CommandLineApplication with args [{args}]", string.Join(",", state.Arguments));
             _application = new CommandLineApplication(state.Console, state.WorkingDirectory);
 
             _application.Conventions
@@ -51,7 +54,7 @@ public CommandLineService(ILogger<CommandLineService> logger, CommandLineState s
         /// <inheritdoc />
         public async Task<int> RunAsync(CancellationToken cancellationToken)
         {
-            _logger.LogDebug("Running");
+            _logger?.LogDebug("Running");
             _state.ExitCode = await _application.ExecuteAsync(_state.Arguments, cancellationToken);
             return _state.ExitCode;
         }
diff --git a/src/Hosting.CommandLine/McMaster.Extensions.Hosting.CommandLine.csproj b/src/Hosting.CommandLine/McMaster.Extensions.Hosting.CommandLine.csproj
@@ -9,7 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/CommandLineUtils.Tests/McMaster.Extensions.CommandLineUtils.Tests.csproj b/test/CommandLineUtils.Tests/McMaster.Extensions.CommandLineUtils.Tests.csproj
@@ -16,11 +16,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.0.3" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0" />
     <PackageReference Include="McMaster.Extensions.Xunit" Version="0.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
diff --git a/test/Hosting.CommandLine.Tests/McMaster.Extensions.Hosting.CommandLine.Tests.csproj b/test/Hosting.CommandLine.Tests/McMaster.Extensions.Hosting.CommandLine.Tests.csproj
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ private static IServiceCollection AddCommonServices(this IServiceCollection serv`
`139`	`139`	`.AddSingleton<IHostLifetime, CommandLineLifetime>()`
`140`	`140`	`.AddSingleton(provider =>`
`141`	`141`	`{`
`142`		`- state.SetConsole(provider.GetService<IConsole>());`
	`142`	`+ state.SetConsole(provider.GetRequiredService<IConsole>());`
`143`	`143`	`return state;`
`144`	`144`	`})`
`145`	`145`	`.AddSingleton<CommandLineContext>(state);`