Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions new-cli/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageVersion Include="Polly" Version="8.6.0" />
<PackageVersion Include="Roslynator.Analyzers" Version="4.13.1" />
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.13.1" />
Expand All @@ -20,8 +20,8 @@
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta7.25353.2" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta7.25358.2" />
<PackageVersion Include="System.IO.Abstractions" Version="22.0.15" />
<PackageVersion Include="System.Text.Json" Version="9.0.6" />
<PackageVersion Include="System.Text.Json" Version="9.0.7" />
</ItemGroup>
</Project>
7 changes: 3 additions & 4 deletions new-cli/GitVersion.Cli/GitVersionApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,19 @@ namespace GitVersion;
// ReSharper disable once ClassNeverInstantiated.Global
internal class GitVersionApp(RootCommandImpl rootCommand)
{
private readonly RootCommandImpl rootCommand = rootCommand.NotNull();
private readonly RootCommandImpl _rootCommand = rootCommand.NotNull();

public Task<int> RunAsync(string[] args, CancellationToken cancellationToken)
{
var cliConfiguration = new CommandLineConfiguration(rootCommand);
var parseResult = cliConfiguration.Parse(args);
var parseResult = this._rootCommand.Parse(args);

var logFile = parseResult.GetValue<FileInfo?>(GitVersionSettings.LogFileOption);
var verbosity = parseResult.GetValue<Verbosity?>(GitVersionSettings.VerbosityOption) ?? Verbosity.Normal;

if (logFile?.FullName != null) LoggingEnricher.Path = logFile.FullName;
LoggingEnricher.LogLevel.MinimumLevel = GetLevelForVerbosity(verbosity);

return parseResult.InvokeAsync(cancellationToken);
return parseResult.InvokeAsync(new InvocationConfiguration(), cancellationToken);
}

// Note: there are 2 locations to watch for dotnet-suggest
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<PackageVersion Include="NUnit.Analyzers" Version="4.9.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.2" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.7" />
<PackageVersion Include="System.Drawing.Common" Version="9.0.7" />
<PackageVersion Include="System.IO.Abstractions" Version="22.0.15" />
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.2" />
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.7" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.7" />
<PackageVersion Include="System.Text.Json" Version="9.0.7" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
Expand Down
Loading