[release/9.4] Backport 10203: Add CTRL-C message back into aspire run command#10324
Merged
davidfowl merged 1 commit intorelease/9.4from Jul 12, 2025
Merged
Conversation
* Initial plan * Add CTRL-C guidance message to aspire run command output Co-authored-by: mitchdenny <513398+mitchdenny@users.noreply.github.com> * Update CTRL-C message * Fix CTRL-C message formatting and change "app host" to "apphost" Co-authored-by: maddymontaquila <12660687+maddymontaquila@users.noreply.github.com> * Move CTRL+C message to appear after endpoints in codespaces Co-authored-by: maddymontaquila <12660687+maddymontaquila@users.noreply.github.com> * Fix CTRL+C message positioning in codespaces by improving environment detection Co-authored-by: mitchdenny <513398+mitchdenny@users.noreply.github.com> * Fixes to implementation. * Fix formatting (bye bye pink) --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: mitchdenny <513398+mitchdenny@users.noreply.github.com> Co-authored-by: Mitch Denny <midenn@microsoft.com> Co-authored-by: maddymontaquila <12660687+maddymontaquila@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR backports #10203, restoring the CTRL-C message in aspire run and enhancing container image building to support new options. Key changes include:
- Extended
IResourceContainerImageBuilderto acceptContainerBuildOptions(format, platform, output path) and added related enums. - Updated Docker and Podman runtimes to handle the new options.
- Renamed and refactored Azure storage methods (
AddBlobs/AddQueues→AddBlobService/AddQueueService) across tests and documentation.
Reviewed Changes
Copilot reviewed 159 out of 162 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs | Added ContainerBuildOptions parameter to BuildImageAsync/BuildImagesAsync overloads. |
| src/Aspire.Hosting/Publishing/DockerContainerRuntime.cs | Enhanced Docker build commands for format, platform, and output options. |
| src/Aspire.Hosting/Publishing/PodmanContainerRuntime.cs | Enhanced Podman build commands for format, platform, and output options. |
| src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs | Introduced new AddBlobService/AddQueueService/AddTableService methods and health checks. |
Files not reviewed (1)
- src/Aspire.Dashboard/Resources/ConsoleLogs.Designer.cs: Language not supported
Comments suppressed due to low confidence (3)
src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs:485
- [nitpick] Methods like
AddBlobService,AddQueueService, andAddTableServicecontain very similar health-check registration and connection-string handling code. Consider extracting the shared logic into a helper function to reduce duplication and improve maintainability.
public static IResourceBuilder<AzureQueueStorageResource> AddQueues(this IResourceBuilder<AzureStorageResource> builder, [ResourceName] string name)
src/Aspire.Hosting/Publishing/PodmanContainerRuntime.cs:41
Path.Combineis used butSystem.IOis not imported in this file. Addusing System.IO;at the top to avoid compile errors.
arguments += $" --output \"{Path.Combine(options.OutputPath, resourceName)}.tar\"";
src/Aspire.Hosting/Publishing/DockerContainerRuntime.cs:67
Path.Combineis used butSystem.IOis not imported in this file. Addusing System.IO;at the top to avoid compile errors.
outputType += $",dest={Path.Combine(options.OutputPath, resourceName)}.tar";
davidfowl
approved these changes
Jul 11, 2025
danmoseley
approved these changes
Jul 11, 2025
|
out of curiosity, will this have an impact on #9756? |
Contributor
|
@WillEhrendreich nope, that issue still stands. |
auto-merge was automatically disabled
July 12, 2025 09:48
Pull request was closed
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.
This PR backports #10203 which adds the CTRL-C message back into the
aspire runcommand. It addresses an issue where the CTRL-C message was rendering above endpoints when running in devcontainers/codespaces (where we need to render the URLs).