Skip to content

Conversation

@mitchdenny
Copy link
Member

This PR backports #10203 which adds the CTRL-C message back into the aspire run command. 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).

* Initial plan

* Add CTRL-C guidance message to aspire run command output

Co-authored-by: mitchdenny <[email protected]>

* Update CTRL-C message

* Fix CTRL-C message formatting and change "app host" to "apphost"

Co-authored-by: maddymontaquila <[email protected]>

* Move CTRL+C message to appear after endpoints in codespaces

Co-authored-by: maddymontaquila <[email protected]>

* Fix CTRL+C message positioning in codespaces by improving environment detection

Co-authored-by: mitchdenny <[email protected]>

* Fixes to implementation.

* Fix formatting (bye bye pink)

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: mitchdenny <[email protected]>
Co-authored-by: Mitch Denny <[email protected]>
Co-authored-by: maddymontaquila <[email protected]>
Copilot AI review requested due to automatic review settings July 11, 2025 11:40
@github-actions github-actions bot added the area-codeflow for labeling automated codeflow. intentionally a different color! label Jul 11, 2025
@mitchdenny mitchdenny changed the base branch from main to release/9.4 July 11, 2025 11:40
@mitchdenny mitchdenny added this to the 9.4 milestone Jul 11, 2025
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 IResourceContainerImageBuilder to accept ContainerBuildOptions (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/AddQueuesAddBlobService/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, and AddTableService contain 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.Combine is used but System.IO is not imported in this file. Add using 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.Combine is used but System.IO is not imported in this file. Add using System.IO; at the top to avoid compile errors.
                    outputType += $",dest={Path.Combine(options.OutputPath, resourceName)}.tar";

@danmoseley danmoseley removed the area-codeflow for labeling automated codeflow. intentionally a different color! label Jul 11, 2025
@danmoseley danmoseley enabled auto-merge (squash) July 11, 2025 13:09
@danmoseley danmoseley added the Servicing-approved Approved for servicing release label Jul 11, 2025
@WillEhrendreich
Copy link

out of curiosity, will this have an impact on #9756?

@davidfowl
Copy link
Member

@WillEhrendreich nope, that issue still stands.

@davidfowl davidfowl closed this Jul 12, 2025
auto-merge was automatically disabled July 12, 2025 09:48

Pull request was closed

@davidfowl davidfowl reopened this Jul 12, 2025
@davidfowl davidfowl enabled auto-merge (squash) July 12, 2025 09:48
@davidfowl davidfowl merged commit 82fcb46 into release/9.4 Jul 12, 2025
256 checks passed
@davidfowl davidfowl deleted the mitchdenny/backport-10203-to-9.4 branch July 12, 2025 10:10
@github-actions github-actions bot locked and limited conversation to collaborators Aug 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-cli Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants