Add CLI self-update prompts to aspire update command (#12395)

* Initial plan

* Add resource strings and update interaction service for CLI update prompts

Co-authored-by: mitchdenny <[email protected]>

* Add tests for CLI update prompts functionality

Co-authored-by: mitchdenny <[email protected]>

* Add aspire-update test scenario for CLI update functionality

Co-authored-by: mitchdenny <[email protected]>

* Add XML documentation for IsRunningAsDotNetTool and improve test scenario wording

Co-authored-by: mitchdenny <[email protected]>

* Remove --self flag from CLI update notification command for native binaries

Co-authored-by: mitchdenny <[email protected]>

* Add verification that updated apphost runs successfully in test scenario overview

Co-authored-by: mitchdenny <[email protected]>

* Remove unnecessary prerequisite and clarify expected behavior text in test scenario

Co-authored-by: mitchdenny <[email protected]>

* Use selected channel from project update for CLI self-update to avoid re-prompting

Co-authored-by: davidfowl <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: mitchdenny <[email protected]>
Co-authored-by: davidfowl <[email protected]>

Author: 3 people

src/Aspire.Cli/Commands/UpdateCommand.cs

@@ -24,6 +24,7 @@ internal sealed class UpdateCommand : BaseCommand
     private readonly IProjectUpdater _projectUpdater;
     private readonly ILogger<UpdateCommand> _logger;
     private readonly ICliDownloader? _cliDownloader;
+    private readonly ICliUpdateNotifier _updateNotifier;
 
     public UpdateCommand(
         IProjectLocator projectLocator, 
@@ -41,12 +42,14 @@ public UpdateCommand(
         ArgumentNullException.ThrowIfNull(packagingService);
         ArgumentNullException.ThrowIfNull(projectUpdater);
         ArgumentNullException.ThrowIfNull(logger);
+        ArgumentNullException.ThrowIfNull(updateNotifier);
 
         _projectLocator = projectLocator;
         _packagingService = packagingService;
         _projectUpdater = projectUpdater;
         _logger = logger;
         _cliDownloader = cliDownloader;
+        _updateNotifier = updateNotifier;
 
         var projectOption = new Option<FileInfo?>("--project");
         projectOption.Description = UpdateCommandStrings.ProjectArgumentDescription;
@@ -116,6 +119,21 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
                 cancellationToken);
 
             await _projectUpdater.UpdateProjectAsync(projectFile!, channel, cancellationToken);
+            
+            // After successful project update, check if CLI update is available and prompt
+            if (_cliDownloader is not null && _updateNotifier.IsUpdateAvailable())
+            {
+                var shouldUpdateCli = await InteractionService.ConfirmAsync(
+                    UpdateCommandStrings.UpdateCliAfterProjectUpdatePrompt,
+                    defaultValue: true,
+                    cancellationToken);
+                
+                if (shouldUpdateCli)
+                {
+                    // Use the same channel that was selected for the project update
+                    return await ExecuteSelfUpdateAsync(parseResult, cancellationToken, channel.Name);
+                }
+            }
         }
         catch (ProjectUpdaterException ex)
         {
@@ -125,15 +143,33 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
         }
         catch (ProjectLocatorException ex)
         {
+            // Check if this is a "no project found" error and prompt for self-update
+            if (string.Equals(ex.Message, ErrorStrings.NoProjectFileFound, StringComparisons.CliInputOrOutput))
+            {
+                // Only prompt for self-update if not running as dotnet tool and downloader is available
+                if (_cliDownloader is not null)
+                {
+                    var shouldUpdateCli = await InteractionService.ConfirmAsync(
+                        UpdateCommandStrings.NoAppHostFoundUpdateCliPrompt,
+                        defaultValue: true,
+                        cancellationToken);
+                    
+                    if (shouldUpdateCli)
+                    {
+                        return await ExecuteSelfUpdateAsync(parseResult, cancellationToken);
+                    }
+                }
+            }
+            
             return HandleProjectLocatorException(ex, InteractionService);
         }
 
         return 0;
     }
 
