Skip to content

[Automated] Backmerge release/13.2 to main#14480

Merged
joperezr merged 6 commits intomainfrom
backmerge/release-13.2-to-main
Feb 13, 2026
Merged

[Automated] Backmerge release/13.2 to main#14480
joperezr merged 6 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: 5

This PR was created automatically to keep main up-to-date with release branch changes.
Once approved, it will auto-merge.


This PR was generated by the backmerge-release workflow.

joperezr and others added 6 commits February 11, 2026 17:29
…hema and implement related tests (#14455)

* Add override options for staging feed and quality in configuration schema and implement related tests

* Add stagingVersionPrefix property to configuration schemas and implement related logic in PackagingService
* Initial plan

* Hide aspire setup command when bundle is not available

Conditionally add SetupCommand to the CLI command tree only when
IBundleService.IsBundle is true, following the same pattern used for
ExecCommand and SdkCommand feature-flag gating.

Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>

* Add tests for setup command visibility based on bundle availability

Add two tests to RootCommandTests:
- SetupCommand_NotAvailable_WhenBundleIsNotAvailable: verifies setup
  command is hidden when the CLI has no embedded bundle
- SetupCommand_Available_WhenBundleIsAvailable: verifies setup command
  is visible when the CLI has an embedded bundle

Also add BundleServiceFactory to CliServiceCollectionTestOptions and
TestBundleService to support overriding bundle behavior in tests.

Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>
…14473)

* Initial plan

* Fix transitive Azure role assignments through WaitFor dependencies

Remove CollectAnnotationDependencies calls from CollectDependenciesFromValue
to prevent WaitFor/parent/connection-string-redirect annotations from
referenced resources being included as direct dependencies of the caller.

Add tests verifying:
- DirectOnly mode excludes WaitFor deps from referenced resources
- WaitFor doesn't create transitive role assignments in Azure publish

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

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: eerhardt <8291187+eerhardt@users.noreply.github.com>
…tities and roles (#14474)

* Stop ViteApps (build only containers) from getting Azure managed identities and roles

These resources don't get deployed, so they should be filtered from getting role assignments and managed identities added for them.

* Update src/Aspire.Hosting.Azure/AzureResourcePreparer.cs

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

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
… dependencies to latest (#14467)

* Update to Azure.Core 1.51.1

Use latest versions for all dotnet/runtime nuget packages. This simplifies our dependency management.

Remove ForceLatestDotnetVersions property from multiple project files

* Update AzureDeployerTests to use WaitForShutdown instead of StopAsync

There is a timing issue when using Start/Stop since the background pipeline might still be running and it cancels the pipeline before it can complete.

* Fix AuxiliaryBackchannelTests by adding a Task that completes when the AuxiliaryBackchannelService is listening and ready for connections.

* Remove double registration of AuxiliaryBackchannelService as an IHostedService.

* Fix ResourceLoggerForwarderServiceTests to ensure the ResourceLoggerForwarderService has started before signalling the stopping token.

---------

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
@github-actions github-actions bot requested a review from mitchdenny as a code owner February 12, 2026 23:38
@github-actions github-actions bot added the area-engineering-systems infrastructure helix infra engineering repo stuff label Feb 12, 2026
@github-actions github-actions bot requested a review from eerhardt as a code owner February 12, 2026 23:38
@github-actions github-actions bot added the area-engineering-systems infrastructure helix infra engineering repo stuff label Feb 12, 2026
@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 -- 14480

Or

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

@eerhardt
Copy link
Member

Make sure not to squash merge!

@github-actions
Copy link
Contributor Author

🎬 CLI E2E Test Recordings

The following terminal recordings are available for commit 8ae1e4d:

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

📹 Recordings uploaded automatically from CI run #21968589323

@joperezr joperezr merged commit a459276 into main Feb 13, 2026
339 of 343 checks passed
@joperezr joperezr deleted the backmerge/release-13.2-to-main branch February 13, 2026 00:09
@dotnet-policy-service dotnet-policy-service bot added this to the 13.3 milestone Feb 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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