Merge main to nightly for April 2026 .NET releases#7149
Merged
Conversation
Co-authored-by: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
(cherry picked from commit 6149347)
… release (dotnet#7068) (cherry picked from commit 95e0015)
(cherry picked from commit a6a31aa)
Co-authored-by: Logan Bussell <loganbussell@microsoft.com> (cherry picked from commit aa2f9d7)
Co-authored-by: Justin Chung <chungjustin@microsoft.com> Co-authored-by: Logan Bussell <loganbussell@microsoft.com> (cherry picked from commit de96891)
Co-authored-by: Logan Bussell <loganbussell@microsoft.com> (cherry picked from commit 96c84ce)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 15c0ab0)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit db5ac5c)
(cherry picked from commit 3ac48ee)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 11ce47c)
(cherry picked from commit 357e648)
…dotnet#7117) Co-authored-by: Logan Bussell <loganbussell@microsoft.com> (cherry picked from commit 673bd6f)
(cherry picked from commit beed7bd)
…dotnet#7124) (cherry picked from commit 2d4820a)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 9e5ef55)
Co-authored-by: Logan Bussell <loganbussell@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ructure with latest (dotnet#7140) Co-authored-by: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com>
…tnet#7142) Co-authored-by: Logan Bussell <loganbussell@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ructure with latest (dotnet#7144) Co-authored-by: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com>
…6-04B # Conflicts: # README.aspire-dashboard.md # README.aspnet.md # README.monitor-base.md # README.monitor.md # README.runtime-deps.md # README.runtime.md # README.sdk.md # manifest.versions.json # src/aspire-dashboard/amd64/Dockerfile # src/aspire-dashboard/arm64v8/Dockerfile # src/aspnet/10.0/alpine3.23-composite-extra/amd64/Dockerfile # src/aspnet/10.0/alpine3.23-composite-extra/arm32v7/Dockerfile # src/aspnet/10.0/alpine3.23-composite-extra/arm64v8/Dockerfile # src/aspnet/10.0/alpine3.23-composite/amd64/Dockerfile # src/aspnet/10.0/alpine3.23-composite/arm32v7/Dockerfile # src/aspnet/10.0/alpine3.23-composite/arm64v8/Dockerfile # src/aspnet/10.0/alpine3.23-extra/amd64/Dockerfile # src/aspnet/10.0/alpine3.23-extra/arm32v7/Dockerfile # src/aspnet/10.0/alpine3.23-extra/arm64v8/Dockerfile # src/aspnet/10.0/alpine3.23/amd64/Dockerfile # src/aspnet/10.0/alpine3.23/arm32v7/Dockerfile # src/aspnet/10.0/alpine3.23/arm64v8/Dockerfile # src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile # src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile # src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile # src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile # src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile # src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile # src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile # src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile # src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile # src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile # src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile # src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile # src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile # src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile # src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile # src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile # src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile # src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile # src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile # src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile # src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile # src/aspnet/10.0/noble-chiseled/amd64/Dockerfile # src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile # src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile # src/aspnet/10.0/noble/amd64/Dockerfile # src/aspnet/10.0/noble/arm32v7/Dockerfile # src/aspnet/10.0/noble/arm64v8/Dockerfile # src/aspnet/10.0/resolute-chiseled-composite-extra/amd64/Dockerfile # src/aspnet/10.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile # src/aspnet/10.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile # src/aspnet/10.0/resolute-chiseled-composite/amd64/Dockerfile # src/aspnet/10.0/resolute-chiseled-composite/arm32v7/Dockerfile # src/aspnet/10.0/resolute-chiseled-composite/arm64v8/Dockerfile # src/aspnet/10.0/resolute-chiseled-extra/amd64/Dockerfile # src/aspnet/10.0/resolute-chiseled-extra/arm32v7/Dockerfile # src/aspnet/10.0/resolute-chiseled-extra/arm64v8/Dockerfile # src/aspnet/10.0/resolute-chiseled/amd64/Dockerfile # src/aspnet/10.0/resolute-chiseled/arm32v7/Dockerfile # src/aspnet/10.0/resolute-chiseled/arm64v8/Dockerfile # src/aspnet/10.0/resolute/amd64/Dockerfile # src/aspnet/10.0/resolute/arm32v7/Dockerfile # src/aspnet/10.0/resolute/arm64v8/Dockerfile # src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile # src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile # src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile # src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile # src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile # src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile # src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile # src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile # src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile # src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile # src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile # src/aspnet/11.0/alpine3.23/amd64/Dockerfile # src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile # src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile # src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile # src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile # src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile # src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile # src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile # src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile # src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile # src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile # src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile # src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile # src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile # src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile # src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile # src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile # src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile # src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile # src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile # src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile # src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile # src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile # src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile # src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile # src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile # src/aspnet/11.0/resolute/amd64/Dockerfile # src/aspnet/11.0/resolute/arm32v7/Dockerfile # src/aspnet/11.0/resolute/arm64v8/Dockerfile # src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile # src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile # src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile # src/monitor/10.0/azurelinux-distroless/amd64/Dockerfile # src/monitor/10.0/azurelinux-distroless/arm64v8/Dockerfile # src/runtime/10.0/alpine3.23-extra/amd64/Dockerfile # src/runtime/10.0/alpine3.23-extra/arm32v7/Dockerfile # src/runtime/10.0/alpine3.23-extra/arm64v8/Dockerfile # src/runtime/10.0/alpine3.23/amd64/Dockerfile # src/runtime/10.0/alpine3.23/arm32v7/Dockerfile # src/runtime/10.0/alpine3.23/arm64v8/Dockerfile # src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile # src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile # src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile # src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile # src/runtime/10.0/azurelinux3.0/amd64/Dockerfile # src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile # src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile # src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile # src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile # src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile # src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile # src/runtime/10.0/noble-chiseled/amd64/Dockerfile # src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile # src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile # src/runtime/10.0/noble/amd64/Dockerfile # src/runtime/10.0/noble/arm32v7/Dockerfile # src/runtime/10.0/noble/arm64v8/Dockerfile # src/runtime/10.0/resolute-chiseled-extra/amd64/Dockerfile # src/runtime/10.0/resolute-chiseled-extra/arm32v7/Dockerfile # src/runtime/10.0/resolute-chiseled-extra/arm64v8/Dockerfile # src/runtime/10.0/resolute-chiseled/amd64/Dockerfile # src/runtime/10.0/resolute-chiseled/arm32v7/Dockerfile # src/runtime/10.0/resolute-chiseled/arm64v8/Dockerfile # src/runtime/10.0/resolute/amd64/Dockerfile # src/runtime/10.0/resolute/arm32v7/Dockerfile # src/runtime/10.0/resolute/arm64v8/Dockerfile # src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile # src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile # src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile # src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile # src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile # src/runtime/11.0/alpine3.23/amd64/Dockerfile # src/runtime/11.0/alpine3.23/arm32v7/Dockerfile # src/runtime/11.0/alpine3.23/arm64v8/Dockerfile # src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile # src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile # src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile # src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile # src/runtime/11.0/azurelinux3.0/amd64/Dockerfile # src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile # src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile # src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile # src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile # src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile # src/runtime/11.0/resolute-chiseled/amd64/Dockerfile # src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile # src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile # src/runtime/11.0/resolute/amd64/Dockerfile # src/runtime/11.0/resolute/arm32v7/Dockerfile # src/runtime/11.0/resolute/arm64v8/Dockerfile # src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile # src/sdk/10.0/alpine3.23-aot/amd64/Dockerfile # src/sdk/10.0/alpine3.23-aot/arm64v8/Dockerfile # src/sdk/10.0/alpine3.23/amd64/Dockerfile # src/sdk/10.0/alpine3.23/arm32v7/Dockerfile # src/sdk/10.0/alpine3.23/arm64v8/Dockerfile # src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile # src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile # src/sdk/10.0/azurelinux3.0/amd64/Dockerfile # src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile # src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile # src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile # src/sdk/10.0/noble-aot/amd64/Dockerfile # src/sdk/10.0/noble-aot/arm64v8/Dockerfile # src/sdk/10.0/noble/amd64/Dockerfile # src/sdk/10.0/noble/arm32v7/Dockerfile # src/sdk/10.0/noble/arm64v8/Dockerfile # src/sdk/10.0/resolute-aot/amd64/Dockerfile # src/sdk/10.0/resolute-aot/arm64v8/Dockerfile # src/sdk/10.0/resolute/amd64/Dockerfile # src/sdk/10.0/resolute/arm32v7/Dockerfile # src/sdk/10.0/resolute/arm64v8/Dockerfile # src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile # src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile # src/sdk/11.0/alpine3.23/amd64/Dockerfile # src/sdk/11.0/alpine3.23/arm32v7/Dockerfile # src/sdk/11.0/alpine3.23/arm64v8/Dockerfile # src/sdk/11.0/azurelinux3.0/amd64/Dockerfile # src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile # src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile # src/sdk/11.0/resolute/amd64/Dockerfile # src/sdk/11.0/resolute/arm32v7/Dockerfile # src/sdk/11.0/resolute/arm64v8/Dockerfile # src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile # tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs # tests/Microsoft.DotNet.Docker.Tests/TestData.cs
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
lbussell
requested review from
a team,
benjaminpetit,
joperezr and
wiktork
as code owners
mthalman
approved these changes
Apr 14, 2026
- Remove openssl-provider-legacy from amd64 expected packages (no longer present in resolute amd64 images) - Add openssl-provider-legacy to arm32 expected packages (now detected by Syft on arm32) - Add tzdata-legacy to the extra packages for resolute chiseled images (present on all architectures) - Rename method to GetResoluteChiseledArchSpecificPackages Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
github-actions
Bot
added
the
needs-backport
Member
|
/backport to release/2026-05B |
Contributor
|
Started backporting to |
Contributor
|
@mthalman an error occurred while backporting to |
lbussell
removed
the
needs-backport
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Merge
mainbranch intonightlyafter the April 2026 servicing release.