-    private async Task<int> ExecuteSelfUpdateAsync(ParseResult parseResult, CancellationToken cancellationToken)
+    private async Task<int> ExecuteSelfUpdateAsync(ParseResult parseResult, CancellationToken cancellationToken, string? selectedQuality = null)
     {
-        var quality = parseResult.GetValue<string?>("--quality");
+        var quality = selectedQuality ?? parseResult.GetValue<string?>("--quality");
 
         // If quality is not specified, prompt the user
         if (string.IsNullOrEmpty(quality))

src/Aspire.Cli/Interaction/ConsoleInteractionService.cs

@@ -243,10 +243,16 @@ public void DisplayEmptyLine()
 
     private const string UpdateUrl = "https://aka.ms/aspire/update";
 
-    public void DisplayVersionUpdateNotification(string newerVersion)
+    public void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null)
     {
         _ansiConsole.WriteLine();
         _ansiConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.NewCliVersionAvailable, newerVersion));
+        
+        if (!string.IsNullOrEmpty(updateCommand))
+        {
+            _ansiConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.ToUpdateRunCommand, updateCommand));
+        }
+        
         _ansiConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.MoreInfoNewCliVersion, UpdateUrl));
     }
 }

src/Aspire.Cli/Interaction/ExtensionInteractionService.cs

@@ -308,9 +308,9 @@ public void DisplayMarkdown(string markdown)
         _consoleInteractionService.DisplayMarkdown(markdown);
     }
 
-    public void DisplayVersionUpdateNotification(string newerVersion)
+    public void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null)
     {
-        _consoleInteractionService.DisplayVersionUpdateNotification(newerVersion);
+        _consoleInteractionService.DisplayVersionUpdateNotification(newerVersion, updateCommand);
     }
 
     public void LogMessage(LogLevel logLevel, string message)

src/Aspire.Cli/Interaction/IInteractionService.cs

@@ -25,6 +25,6 @@ internal interface IInteractionService
     void DisplayCancellationMessage();
     void DisplayEmptyLine();
 
-    void DisplayVersionUpdateNotification(string newerVersion);
+    void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null);
     void WriteConsoleLog(string message, int? lineNumber = null, string? type = null, bool isErrorMessage = false);
 }

src/Aspire.Cli/Resources/InteractionServiceStrings.Designer.cs

@@ -208,6 +208,10 @@
     <value>[dim]For more information, see: [link]{0}[/][/]</value>
     <comment>Do not translate [dim] and [link]. Also leave [/] as-is. {0} is a URL</comment>
   </data>
+  <data name="ToUpdateRunCommand" xml:space="preserve">
+    <value>[dim]To update, run: {0}[/]</value>
+    <comment>Do not translate [dim]. Also leave [/] as-is. {0} is the command to run</comment>
+  </data>
   <data name="UnbuildableAppHostsDetected" xml:space="preserve">
     <value>No app hosts were found (there may be app hosts project files with syntax errors/invalid SDK versions).</value>
   </data>

src/Aspire.Cli/Resources/InteractionServiceStrings.resx

@@ -114,4 +114,10 @@
   <data name="FallbackParsingWarning" xml:space="preserve">
     <value>Note: Update plan generated using fallback parsing due to unresolvable AppHost SDK. Dependency analysis may have reduced accuracy.</value>
   </data>
+  <data name="NoAppHostFoundUpdateCliPrompt" xml:space="preserve">
+    <value>No Aspire AppHost project found. Would you like to update the Aspire CLI instead?</value>
+  </data>
+  <data name="UpdateCliAfterProjectUpdatePrompt" xml:space="preserve">
+    <value>An update is available for the Aspire CLI. Would you like to update it now?</value>
+  </data>
 </root>