Merge pull request #2410 from microsoft/dependabot/nuget/performance/… · Frulfump/OpenAPI.NET@f278faf · GitHub
Skip to content

Commit f278faf

Browse files
baywetbaywet
authored
Merge pull request microsoft#2410 from microsoft/dependabot/nuget/performance/resultsComparer/multi-51f7fe1af4
Bump Microsoft.OpenApi.OData and 3 others
2 parents 09f661f + a5f8721 commit f278faf

15 files changed

Lines changed: 185 additions & 156 deletions

File tree

‎performance/resultsComparer/Program.cs‎

Lines changed: 27 additions & 11 deletions

‎performance/resultsComparer/handlers/AsyncCommandHandler.cs‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎performance/resultsComparer/handlers/CompareCommandHandler.cs‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,38 @@
33
using System.CommandLine.Invocation;
44
using System.Text.Json;
55
using System.Text.Json.Serialization;
6-
using Microsoft.Extensions.DependencyInjection;
76
using Microsoft.Extensions.Logging;
87
using resultsComparer.Models;
98
using resultsComparer.Policies;
109

1110
namespace resultsComparer.Handlers;
1211

13-
internal class CompareCommandHandler : AsyncCommandHandler
12+
internal class CompareCommandHandler : AsynchronousCommandLineAction
1413
{
1514
public required Argument<string> OldResultsPath { get; set; }
1615
public required Argument<string> NewResultsPath { get; set; }
1716
public required Option<LogLevel> LogLevel { get; set; }
1817
public required Option<string[]> Policies { get; set; }
1918

20-
public override Task<int> InvokeAsync(InvocationContext context)
19+
public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
2120
{
22-
var cancellationToken = context.BindingContext.GetRequiredService<CancellationToken>();
23-
var oldResultsPath = context.ParseResult.GetValueForArgument(OldResultsPath);
24-
var newResultsPath = context.ParseResult.GetValueForArgument(NewResultsPath);
25-
var policyNames = context.ParseResult.GetValueForOption(Policies) ?? [];
21+
var oldResultsPath = parseResult.GetValue(OldResultsPath);
22+
var newResultsPath = parseResult.GetValue(NewResultsPath);
23+
var policyNames = parseResult.GetValue(Policies) ?? [];
2624
var policies = IBenchmarkComparisonPolicy.GetSelectedPolicies(policyNames).ToArray();
27-
var logLevel = context.ParseResult.GetValueForOption(LogLevel);
25+
var logLevel = parseResult.GetValue(LogLevel);
2826
using var loggerFactory = Logger.ConfigureLogger(logLevel);
2927
var logger = loggerFactory.CreateLogger<CompareCommandHandler>();
28+
if (string.IsNullOrWhiteSpace(oldResultsPath))
29+
{
30+
logger.LogError("Old results path is required.");
31+
return Task.FromResult(1);
32+
}
33+
if (string.IsNullOrWhiteSpace(newResultsPath))
34+
{
35+
logger.LogError("New results path is required.");
36+
return Task.FromResult(1);
37+
}
3038
return CompareResultsAsync(oldResultsPath, newResultsPath, logger, policies, cancellationToken);
3139
}
3240
private static async Task<int> CompareResultsAsync(string existingReportPath, string newReportPath, ILogger logger, IBenchmarkComparisonPolicy[] comparisonPolicies, CancellationToken cancellationToken = default)

‎performance/resultsComparer/resultsComparer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
1313
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.6" />
1414
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
15-
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
15+
<PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25306.1" />
1616
<PackageReference Include="system.text.json" Version="9.0.6" />
1717
</ItemGroup>
1818

‎src/Microsoft.OpenApi.Hidi/Extensions/CommandExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static void AddOptions(this Command command, IReadOnlyList<Option> option
1212
{
1313
foreach (var option in options)
1414
{
15-
command.AddOption(option);
15+
command.Options.Add(option);
1616
}
1717
}
1818
}

‎src/Microsoft.OpenApi.Hidi/Handlers/AsyncCommandHandler.cs‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22
// Licensed under the MIT license.
33

44
using System;
5+
using System.CommandLine;
56
using System.CommandLine.Invocation;
67
using System.Threading;
78
using System.Threading.Tasks;
8-
using Microsoft.Extensions.DependencyInjection;
99
using Microsoft.Extensions.Logging;
1010
using Microsoft.OpenApi.Hidi.Options;
1111

1212
namespace Microsoft.OpenApi.Hidi.Handlers
1313
{
14-
internal class PluginCommandHandler : AsyncCommandHandler
14+
internal class PluginCommandHandler : AsynchronousCommandLineAction
1515
{
1616
public CommandOptions CommandOptions { get; }
1717
public PluginCommandHandler(CommandOptions commandOptions)
1818
{
1919
CommandOptions = commandOptions;
2020
}
21-
public override async Task<int> InvokeAsync(InvocationContext context)
21+
public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
2222
{
23-
var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
24-
var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
23+
var hidiOptions = new HidiOptions(parseResult, CommandOptions);
2524

2625
using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
2726
var logger = loggerFactory.CreateLogger<PluginCommandHandler>();

‎src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22
// Licensed under the MIT license.
33

44
using System;
5+
using System.CommandLine;
56
using System.CommandLine.Invocation;
67
using System.Threading;
78
using System.Threading.Tasks;
8-
using Microsoft.Extensions.DependencyInjection;
99
using Microsoft.Extensions.Logging;
1010
using Microsoft.OpenApi.Hidi.Options;
1111

1212
namespace Microsoft.OpenApi.Hidi.Handlers
1313
{
14-
internal class ShowCommandHandler : AsyncCommandHandler
14+
internal class ShowCommandHandler : AsynchronousCommandLineAction
1515
{
1616
public CommandOptions CommandOptions { get; set; }
1717
public ShowCommandHandler(CommandOptions commandOptions)
1818
{
1919
CommandOptions = commandOptions;
2020
}
21-
public override async Task<int> InvokeAsync(InvocationContext context)
21+
public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
2222
{
23-
var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
24-
var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
23+
var hidiOptions = new HidiOptions(parseResult, CommandOptions);
2524

2625
using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
2726
var logger = loggerFactory.CreateLogger<ShowCommandHandler>();

‎src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22
// Licensed under the MIT license.
33

44
using System;
5+
using System.CommandLine;
56
using System.CommandLine.Invocation;
67
using System.Threading;
78
using System.Threading.Tasks;
8-
using Microsoft.Extensions.DependencyInjection;
99
using Microsoft.Extensions.Logging;
1010
using Microsoft.OpenApi.Hidi.Options;
1111

1212
namespace Microsoft.OpenApi.Hidi.Handlers
1313
{
14-
internal class TransformCommandHandler : AsyncCommandHandler
14+
internal class TransformCommandHandler : AsynchronousCommandLineAction
1515
{
1616
public CommandOptions CommandOptions { get; }
1717
public TransformCommandHandler(CommandOptions commandOptions)
1818
{
1919
CommandOptions = commandOptions;
2020
}
21-
public override async Task<int> InvokeAsync(InvocationContext context)
21+
public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
2222
{
23-
var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
24-
var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
23+
var hidiOptions = new HidiOptions(parseResult, CommandOptions);
2524

2625
using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
2726
var logger = loggerFactory.CreateLogger<TransformCommandHandler>();

‎src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs‎

Lines changed: 4 additions & 5 deletions

0 commit comments

Comments
 (0)