dotnet · mitchdenny · Apr 10, 2025 · Apr 8, 2025 · Apr 9, 2025 · Apr 9, 2025
diff --git a/src/Aspire.Cli/Commands/AddCommand.cs b/src/Aspire.Cli/Commands/AddCommand.cs
@@ -12,10 +12,10 @@ namespace Aspire.Cli.Commands;
 internal sealed class AddCommand : BaseCommand
 {
     private readonly ActivitySource _activitySource = new ActivitySource(nameof(AddCommand));
-    private readonly DotNetCliRunner _runner;
+    private readonly IDotNetCliRunner _runner;
     private readonly INuGetPackageCache _nuGetPackageCache;
 
-    public AddCommand(DotNetCliRunner runner, INuGetPackageCache nuGetPackageCache)
+    public AddCommand(IDotNetCliRunner runner, INuGetPackageCache nuGetPackageCache)
         : base("add", "Add an integration to the Aspire project.")
     {
         ArgumentNullException.ThrowIfNull(runner, nameof(runner));
@@ -105,9 +105,9 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
                 _ => throw new InvalidOperationException("Unexpected number of packages found.")
             };
 
-            var addPackageResult = await AnsiConsole.Status().StartAsync(
+            var addPackageResult = await InteractionUtils.ShowStatusAsync(
                 "Adding Aspire integration...",
-                async context => {
+                async () => {
                     var addPackageResult = await _runner.AddPackageAsync(
                         effectiveAppHostProjectFile,
                         selectedNuGetPackage.Package.Id,

diff --git a/src/Aspire.Cli/Commands/NewCommand.cs b/src/Aspire.Cli/Commands/NewCommand.cs
@@ -11,10 +11,10 @@ namespace Aspire.Cli.Commands;
 internal sealed class NewCommand : BaseCommand
 {
     private readonly ActivitySource _activitySource = new ActivitySource(nameof(NewCommand));
-    private readonly DotNetCliRunner _runner;
+    private readonly IDotNetCliRunner _runner;
     private readonly INuGetPackageCache _nuGetPackageCache;
 
-    public NewCommand(DotNetCliRunner runner, INuGetPackageCache nuGetPackageCache)
+    public NewCommand(IDotNetCliRunner runner, INuGetPackageCache nuGetPackageCache)
         : base("new", "Create a new Aspire sample project.")
     {
         ArgumentNullException.ThrowIfNull(runner, nameof(runner));
@@ -140,14 +140,9 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
         var source = parseResult.GetValue<string?>("--source");
         var version = await GetProjectTemplatesVersionAsync(parseResult, prerelease, source, cancellationToken);
 
-        var templateInstallResult = await AnsiConsole.Status()
-            .Spinner(Spinner.Known.Dots3)
-            .SpinnerStyle(Style.Parse("purple"))
-            .StartAsync(
-                ":ice:  Getting latest templates...",
-                async context => {
-                    return await _runner.InstallTemplateAsync("Aspire.ProjectTemplates", version, source, true, cancellationToken);
-                });
+        var templateInstallResult = await InteractionUtils.ShowStatusAsync(
+            ":ice:  Getting latest templates...",
+            () => _runner.InstallTemplateAsync("Aspire.ProjectTemplates", version, source, true, cancellationToken));
 
         if (templateInstallResult.ExitCode != 0)
         {
 
         AnsiConsole.MarkupLine($":package: Using project templates version: {templateInstallResult.TemplateVersion}");
 
-        int newProjectExitCode = await AnsiConsole.Status()
-            .Spinner(Spinner.Known.Dots3)
-            .SpinnerStyle(Style.Parse("purple"))
-            .StartAsync(
-                ":rocket:  Creating new Aspire project...",
-                async context => {
-                    return await _runner.NewProjectAsync(
+        var newProjectExitCode = await InteractionUtils.ShowStatusAsync(
+            ":rocket:  Creating new Aspire project...",
+            () => _runner.NewProjectAsync(
                         template.TemplateName,
                         name,
                         outputPath,
-                        cancellationToken);
-                });
+                        cancellationToken));
 
         if (newProjectExitCode != 0)
         {

diff --git a/src/Aspire.Cli/Commands/PublishCommand.cs b/src/Aspire.Cli/Commands/PublishCommand.cs
@@ -13,9 +13,9 @@ namespace Aspire.Cli.Commands;
 internal sealed class PublishCommand : BaseCommand
 {
    private readonly ActivitySource _activitySource = new ActivitySource(nameof(PublishCommand));
-    private readonly DotNetCliRunner _runner;
+    private readonly IDotNetCliRunner _runner;
 
-    public PublishCommand(DotNetCliRunner runner)
+    public PublishCommand(IDotNetCliRunner runner)
         : base("publish", "Generates deployment artifacts for an Aspire app host project.")
     {
         ArgumentNullException.ThrowIfNull(runner, nameof(runner));
@@ -38,7 +38,7 @@ public PublishCommand(DotNetCliRunner runner)
 
     protected override async Task<int> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
     {
-        (bool IsCompatableAppHost, bool SupportsBackchannel, string? AspireHostingSdkVersion)? appHostCompatabilityCheck = null;
+        (bool IsCompatibleAppHost, bool SupportsBackchannel, string? AspireHostingSdkVersion)? appHostCompatibilityCheck = null;
 
         try
         {
@@ -59,9 +59,9 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
                 env[KnownConfigNames.WaitForDebugger] = "true";
             }
 
-            appHostCompatabilityCheck = await AppHostHelper.CheckAppHostCompatabilityAsync(_runner, effectiveAppHostProjectFile, cancellationToken);
+            appHostCompatibilityCheck = await AppHostHelper.CheckAppHostCompatibilityAsync(_runner, effectiveAppHostProjectFile, cancellationToken);
 
-            if (!appHostCompatabilityCheck?.IsCompatableAppHost ?? throw new InvalidOperationException("IsCompatableAppHost is null"))
+            if (!appHostCompatibilityCheck?.IsCompatibleAppHost ?? throw new InvalidOperationException("IsCompatibleAppHost is null"))
             {
                 return ExitCodeConstants.FailedToDotnetRunAppHost;
             }
@@ -78,36 +78,32 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
             var outputPath = parseResult.GetValue<string>("--output-path");
             var fullyQualifiedOutputPath = Path.GetFullPath(outputPath ?? ".");
 
-            var publishersResult = await AnsiConsole.Status()
-                .Spinner(Spinner.Known.Dots3)
-                .SpinnerStyle(Style.Parse("purple"))
-                .StartAsync<(int ExitCode, string[]? Publishers)>(
-                    publisher is { } ? ":package:  Getting publisher..." : ":package:  Getting publishers...",
-                    async context => {
-
-                        using var getPublishersActivity = _activitySource.StartActivity(
-                            $"{nameof(ExecuteAsync)}-Action-GetPublishers",
-                            ActivityKind.Client);
-
-                        var backchannelCompletionSource = new TaskCompletionSource<AppHostBackchannel>();
-                        var pendingInspectRun = _runner.RunAsync(
-                            effectiveAppHostProjectFile,
-                            false,
-                            true,
-                            ["--operation", "inspect"],
-                            null,
-                            backchannelCompletionSource,
-                            cancellationToken).ConfigureAwait(false);
-
-                        var backchannel = await backchannelCompletionSource.Task.ConfigureAwait(false);
-                        var publishers = await backchannel.GetPublishersAsync(cancellationToken).ConfigureAwait(false);
-
-                        await backchannel.RequestStopAsync(cancellationToken).ConfigureAwait(false);
-                        var exitCode = await pendingInspectRun;
+            var publishersResult = await InteractionUtils.ShowStatusAsync<(int ExitCode, string[] Publishers)>(
+                publisher is { } ? ":package:  Getting publisher..." : ":package:  Getting publishers...",
+                async () => {
+                    using var getPublishersActivity = _activitySource.StartActivity(
+                        $"{nameof(ExecuteAsync)}-Action-GetPublishers",
+                        ActivityKind.Client);
+
+                    var backchannelCompletionSource = new TaskCompletionSource<AppHostBackchannel>();
+                    var pendingInspectRun = _runner.RunAsync(
+                        effectiveAppHostProjectFile,
+                        false,
+                        true,
+                        ["--operation", "inspect"],
+                        null,
+                        backchannelCompletionSource,
+                        cancellationToken).ConfigureAwait(false);
 
-                        return (exitCode, publishers);
+                    var backchannel = await backchannelCompletionSource.Task.ConfigureAwait(false);
+                    var publishers = await backchannel.GetPublishersAsync(cancellationToken).ConfigureAwait(false);
+
+                    await backchannel.RequestStopAsync(cancellationToken).ConfigureAwait(false);
+                    var exitCode = await pendingInspectRun;
 
-                    }).ConfigureAwait(false);
+                    return (exitCode, publishers);
+                }
+            );
 
             if (publishersResult.ExitCode != 0)
             {
@@ -255,7 +251,7 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
         {
             return InteractionUtils.DisplayIncompatibleVersionError(
                 ex,
-                appHostCompatabilityCheck?.AspireHostingSdkVersion ?? throw new InvalidOperationException("AspireHostingSdkVersion is null")
+                appHostCompatibilityCheck?.AspireHostingSdkVersion ?? throw new InvalidOperationException("AspireHostingSdkVersion is null")
                 );
         }
     }

diff --git a/src/Aspire.Cli/Commands/RootCommand.cs b/src/Aspire.Cli/Commands/RootCommand.cs
@@ -5,7 +5,7 @@
 
 #if DEBUG
 using System.Diagnostics;
-using Spectre.Console;
+using Aspire.Cli.Utils;
 #endif
 
 using BaseRootCommand = System.CommandLine.RootCommand;
@@ -34,15 +34,14 @@ public RootCommand(NewCommand newCommand, RunCommand runCommand, AddCommand addC
 
             if (waitForDebugger)
             {
-                AnsiConsole.Status().Start(
+                InteractionUtils.ShowStatus(
                     $":bug:  Waiting for debugger to attach to process ID: {Environment.ProcessId}",
-                    context => {
+                    () => {
                         while (!Debugger.IsAttached)
                         {
                             Thread.Sleep(1000);
                         }
-                    }
-                );
+                    });
             }
         });
         #endif

diff --git a/src/Aspire.Cli/Commands/RunCommand.cs b/src/Aspire.Cli/Commands/RunCommand.cs
@@ -15,9 +15,9 @@ namespace Aspire.Cli.Commands;
 internal sealed class RunCommand : BaseCommand
 {
     private readonly ActivitySource _activitySource = new ActivitySource(nameof(RunCommand));
-    private readonly DotNetCliRunner _runner;
+    private readonly IDotNetCliRunner _runner;
 
-    public RunCommand(DotNetCliRunner runner)
+    public RunCommand(IDotNetCliRunner runner)
         : base("run", "Run an Aspire app host in development mode.")
     {
         ArgumentNullException.ThrowIfNull(runner, nameof(runner));
@@ -36,7 +36,7 @@ public RunCommand(DotNetCliRunner runner)
 
     protected override async Task<int> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
     {
-        (bool IsCompatableAppHost, bool SupportsBackchannel, string? AspireHostingSdkVersion)? appHostCompatabilityCheck = null;
+        (bool IsCompatibleAppHost, bool SupportsBackchannel, string? AspireHostingSdkVersion)? appHostCompatibilityCheck = null;
         try
         {
             using var activity = _activitySource.StartActivity();
@@ -87,9 +87,9 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
                 }
             }
 
-            appHostCompatabilityCheck = await AppHostHelper.CheckAppHostCompatabilityAsync(_runner, effectiveAppHostProjectFile, cancellationToken);
+            appHostCompatibilityCheck = await AppHostHelper.CheckAppHostCompatibilityAsync(_runner, effectiveAppHostProjectFile, cancellationToken);
 
-            if (!appHostCompatabilityCheck?.IsCompatableAppHost ?? throw new InvalidOperationException("IsCompatableAppHost is null"))
+            if (!appHostCompatibilityCheck?.IsCompatibleAppHost ?? throw new InvalidOperationException("IsCompatibleAppHost is null"))
             {
                 return ExitCodeConstants.FailedToDotnetRunAppHost;
             }
@@ -109,20 +109,14 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
             {
                 // We wait for the back channel to be created to signal that
                 // the AppHost is ready to accept requests.
-                var backchannel = await AnsiConsole.Status()
-                        .Spinner(Spinner.Known.Dots3)
-                        .SpinnerStyle(Style.Parse("purple"))
-                        .StartAsync(":linked_paperclips:  Starting Aspire app host...", async context => {
-                            return await backchannelCompletitionSource.Task;
-                        });
+                var backchannel = await InteractionUtils.ShowStatusAsync(
+                    ":linked_paperclips:  Starting Aspire app host...",
+                    () => backchannelCompletitionSource.Task);
 
                 // We wait for the first update of the console model via RPC from the AppHost.
-                var dashboardUrls = await AnsiConsole.Status()
-                                                    .Spinner(Spinner.Known.Dots3)
-                                                    .SpinnerStyle(Style.Parse("purple"))
-                                                    .StartAsync(":chart_increasing:  Starting Aspire dashboard...", async context => {
-                                                        return await 
10000
backchannel.GetDashboardUrlsAsync(cancellationToken);
-                                                    });
+                var dashboardUrls = await InteractionUtils.ShowStatusAsync(
+                    ":chart_increasing:  Starting Aspire dashboard...",
+                    () => backchannel.GetDashboardUrlsAsync(cancellationToken));
 
                 AnsiConsole.WriteLine();
                 AnsiConsole.MarkupLine($"[green bold]Dashboard[/]:");
@@ -217,7 +211,7 @@ await AnsiConsole.Live(table).StartAsync(async context => {
         {
             return InteractionUtils.DisplayIncompatibleVersionError(
                 ex,
-                appHostCompatabilityCheck?.AspireHostingSdkVersion ?? throw new InvalidOperationException("AspireHostingSdkVersion is null")
+                appHostCompatibilityCheck?.AspireHostingSdkVersion ?? throw new InvalidOperationException("AspireHostingSdkVersion is null")
                 );
         }
     }

diff --git a/src/Aspire.Cli/DotNetCliRunner.cs b/src/Aspire.Cli/DotNetCliRunner.cs
@@ -13,7 +13,21 @@
 
 namespace Aspire.Cli;
 
-internal sealed class DotNetCliRunner(ILogger<DotNetCliRunner> logger, IServiceProvider serviceProvider)
+internal interface IDotNetCliRunner
+{
+    Task<(int ExitCode, bool IsAspireHost, string? AspireHostingSdkVersion)> GetAppHostInformationAsync(FileInfo projectFile, CancellationToken cancellationToken);
+    Task<(int ExitCode, JsonDocument? Output)> GetProjectItemsAndPropertiesAsync(FileInfo projectFile, string[] items, string[] properties, CancellationToken cancellationToken);
+    Task<int> RunAsync(FileInfo projectFile, bool watch, bool noBuild, string[] args, IDictionary<string, string>? env, TaskCompletionSource<AppHostBackchannel>? backchannelCompletionSource, CancellationToken cancellationToken);
+    Task<int> CheckHttpCertificateAsync(CancellationToken cancellationToken);
+    Task<int> TrustHttpCertificateAsync(CancellationToken cancellationToken);
+    Task<(int ExitCode, string? TemplateVersion)> InstallTemplateAsync(string packageName, string version, string? nugetSource, bool force, CancellationToken cancellationToken);
+    Task<int> NewProjectAsync(string templateName, string name, string outputPath, CancellationToken cancellationToken);
+    Task<int> BuildAsync(FileInfo projectFilePath, CancellationToken cancellationToken);
+    Task<int> AddPackageAsync(FileInfo projectFilePath, string packageName, string packageVersion, CancellationToken cancellationToken);
+    Task<(int ExitCode, NuGetPackage[]? Packages)> SearchPackagesAsync(DirectoryInfo workingDirectory, string query, bool prerelease, int take, int skip, string? nugetSource, CancellationToken cancellationToken);
+}
+
+internal sealed class DotNetCliRunner(ILogger<DotNetCliRunner> logger, IServiceProvider serviceProvider) : IDotNetCliRunner
 {
     private readonly ActivitySource _activitySource = new ActivitySource(nameof(DotNetCliRunner));
 
@@ -478,7 +492,7 @@ private async Task StartBackchannelAsync(Process process, string socketPath, Tas
                     ex.RequiredCapability
                     );
 
-                // If the app host is incompatable then there is no point
+                // If the app host is incompatible then there is no point
                 // trying to reconnect, we should propogate the exception
                 // up to the code that needs to back channel so it can display
                 // and error message to the user.

diff --git a/src/Aspire.Cli/NuGetPackageCache.cs b/src/Aspire.Cli/NuGetPackageCache.cs
@@ -12,7 +12,7 @@ internal interface INuGetPackageCache
     Task<IEnumerable<NuGetPackage>> GetIntegrationPackagesAsync(DirectoryInfo workingDirectory, bool prerelease, string? source, CancellationToken cancellationToken);
 }
 
-internal sealed class NuGetPackageCache(ILogger<NuGetPackageCache> logger, DotNetCliRunner cliRunner) : INuGetPackageCache
+internal sealed class NuGetPackageCache(ILogger<NuGetPackageCache> logger, IDotNetCliRunner cliRunner) : INuGetPackageCache
 {
     private readonly ActivitySource _activitySource = new(nameof(NuGetPackageCache));
 

diff --git a/src/Aspire.Cli/Program.cs b/src/Aspire.Cli/Program.cs
@@ -72,7 +72,7 @@ private static IHost BuildApplication(string[] args)
         }
 
         // Shared services.
-        builder.Services.AddTransient<DotNetCliRunner>();
+        builder.Services.AddTransient<IDotNetCliRunner, DotNetCliRunner>();
         builder.Services.AddTransient<AppHostBackchannel>();
         builder.Services.AddSingleton<CliRpcTarget>();
         builder.Services.AddTransient<INuGetPackageCache, NuGetPackageCache>();