Skip to content

Merge main to nightly for May 2026 .NET releases#7187

Closed
lbussell wants to merge 2909 commits into
dotnet:mainfrom
lbussell:main-to-nightly-2026-05B
Closed

Merge main to nightly for May 2026 .NET releases#7187
lbussell wants to merge 2909 commits into
dotnet:mainfrom
lbussell:main-to-nightly-2026-05B

Conversation

@lbussell
Copy link
Copy Markdown
Member

jshigetomi and others added 30 commits September 16, 2025 08:07
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: lbussell <36081148+lbussell@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
lbussell and others added 25 commits April 14, 2026 11:20
…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>
- 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>
…ates (WI 10142) (dotnet#7170)

Co-authored-by: Missy Messa <mjanecke@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Justin Chung <chungjustin@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@lbussell lbussell requested review from a team, joperezr and wiktork as code owners May 12, 2026 21:22
@lbussell lbussell closed this May 12, 2026
@lbussell
Copy link
Copy Markdown
Member Author

Wrong target branch, will open a different PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.