Skip to content

[Automated] Backmerge release/13.2 to main#14521

Merged
joperezr merged 4 commits intomainfrom
backmerge/release-13.2-to-main
Feb 17, 2026
Merged

[Automated] Backmerge release/13.2 to main#14521
joperezr merged 4 commits intomainfrom
backmerge/release-13.2-to-main

Conversation

@github-actions
Copy link
Contributor

Automated Backmerge

This PR merges changes from release/13.2 back into main.

Commits to merge: 3

This PR was created automatically to keep main up-to-date with release branch changes.
Once approved, please merge using a merge commit (not squash or rebase).


This PR was generated by the backmerge-release workflow.

danegsta and others added 4 commits February 13, 2026 17:35
* Fix Spectre markup rendering in CLI selection prompts

The blanket EscapeMarkup() added to the UseConverter in
PromptForSelectionAsync/PromptForSelectionsAsync (PR #14422) escaped all
markup including the intentional [bold]...[/] used by
AddCommand.PackageNameWithFriendlyNameIfAvailable, causing literal
'[bold]postgresql[/]' to appear in 'aspire add' output.

Fix: remove blanket escaping from the generic converter and instead
escape dynamic values at each caller site that formats user-controlled
or file-system content (file paths, package names, channel details,
publish prompt options), while preserving intentional Spectre markup.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Update tests/Aspire.Cli.Tests/Interaction/ConsoleInteractionServiceTests.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Mitch Denny <midenn@microsoft.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@github-actions
Copy link
Contributor Author

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 14521

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 14521"

@github-actions
Copy link
Contributor Author

🎬 CLI E2E Test Recordings

The following terminal recordings are available for commit 477abdc:

Test Recording
AgentCommands_AllHelpOutputs_AreCorrect ▶️ View Recording
AgentInitCommand_MigratesDeprecatedConfig ▶️ View Recording
Banner_DisplayedOnFirstRun ▶️ View Recording
Banner_DisplayedWithExplicitFlag ▶️ View Recording
CreateAndDeployToDockerCompose ▶️ View Recording
CreateAndDeployToDockerComposeInteractive ▶️ View Recording
CreateAndPublishToKubernetes ▶️ View Recording
CreateAndRunAspireStarterProject ▶️ View Recording
CreateAndRunAspireStarterProjectWithBundle ▶️ View Recording
CreateAndRunJsReactProject ▶️ View Recording
CreateAndRunPythonReactProject ▶️ View Recording
CreateEmptyAppHostProject ▶️ View Recording
CreateStartAndStopAspireProject ▶️ View Recording
CreateStartWaitAndStopAspireProject ▶️ View Recording
CreateTypeScriptAppHostWithViteApp ▶️ View Recording
DoctorCommand_DetectsDeprecatedAgentConfig ▶️ View Recording
DoctorCommand_WithSslCertDir_ShowsTrusted ▶️ View Recording
DoctorCommand_WithoutSslCertDir_ShowsPartiallyTrusted ▶️ View Recording
LogsCommandShowsResourceLogs ▶️ View Recording
PsCommandListsRunningAppHost ▶️ View Recording
ResourcesCommandShowsRunningResources ▶️ View Recording
StagingChannel_ConfigureAndVerifySettings_ThenSwitchChannels ▶️ View Recording

📹 Recordings uploaded automatically from CI run #22107541286

@joperezr joperezr merged commit a9e0ee1 into main Feb 17, 2026
677 of 680 checks passed
@joperezr joperezr deleted the backmerge/release-13.2-to-main branch February 17, 2026 17:28
@dotnet-policy-service dotnet-policy-service bot added this to the 13.3 milestone Feb 17, 2026
@github-actions github-actions bot locked and limited conversation to collaborators Mar 20, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-engineering-systems infrastructure helix infra engineering repo stuff Re-opened Github-Action PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants