From 5af5aff19281e1d4549d72cde01d10df7ac0f323 Mon Sep 17 00:00:00 2001 From: Michael Fyffe <6224270+TraGicCode@users.noreply.github.com> Date: Thu, 1 Oct 2026 13:10:05 -0500 Subject: [PATCH] Update Spectre nuget package to handle breaking change --- Directory.Packages.props | 5 ++--- src/BuslyCLI.Console/Commands/Demo/StartCommand.cs | 2 +- src/BuslyCLI.Console/Commands/NsbCommand/SendCommand.cs | 2 +- src/BuslyCLI.Console/Commands/NsbEvent/PublishCommand.cs | 2 +- src/BuslyCLI.Console/Commands/NsbTimeout/SendTimeout.cs | 2 +- .../ServiceControl/CustomCheck/ListCustomChecksCommand.cs | 2 +- .../ServiceControl/Endpoint/DeleteEndpointCommand.cs | 2 +- .../Commands/ServiceControl/Endpoint/ListEndpointsCommand.cs | 2 +- .../Commands/ServiceControl/Event/ListEventsCommand.cs | 2 +- .../Instance/CurrentServiceControlInstanceCommand.cs | 2 +- .../Instance/DeleteServiceControlInstanceCommand.cs | 2 +- .../Instance/ListServiceControlInstancesCommand.cs | 2 +- .../Instance/SetServiceControlInstanceCommand.cs | 2 +- .../Commands/ServiceControl/License/ShowLicenseCommand.cs | 2 +- .../Commands/ServiceControl/Message/SearchMessagesCommand.cs | 2 +- .../Commands/Transport/CurrentTransportCommand.cs | 2 +- .../Commands/Transport/DeleteTransportCommand.cs | 2 +- .../Commands/Transport/ListTransportsCommand.cs | 2 +- .../Commands/Transport/SetTransportCommand.cs | 2 +- 19 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 57b284e8..90435a0e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,7 +2,6 @@ true - @@ -25,8 +24,8 @@ - - + + diff --git a/src/BuslyCLI.Console/Commands/Demo/StartCommand.cs b/src/BuslyCLI.Console/Commands/Demo/StartCommand.cs index 2ff5455f..d46846be 100644 --- a/src/BuslyCLI.Console/Commands/Demo/StartCommand.cs +++ b/src/BuslyCLI.Console/Commands/Demo/StartCommand.cs @@ -10,7 +10,7 @@ namespace BuslyCLI.Commands.Demo; public class StartDemoCommand(IAnsiConsole console, IRawEndpointFactory rawEndpointFactory, INServiceBusConfiguration nServiceBusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, CurrentTransportSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, CurrentTransportSettings settings, CancellationToken cancellationToken) { console.WriteLine($"Starting demo endpoint named {Constants.DemoDefaultOriginatingEndpoint} for quick start guide..."); var config = await nServiceBusConfiguration.GetTransportValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/NsbCommand/SendCommand.cs b/src/BuslyCLI.Console/Commands/NsbCommand/SendCommand.cs index 4c641e5a..8eac4568 100644 --- a/src/BuslyCLI.Console/Commands/NsbCommand/SendCommand.cs +++ b/src/BuslyCLI.Console/Commands/NsbCommand/SendCommand.cs @@ -11,7 +11,7 @@ namespace BuslyCLI.Commands.NsbCommand; public class SendCommand(IAnsiConsole console, IRawEndpointFactory rawEndpointFactory, INServiceBusConfiguration nServiceBusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, SendCommandSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, SendCommandSettings settings, CancellationToken cancellationToken) { var config = await nServiceBusConfiguration.GetTransportValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/NsbEvent/PublishCommand.cs b/src/BuslyCLI.Console/Commands/NsbEvent/PublishCommand.cs index ea70ff7e..5ce9d09a 100644 --- a/src/BuslyCLI.Console/Commands/NsbEvent/PublishCommand.cs +++ b/src/BuslyCLI.Console/Commands/NsbEvent/PublishCommand.cs @@ -13,7 +13,7 @@ namespace BuslyCLI.Commands.NsbEvent; public class PublishCommand(IAnsiConsole console, IRawEndpointFactory rawEndpointFactory, INServiceBusConfiguration nServiceBusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, PublishCommandSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, PublishCommandSettings settings, CancellationToken cancellationToken) { var config = await nServiceBusConfiguration.GetTransportValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/NsbTimeout/SendTimeout.cs b/src/BuslyCLI.Console/Commands/NsbTimeout/SendTimeout.cs index 305e8e1c..8b27e7e3 100644 --- a/src/BuslyCLI.Console/Commands/NsbTimeout/SendTimeout.cs +++ b/src/BuslyCLI.Console/Commands/NsbTimeout/SendTimeout.cs @@ -20,7 +20,7 @@ public class SendTimeout(IAnsiConsole console, IRawEndpointFactory rawEndpointFa typeof(AzureStorageQueuesTransportConfig) ]; - protected override async Task ExecuteAsync(CommandContext context, SendTimeoutCommandSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, SendTimeoutCommandSettings settings, CancellationToken cancellationToken) { var config = await nServiceBusConfiguration.GetTransportValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/CustomCheck/ListCustomChecksCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/CustomCheck/ListCustomChecksCommand.cs index 9bf6f25e..b1f217d7 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/CustomCheck/ListCustomChecksCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/CustomCheck/ListCustomChecksCommand.cs @@ -8,7 +8,7 @@ namespace BuslyCLI.Commands.ServiceControl.CustomCheck; public class ListCustomChecksCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration, ServiceControlClient serviceControlClient) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, ListCustomChecksSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, ListCustomChecksSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetServiceControlValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/Endpoint/DeleteEndpointCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/Endpoint/DeleteEndpointCommand.cs index 27e8a4ae..91cb2edd 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/Endpoint/DeleteEndpointCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/Endpoint/DeleteEndpointCommand.cs @@ -8,7 +8,7 @@ namespace BuslyCLI.Commands.ServiceControl.Endpoint; public class DeleteEndpointCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration, ServiceControlClient serviceControlClient) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, DeleteEndpointSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, DeleteEndpointSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetServiceControlValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/Endpoint/ListEndpointsCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/Endpoint/ListEndpointsCommand.cs index a1040494..f7398771 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/Endpoint/ListEndpointsCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/Endpoint/ListEndpointsCommand.cs @@ -11,7 +11,7 @@ public class ListEndpointsCommand( ServiceControlClient serviceControlClient) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, ListEndpointsSettings settings, + public override async Task ExecuteAsync(CommandContext context, ListEndpointsSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetServiceControlValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/Event/ListEventsCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/Event/ListEventsCommand.cs index 00739f9b..03d73658 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/Event/ListEventsCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/Event/ListEventsCommand.cs @@ -8,7 +8,7 @@ namespace BuslyCLI.Commands.ServiceControl.Event; public class ListEventsCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration, ServiceControlClient serviceControlClient) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, ListEventsSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, ListEventsSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetServiceControlValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/Instance/CurrentServiceControlInstanceCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/Instance/CurrentServiceControlInstanceCommand.cs index 02bacdd4..f6f449f6 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/Instance/CurrentServiceControlInstanceCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/Instance/CurrentServiceControlInstanceCommand.cs @@ -7,7 +7,7 @@ namespace BuslyCLI.Commands.ServiceControl.Instance; public class CurrentServiceControlInstanceCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, CurrentServiceControlInstanceSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, CurrentServiceControlInstanceSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetUnValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/Instance/DeleteServiceControlInstanceCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/Instance/DeleteServiceControlInstanceCommand.cs index 2714ee69..28e6cb69 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/Instance/DeleteServiceControlInstanceCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/Instance/DeleteServiceControlInstanceCommand.cs @@ -7,7 +7,7 @@ namespace BuslyCLI.Commands.ServiceControl.Instance; public class DeleteServiceControlInstanceCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, DeleteServiceControlInstanceSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, DeleteServiceControlInstanceSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetUnValidatedConfigurationAsync(settings.Config.Path); var targetInstance = settings.InstanceName.ToLower(); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/Instance/ListServiceControlInstancesCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/Instance/ListServiceControlInstancesCommand.cs index aa0491fd..9d5bed7f 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/Instance/ListServiceControlInstancesCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/Instance/ListServiceControlInstancesCommand.cs @@ -7,7 +7,7 @@ namespace BuslyCLI.Commands.ServiceControl.Instance; public class ListServiceControlInstancesCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, ListServiceControlInstancesSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, ListServiceControlInstancesSettings settings, CancellationToken cancellationToken) { var grid = new Grid(); // Add columns diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/Instance/SetServiceControlInstanceCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/Instance/SetServiceControlInstanceCommand.cs index ef5b8da6..5a243597 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/Instance/SetServiceControlInstanceCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/Instance/SetServiceControlInstanceCommand.cs @@ -7,7 +7,7 @@ namespace BuslyCLI.Commands.ServiceControl.Instance; public class SetServiceControlInstanceCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, SetServiceControlInstanceSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, SetServiceControlInstanceSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetUnValidatedConfigurationAsync(settings.Config.Path); var targetInstance = settings.InstanceName.ToLower(); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/License/ShowLicenseCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/License/ShowLicenseCommand.cs index d556a311..5896dec0 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/License/ShowLicenseCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/License/ShowLicenseCommand.cs @@ -10,7 +10,7 @@ public class ShowLicenseCommand( ServiceControlClient serviceControlClient) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, ListEndpointsSettings settings, + public override async Task ExecuteAsync(CommandContext context, ListEndpointsSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetServiceControlValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/ServiceControl/Message/SearchMessagesCommand.cs b/src/BuslyCLI.Console/Commands/ServiceControl/Message/SearchMessagesCommand.cs index b8af5fc4..324338a0 100644 --- a/src/BuslyCLI.Console/Commands/ServiceControl/Message/SearchMessagesCommand.cs +++ b/src/BuslyCLI.Console/Commands/ServiceControl/Message/SearchMessagesCommand.cs @@ -9,7 +9,7 @@ namespace BuslyCLI.Commands.ServiceControl.Message; public class SearchMessagesCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration, ServiceControlClient serviceControlClient) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, SearchMessagesSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, SearchMessagesSettings settings, CancellationToken cancellationToken) { var config = await nservicebusConfiguration.GetServiceControlValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/Transport/CurrentTransportCommand.cs b/src/BuslyCLI.Console/Commands/Transport/CurrentTransportCommand.cs index a1614226..32eabeec 100644 --- a/src/BuslyCLI.Console/Commands/Transport/CurrentTransportCommand.cs +++ b/src/BuslyCLI.Console/Commands/Transport/CurrentTransportCommand.cs @@ -7,7 +7,7 @@ namespace BuslyCLI.Commands.Transport; public class CurrentTransportCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, CurrentTransportSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, CurrentTransportSettings settings, CancellationToken cancellationToken) { var nsbConfiguration = await nservicebusConfiguration.GetUnValidatedConfigurationAsync(settings.Config.Path); diff --git a/src/BuslyCLI.Console/Commands/Transport/DeleteTransportCommand.cs b/src/BuslyCLI.Console/Commands/Transport/DeleteTransportCommand.cs index 0a2e782f..d6060c4b 100644 --- a/src/BuslyCLI.Console/Commands/Transport/DeleteTransportCommand.cs +++ b/src/BuslyCLI.Console/Commands/Transport/DeleteTransportCommand.cs @@ -7,7 +7,7 @@ namespace BuslyCLI.Commands.Transport; public class DeleteTransportCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, DeleteTransportSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, DeleteTransportSettings settings, CancellationToken cancellationToken) { var nsbConfiguration = await nservicebusConfiguration.GetTransportValidatedConfigurationAsync(settings.Config.Path); var targetTransport = settings.TransportName.ToLower(); diff --git a/src/BuslyCLI.Console/Commands/Transport/ListTransportsCommand.cs b/src/BuslyCLI.Console/Commands/Transport/ListTransportsCommand.cs index 4291b408..cfc997bc 100644 --- a/src/BuslyCLI.Console/Commands/Transport/ListTransportsCommand.cs +++ b/src/BuslyCLI.Console/Commands/Transport/ListTransportsCommand.cs @@ -21,7 +21,7 @@ namespace BuslyCLI.Commands.Transport; public class ListTransportsCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, ListTransportsSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, ListTransportsSettings settings, CancellationToken cancellationToken) { var grid = new Grid(); diff --git a/src/BuslyCLI.Console/Commands/Transport/SetTransportCommand.cs b/src/BuslyCLI.Console/Commands/Transport/SetTransportCommand.cs index 7b535017..1dd4663a 100644 --- a/src/BuslyCLI.Console/Commands/Transport/SetTransportCommand.cs +++ b/src/BuslyCLI.Console/Commands/Transport/SetTransportCommand.cs @@ -7,7 +7,7 @@ namespace BuslyCLI.Commands.Transport; public class SetTransportCommand(IAnsiConsole console, INServiceBusConfiguration nservicebusConfiguration) : AsyncCommand { - protected override async Task ExecuteAsync(CommandContext context, SetTransportSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, SetTransportSettings settings, CancellationToken cancellationToken) { var nsbConfiguration = await nservicebusConfiguration.GetTransportValidatedConfigurationAsync(settings.Config.Path); var targetTransport = settings.TransportName.ToLower();