Merge pull request #98 from guitarrapc/feature/package

feat: bump Packages
guitarrapc · Jul 30, 2024 · abaece7 · abaece7
2 parents 17e3ae4 + 737054c
commit abaece7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 30 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,22 +4,22 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="ConsoleAppFramework" Version="4.2.4" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <!-- Tests -->
-    <PackageVersion Include="GitHubActionsTestLogger" Version="1.4.1">
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="coverlet.msbuild" Version="3.1.2">
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="FluentAssertions" Version="6.7.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/UnityBuildRunner.Core/SimpleConsoleLogger.cs b/src/UnityBuildRunner.Core/SimpleConsoleLogger.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
-using System;
 
 namespace UnityBuildRunner.Core;
 
@@ -30,7 +29,7 @@ public SimpleConsoleLogger()
     {
     }
 
-    public IDisposable BeginScope<TState>(TState state)
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
     {
         return NullDisposable.Instance;
     }
@@ -42,7 +41,7 @@ public bool IsEnabled(LogLevel logLevel)
 
     public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
     {
-        if (formatter == null) throw new ArgumentNullException(nameof(formatter));
+        ArgumentNullException.ThrowIfNull(formatter);
 
         var msg = formatter(state, exception);
 

diff --git a/src/UnityBuildRunner/Program.cs b/src/UnityBuildRunner/Program.cs
@@ -1,41 +1,31 @@
 using Microsoft.Extensions.Logging;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using UnityBuildRunner.Core;
 
 var builder = ConsoleApp.CreateBuilder(args);
 var app = builder.Build();
 app.AddCommands<UnityBuildRunnerCommand>();
 app.Run();
 
-public class UnityBuildRunnerCommand : ConsoleAppBase
+public class UnityBuildRunnerCommand(ILogger<UnityBuildRunnerCommand> logger) : ConsoleAppBase
 {
     private const string DefaultTimeout = "02:00:00"; // 2 hours
 
-    private readonly ILogger<UnityBuildRunnerCommand> logger;
-    private readonly TimeSpan timeoutDefault;
-
-    public UnityBuildRunnerCommand(ILogger<UnityBuildRunnerCommand> logger)
-    {
-        this.logger = logger;
-        timeoutDefault = TimeSpan.Parse(DefaultTimeout);
-    }
+    private readonly TimeSpan timeoutDefault = TimeSpan.Parse(DefaultTimeout);
 
     [RootCommand]
     public async Task<int> Run([Option("--unity-path", "Full Path to the Unity executable, leave empty when use 'UnityPath' Environment variables instead.")] string unityPath = "", [Option("--timeout", "Timeout for Unity Build.")] string timeout = DefaultTimeout)
     {
         var arguments = Context.Arguments
-            .Except(new[] { "--timeout", timeout });
+            .Except(["--timeout", timeout]);
         if (!string.IsNullOrEmpty(unityPath))
         {
-            arguments = arguments.Except(new[] { "--unity-path", unityPath });
+            arguments = arguments.Except(["--unity-path", unityPath]);
         }
         var args = arguments?.ToArray();
 
-        if (args is null || !args.Any())
+        if (args is null || args.Length == 0)
         {
-            throw new ArgumentOutOfRangeException($"No valid argument found, exiting. You have specified arguments: {string.Join(" ", args ?? Array.Empty<string>())}");
+            throw new ArgumentOutOfRangeException($"No valid argument found, exiting. You have specified arguments: {string.Join(" ", args ?? [])}");
         }
 
         // build

diff --git a/tests/UnityBuildRunner.Core.Tests/UnityBuildRunner.Core.Tests.csproj b/tests/UnityBuildRunner.Core.Tests/UnityBuildRunner.Core.Tests.csproj
@@ -5,12 +5,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" />
-    <PackageReference Include="coverlet.msbuild" />
+    <PackageReference Include="GitHubActionsTestLogger">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.msbuild">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>