Backmerge release/13.2 into main#14719
Merged
Merged
Conversation
Add backup/restore logic matching aspire update --self approach: - Backup existing CLI executable before extraction with timestamp - Restore from backup if extraction fails - Clean up old backup files on successful extraction Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>
…riber support (#14512) Add server-side plumbing for TUI monitor support (13.3 preparation): - BackchannelLoggerProvider: Add circular replay buffer (1000 entries) with pub-sub subscriber model. Subscribe() atomically returns a snapshot of buffered entries plus a per-subscriber channel for live entries, enabling multiple concurrent TUI clients without entry loss or draining. - AppHostRpcTarget: Add GetAppHostLogEntriesAsync() that replays buffered entries then streams live entries via per-subscriber channel. Uses subscribe/unsubscribe lifecycle with proper cleanup in finally block. - AuxiliaryBackchannelRpcTarget: Add GetAppHostLogEntriesAsync() delegate that forwards to AppHostRpcTarget for auxiliary backchannel clients. - DistributedApplicationBuilder: Register BackchannelLoggerProvider as concrete singleton with ILoggerProvider forwarding, enabling direct resolution by AppHostRpcTarget. - Tests: 4 new tests covering replay buffer fill, eviction at capacity, snapshot isolation, and concurrent subscriber fan-out. Co-authored-by: Mitch Denny <mitch@mitchdeny.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Add aspire start shortcut for detached AppHost launch - Add detached AppHost launch to 'aspire start' when no resource specified - Share detached launch behavior between start and run via AppHostLauncher - Register --no-build option on StartCommand and forward to child process - Restore JSON-safe detached output (human-readable to stderr for --format json) - Restore detached child diagnostics (--log-file generation and error surfacing) - Forward --no-build from 'aspire run --detach' to the detached child process Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address review feedback: refactor AppHostLauncher, fix string references - Make TimeProvider required (registered in DI as TimeProvider.System) - Add period to log message (nit) - Use option Name properties instead of hardcoded strings for --project/--isolated - Extract BuildChildProcessArgs, StopExistingInstancesAsync, HandleLaunchFailure, DisplayLaunchResultAsync, and LaunchAndWaitForBackchannelAsync as separate methods - Add s_projectOption to AppHostLauncher for shared use - Display error when project not found (item #4) - Fix string references: use SharedCommandStrings for relocated strings - Fix async void to async Task on DisplayLaunchResultAsync Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The /test-scenario workflow dispatched exploratory testing tasks to dotnet/aspire-playground via the Copilot agent. This infrastructure is being superseded by GitHub's built-in agentic workflows feature which provides similar capabilities natively. Removes: - tests/agent-scenarios/ directory (6 scenarios + README) - .github/workflows/test-scenario.yml - .github/instructions/test-scenario-prompt.instructions.md - Pattern reference in AGENTS.md Co-authored-by: Mitch Denny <mitch@mitchdeny.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Add AspireExport coverage for Aspire.Hosting.Azure.ServiceBus * Fix codegen issues * Fix other languages tests
* Rename --project to --apphost * Don't show fallback in help * Update resource files and add tests
* Add AspireExport coverage for Aspire.Hosting.Azure.ServiceBus * Fix codegen issues * Add polyglot coverage for Azure Functions * Update src/Aspire.Hosting.Azure.Functions/AzureFunctionsProjectResourceExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Aspire.Hosting.Azure.Functions/AzureFunctionsProjectResourceExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…#14547) * Suppress error notifications for extension cancellation in CLI When a user cancels an input prompt in the VS Code extension, the CLI's ExtensionBackchannel throws ExtensionOperationCanceledException. Previously, the ExtensionInteractionService catch blocks in ConfirmAsync, PromptForSelectionAsync, and PromptForSelectionsAsync would call DisplayError before re-throwing, causing an error notification in VS Code even though the cancellation was user-initiated. Changes: - ExtensionInteractionService: Skip DisplayError when the exception is ExtensionOperationCanceledException in prompt catch blocks and the task channel reader. - Program.cs: Add ExtensionOperationCanceledException to the global handler's cancellation suppression check as a safety net. * Update src/Aspire.Cli/Program.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…on conflicts (#14659) * Fix SecurityRule name generation to include "to" and to add an index on conflicts Also update the test instructions in AGENTS.md to ensure agents don't use the dotnet test --filter syntax becuase that doesn't work. microsoft/testfx#7160 * Update src/Aspire.Hosting.Azure.Network/AzureVirtualNetworkExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…anup (#14683) * Add WithPurgeTask to Azure Container Registry for scheduled image cleanup Add a WithPurgeTask extension method on IResourceBuilder<AzureContainerRegistryResource> that provisions a ContainerRegistryTask with a timer-triggered acr purge command to automatically remove old/unused container images on a schedule. Features: - Cron schedule validation using NCrontab - Configurable filter, age threshold (--ago), and keep count - Support for multiple purge tasks per registry with auto-indexed naming - Custom task name support with duplicate detection - Go-style duration formatting for the --ago parameter (e.g., 2d3h6m) Also adds XML documentation for the GetAzureContainerRegistry method and tests for both WithPurgeTask and GetAzureContainerRegistry. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address PR feedback: fix async tests, improve cron error message, use XML docs - Remove async from 3 GetAzureContainerRegistry tests (no awaits) - Wrap CrontabSchedule.Parse in try-catch with descriptive ArgumentException - Convert multi-line comment on FormatAgo to XML doc summary Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Address 3 High severity Component Governance alerts: - CVE-2026-22610: XSS vulnerability in @angular/compiler and @angular/core 21.0.3. The Angular Template Compiler fails to recognize href and xlink:href attributes of SVG <script> elements as Resource URL context, enabling bypass of built-in sanitization. Fixed in 21.0.7. Bumps all @angular/* packages from ^21.0.3 to ^21.0.7. - DOTNET-Security-10.0: .NET SDK 10.0.102 contains known security vulnerabilities patched in 10.0.103. Updated global.json to require 10.0.103. References: - GHSA-jrmj-c5cx-3cw6 - https://aka.ms/dotnet-security-notes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Fix ATS diff workflow It requires the polyglot flag to be set * Update .github/workflows/generate-ats-diffs.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Add role assignent for storage polyglot * Create enums for built in Azure roles * Improve testing
… status message in more situations (#14670)
…-13.2-to-main # Conflicts: # tests/Aspire.Cli.EndToEnd.Tests/AgentCommandTests.cs # tests/Aspire.Cli.EndToEnd.Tests/DescribeCommandTests.cs # tests/Shared/Hex1bTestHelpers.cs
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 14719Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 14719" |
Contributor
🎬 CLI E2E Test RecordingsThe following terminal recordings are available for commit
📹 Recordings uploaded automatically from CI run #22427970759 |
radical
approved these changes
Feb 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Manual backmerge of
release/13.2intomainto resolve conflicts from the automated backmerge workflow (fixes #14703).This PR should NOT be squashed. It must be merged using a merge commit to preserve the full release/13.2 history and avoid future merge conflicts. I will handle the merging.
Conflicts Resolved
1.
tests/Aspire.Cli.EndToEnd.Tests/AgentCommandTests.cs— Content conflict (trivial whitespace)CreateTestTerminal()call; main did not.2.
tests/Shared/Hex1bTestHelpers.cs— Add/add conflict (identical content)Hex1bTestHelpersfile as part of the E2E test centralization. The file content is identical on both sides; git could not auto-merge the trailing closing brace.3.
tests/Aspire.Cli.EndToEnd.Tests/DescribeCommandTests.cs— Modify/deleteResourcesCommandTests.cswhile release's CLI: Grouped help, command renames, and ergonomics cleanup #14599 renamed it toDescribeCommandTests.cs— and the resolution deleted the file entirely. Then release's Backport E2E test refactoring #14667 modified the renamed file with centralized test helpers, producing this new modify/delete conflict.DescribeCommandShowsRunningResources) for theaspire describecommand, and already uses the centralizedCliE2ETestHelpers.CreateTestTerminal()helper consistent with all other E2E tests on main.