Skip to content

[Automated] Backmerge release/13.2 to main#14587

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

[Automated] Backmerge release/13.2 to main#14587
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.

mitchdenny and others added 4 commits February 19, 2026 13:30
…resh loop (#14539)

TryGetResourceToolMap always returned false because it compared
_selectedAppHostPath against _auxiliaryBackchannelMonitor.SelectedAppHostPath,
which is only set by explicit select_apphost calls (usually null). After
RefreshResourceToolMapAsync sets _selectedAppHostPath to the connection's actual
path, the comparison null != "/path/to/AppHost" always failed, so every
tools/list call triggered a full refresh instead of using the cached map.

Fix: Add ResolvedAppHostPath property to IAuxiliaryBackchannelMonitor that
returns SelectedConnection?.AppHostInfo?.AppHostPath, and compare against that.
Rename field to _lastRefreshedAppHostPath for clarity.

Fixes #14538

Co-authored-by: Mitch Denny <mitch@mitchdeny.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…4452)

* Add AzureServiceTags class with common Azure service tags and tests

Co-authored-by: eerhardt <8291187+eerhardt@users.noreply.github.com>

* Use the new constants in more places.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: eerhardt <8291187+eerhardt@users.noreply.github.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
* Allow docker build secrets to be files

This allows people to pass .npmrc files as docker secrets without baking auth credentials into this image.

* Use explicit type in secret argument.
@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 -- 14587

Or

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

@github-actions
Copy link
Contributor Author

github-actions bot commented Feb 20, 2026

🎬 CLI E2E Test Recordings

The following terminal recordings are available for commit edc4aaa:

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 #22206149309

@joperezr joperezr merged commit 7922bfe into main Feb 20, 2026
676 of 680 checks passed
@joperezr joperezr deleted the backmerge/release-13.2-to-main branch February 20, 2026 01:10
@dotnet-policy-service dotnet-policy-service bot added this to the 13.3 milestone Feb 20, 2026
@github-actions github-actions bot locked and limited conversation to collaborators Mar 22, 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.

5 participants