Add macOS `container` CLI support for local container publishing by Copilot · Pull Request #54643 · dotnet/sdk

Copilot · 2026-06-08T15:41:21Z

macOS now has a native container CLI that can act as a local image store alongside Docker and Podman. This updates local-registry publishing to recognize that CLI, prefer existing runtimes first, and use an OCI-compatible load path when container is selected.

Local registry support
- adds KnownLocalRegistryTypes.Container
- wires CreateLocalRegistry to instantiate the local daemon wrapper for container
- updates public API baselines for the new local registry type
Daemon detection
- probes container only on macOS
- keeps detection priority as:
  1. Docker
  2. Podman
  3. container
- preserves the existing Docker-vs-Podman alias handling before considering container
Local image loading
- adds container CLI handling to DockerCli
- uses container image load --input <archive> instead of streaming to docker load
- writes a temp OCI tarball for the container path, since the CLI expects a file input
Image format selection
- forces OCI manifest output when targeting the macOS container local registry
- keeps existing Docker/Podman behavior unchanged
Related updates
- extends local-storage telemetry to distinguish container
- updates daemon-test helpers so Docker-only tests skip non-Docker local CLIs
- adds focused unit coverage for command selection, registry creation, and OCI format forcing

internal static bool ShouldForceOciImageFormat(DestinationImageReference destinationImageReference)
    => destinationImageReference.LocalRegistry is DockerCli dockerCli
        && dockerCli.GetCommand() == DockerCli.ContainerCommand;

Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com>

baronfel · 2026-06-08T16:42:15Z

  "symbols/ExtensionsProfile/choices/None/displayName": "Žádné",
  "symbols/ExtensionsProfile/choices/AllMicrosoft/description": "Povolit všechna rozšíření odeslaná Microsoftem (včetně rozšíření s omezující licencí)",
  "symbols/ExtensionsProfile/choices/AllMicrosoft/displayName": "AllMicrosoft",
+  "symbols/ExplicitProgramFile/description": "When using Microsoft.Testing.Platform, generate an explicit Program.cs file with the test application entry point instead of relying on the entry point auto-generated by the SDK. Has no effect when TestRunner is VSTest.",


@copilot remove all of these localization changes, they are unrelated to this PR.

Addressed in e5ac924.

Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com>

Copilot

Pull request overview

This PR extends Microsoft.NET.Build.Containers local-daemon publishing to support the new macOS-native container CLI as an additional local image store option alongside Docker and Podman, including detection/selection logic, load behavior, and OCI format forcing when targeting container.

Changes:

Adds a new local registry type (KnownLocalRegistryTypes.Container) and wires registry creation to a DockerCli wrapper configured for the container command.
Extends local CLI detection/selection priority (Docker → Podman → container on macOS) and adds container-specific load behavior (container image load --input <tar>).
Forces OCI manifest output when publishing to the container local registry and extends telemetry/tests accordingly.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
test/Microsoft.NET.Build.Containers.UnitTests/DockerDaemonTests.cs	Updates daemon-test skip commentary to include `container` as a local-only CLI.
test/Microsoft.NET.Build.Containers.UnitTests/DockerCliTests.cs	Adds unit tests for CLI selection priority, registry creation for `Container`, and OCI forcing behavior.
test/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs	Updates Docker-availability test attributes to skip non-Docker CLIs and maps `container` to the new local registry type.
src/Containers/Microsoft.NET.Build.Containers/Telemetry.cs	Adds `Container` to local storage telemetry classification.
src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs	Consolidates image format parsing and delegates manifest media-type selection to `ContainerBuilder`.
src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net11.0/PublicAPI.Unshipped.txt	Records the new `KnownLocalRegistryTypes.Container` public constant.
src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/KnownLocalRegistryTypes.cs	Introduces the `Container` local registry type and includes it in supported types and factory creation.
src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs	Adds `container` command support: probing on macOS, selection logic, and an OCI-tar-file load path using `--input`.
src/Containers/Microsoft.NET.Build.Containers/ContainerBuilder.cs	Adds centralized media-type selection helpers and forces OCI manifest type for `container` local publishing.

        if (!DockerCliStatus.IsAvailable)
        {
            base.Skip = "Skipping test because Docker is not available on this host.";
        }

-        if (skipPodman && DockerCliStatus.Command == DockerCli.PodmanCommand)
+        if (skipPodman && DockerCliStatus.Command != DockerCli.DockerCommand)
        {
            base.Skip = $"Skipping test with {DockerCliStatus.Command} cli.";
        }


+        if (skipPodman && DockerCliStatus.Command != DockerCli.DockerCommand)
        {
            base.Skip = $"Skipping test with {DockerCliStatus.Command} cli.";
        }


+        finally
+        {
+            File.Delete(imageArchivePath);
+        }


baronfel · 2026-07-11T19:07:03Z

Closing in favor of #55249

Initial plan

bb7dd02

Copilot AI assigned Copilot and baronfel Jun 8, 2026

Copilot started work on behalf of baronfel June 8, 2026 15:41 View session

Copilot AI linked an issue Jun 8, 2026 that may be closed by this pull request

Support new macOS container tooling dotnet/sdk-container-builds#636

Open

Copilot AI and others added 3 commits June 8, 2026 15:51

Plan container CLI support

b7911c5

Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com>

Add macOS container CLI support

3e50d1b

Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com>

Refine macOS container temp archive handling

1594802

Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Add support for new macOS container tooling in .NET 10~~ Add macOS container CLI support for local container publishing Jun 8, 2026

Copilot finished work on behalf of baronfel June 8, 2026 16:05

Copilot AI requested a review from baronfel June 8, 2026 16:05

baronfel reviewed Jun 8, 2026

View reviewed changes

Copilot started work on behalf of baronfel June 8, 2026 16:42 View session

Remove unrelated MSTest localization changes

e5ac924

Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com>

Copilot finished work on behalf of baronfel June 8, 2026 16:53

Copilot AI requested a review from baronfel June 8, 2026 16:53

baronfel marked this pull request as ready for review June 8, 2026 17:09

Copilot AI review requested due to automatic review settings June 8, 2026 17:09

baronfel requested a review from a team as a code owner June 8, 2026 17:09

Copilot started reviewing on behalf of baronfel June 8, 2026 17:09 View session

Copilot AI reviewed Jun 8, 2026

View reviewed changes

build-analysis Bot mentioned this pull request Jun 8, 2026

Microsoft.DotNet.Watch.UnitTests.FileWatcherTests.DeleteSubfolder has flaky test assertion #49233

Closed

baronfel closed this Jul 11, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add macOS `container` CLI support for local container publishing#54643

Add macOS `container` CLI support for local container publishing#54643
baronfel with Copilot wants to merge 5 commits into
mainfrom
copilot/support-new-macos-container-tooling

Copilot AI commented Jun 8, 2026 •

edited

Loading

Uh oh!

baronfel Jun 8, 2026

Uh oh!

Copilot AI Jun 8, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

baronfel commented Jul 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

Copilot AI commented Jun 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

baronfel Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

baronfel commented Jul 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Jun 8, 2026 •

edited

Loading