Skip to content

Update spectre-console monorepo to 0.53.0 #1498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 29, 2025
Merged

Update spectre-console monorepo to 0.53.0 #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
720c2c6
Update spectre-console monorepo to 0.53.0
renovate[bot] Oct 29, 2025
2d63c5a
Use new Spectre.Console Execute override with CancellationToken support
JamieMagee Oct 29, 2025
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 Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
<PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageVersion Include="Serilog.Sinks.Map" Version="1.0.2" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Cli" Version="0.49.1" />
<PackageVersion Include="Spectre.Console" Version="0.53.0" />
<PackageVersion Include="Spectre.Console.Cli" Version="0.53.0" />
<PackageVersion Include="Spectre.Console.Cli.Extensions.DependencyInjection" Version="0.2.0" />
<PackageVersion Include="Spectre.Console.Testing" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Testing" Version="0.53.0" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Reactive" Version="6.0.1" />
Expand Down
6 changes: 5 additions & 1 deletion src/Microsoft.ComponentDetection.Orchestrator/Commands/ListDetectorsCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace Microsoft.ComponentDetection.Orchestrator.Commands;

using System.Collections.Generic;
using System.Threading;
using Microsoft.ComponentDetection.Contracts;
using Spectre.Console;
using Spectre.Console.Cli;
Expand All @@ -27,7 +28,10 @@ public ListDetectorsCommand(
}

/// <inheritdoc/>
public override int Execute(CommandContext context, ListDetectorsSettings settings)
public override int Execute(
CommandContext context,
ListDetectorsSettings settings,
CancellationToken cancellationToken)
{
var table = new Table();
table.AddColumn("Name");
Expand Down
6 changes: 5 additions & 1 deletion src/Microsoft.ComponentDetection.Orchestrator/Commands/ScanCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Commands;

using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.ComponentDetection.Common;
using Microsoft.ComponentDetection.Contracts.BcdeModels;
Expand Down Expand Up @@ -37,7 +38,10 @@ public ScanCommand(
}

/// <inheritdoc />
public override async Task<int> ExecuteAsync(CommandContext context, ScanSettings settings)
public override async Task<int> ExecuteAsync(
CommandContext context,
ScanSettings settings,
CancellationToken cancellationToken)
{
this.fileWritingService.Init(settings.Output);
var result = await this.scanExecutionService.ExecuteScanAsync(settings);
Expand Down
3 changes: 2 additions & 1 deletion test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ListDetectorCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Commands;

using System.Collections.Generic;
using System.Linq;
using System.Threading;
using FluentAssertions;
using Microsoft.ComponentDetection.Contracts;
using Microsoft.ComponentDetection.Orchestrator.Commands;
Expand Down Expand Up @@ -29,7 +30,7 @@ public void ListDetectorCommands_ExecutesListDetectors()

var command = new ListDetectorsCommand(mockDetectors, console);

var result = command.Execute(null, new ListDetectorsSettings());
var result = command.Execute(null, new ListDetectorsSettings(), CancellationToken.None);

result.Should().Be(0);
console.Output.Should().ContainAll(fakeIds);
Expand Down
7 changes: 4 additions & 3 deletions test/Microsoft.ComponentDetection.Orchestrator.Tests/Commands/ScanCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ namespace Microsoft.ComponentDetection.Orchestrator.Tests.Commands;

using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using FluentAssertions;
using Microsoft.ComponentDetection.Common;
Expand Down Expand Up @@ -40,7 +41,7 @@ public async Task ScanCommand_ExecutesScanAndWritesManifestAsync()
{
var settings = new ScanSettings { Output = "output" };

var result = await this.command.ExecuteAsync(null, settings);
var result = await this.command.ExecuteAsync(null, settings, CancellationToken.None);

this.fileWritingServiceMock.Verify(x => x.Init(settings.Output), Times.Once);
this.scanExecutionServiceMock.Verify(x => x.ExecuteScanAsync(settings), Times.Once);
Expand All @@ -54,7 +55,7 @@ public async Task ScanCommand_ExecutesScanAndWritesUserManifestAsync()
{
var settings = new ScanSettings { Output = "output", ManifestFile = new FileInfo("manifest.json") };

var result = await this.command.ExecuteAsync(null, settings);
var result = await this.command.ExecuteAsync(null, settings, CancellationToken.None);

this.fileWritingServiceMock.Verify(x => x.Init(settings.Output), Times.Once);
this.scanExecutionServiceMock.Verify(x => x.ExecuteScanAsync(settings), Times.Once);
Expand All @@ -71,7 +72,7 @@ public async Task ScanCommand_ExecutesScanAndPrintsManifestAsync()
await using var tw = new StreamWriter(ms);
Console.SetOut(tw);

var result = await this.command.ExecuteAsync(null, settings);
var result = await this.command.ExecuteAsync(null, settings, CancellationToken.None);

this.fileWritingServiceMock.Verify(x => x.Init(settings.Output), Times.Once);
this.scanExecutionServiceMock.Verify(x => x.ExecuteScanAsync(settings), Times.Once);
Expand Down