diff --git a/README.aspnet.md b/README.aspnet.md index 66a0eb8381..eac4e0c368 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -82,19 +82,19 @@ For more information, see the [composite images section in the Image Variants do Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-amd64, 10.0-noble-amd64, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/aspnet/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-composite-amd64, 10.0-noble-chiseled-composite-amd64, 10.0.0-rc.2-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-composite-extra-amd64, 10.0-noble-chiseled-composite-extra-amd64, 10.0.0-rc.2-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-alpine3.22-composite-amd64, 10.0-alpine3.22-composite-amd64, 10.0-alpine-composite-amd64, 10.0.0-rc.2-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.0-rc.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.0-rc.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.0-rc.2-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-composite-amd64, 10.0-azurelinux3.0-distroless-composite-amd64, 10.0.0-rc.2-azurelinux3.0-distroless-composite, 10.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-composite-extra-amd64, 10.0-azurelinux3.0-distroless-composite-extra-amd64, 10.0.0-rc.2-azurelinux3.0-distroless-composite-extra, 10.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0 -9.0.10-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/aspnet/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +10.0.0-noble-amd64, 10.0-noble-amd64, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-composite-amd64, 10.0-noble-chiseled-composite-amd64, 10.0.0-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-composite-extra-amd64, 10.0-noble-chiseled-composite-extra-amd64, 10.0.0-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 +10.0.0-alpine3.22-composite-amd64, 10.0-alpine3.22-composite-amd64, 10.0-alpine-composite-amd64, 10.0.0-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile) | Alpine 3.22 +10.0.0-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.0-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.0-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.0-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-composite-amd64, 10.0-azurelinux3.0-distroless-composite-amd64, 10.0.0-azurelinux3.0-distroless-composite, 10.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-composite-extra-amd64, 10.0-azurelinux3.0-distroless-composite-extra-amd64, 10.0.0-azurelinux3.0-distroless-composite-extra, 10.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0 +9.0.10-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 9.0.10-alpine3.21-amd64, 9.0-alpine3.21-amd64, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/aspnet/9.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 9.0.10-alpine3.21-composite-amd64, 9.0-alpine3.21-composite-amd64, 9.0.10-alpine3.21-composite, 9.0-alpine3.21-composite | [Dockerfile](src/aspnet/9.0/alpine3.21-composite/amd64/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0-alpine-amd64, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 @@ -134,19 +134,19 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-arm64v8, 10.0-noble-arm64v8, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/aspnet/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-composite-arm64v8, 10.0-noble-chiseled-composite-arm64v8, 10.0.0-rc.2-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-composite-extra-arm64v8, 10.0-noble-chiseled-composite-extra-arm64v8, 10.0.0-rc.2-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-alpine3.22-composite-arm64v8, 10.0-alpine3.22-composite-arm64v8, 10.0-alpine-composite-arm64v8, 10.0.0-rc.2-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.0-rc.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.0-rc.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-rc.2-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-composite-arm64v8, 10.0-azurelinux3.0-distroless-composite-arm64v8, 10.0.0-rc.2-azurelinux3.0-distroless-composite, 10.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0.0-rc.2-azurelinux3.0-distroless-composite-extra, 10.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0 -9.0.10-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +10.0.0-noble-arm64v8, 10.0-noble-arm64v8, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-composite-arm64v8, 10.0-noble-chiseled-composite-arm64v8, 10.0.0-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-composite-extra-arm64v8, 10.0-noble-chiseled-composite-extra-arm64v8, 10.0.0-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 +10.0.0-alpine3.22-composite-arm64v8, 10.0-alpine3.22-composite-arm64v8, 10.0-alpine-composite-arm64v8, 10.0.0-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile) | Alpine 3.22 +10.0.0-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.0-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.0-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-composite-arm64v8, 10.0-azurelinux3.0-distroless-composite-arm64v8, 10.0.0-azurelinux3.0-distroless-composite, 10.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0.0-azurelinux3.0-distroless-composite-extra, 10.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +9.0.10-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 9.0.10-alpine3.21-arm64v8, 9.0-alpine3.21-arm64v8, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/aspnet/9.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 9.0.10-alpine3.21-composite-arm64v8, 9.0-alpine3.21-composite-arm64v8, 9.0.10-alpine3.21-composite, 9.0-alpine3.21-composite | [Dockerfile](src/aspnet/9.0/alpine3.21-composite/arm64v8/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0-alpine-arm64v8, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 @@ -186,14 +186,14 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-arm32v7, 10.0-noble-arm32v7, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/aspnet/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-composite-arm32v7, 10.0-noble-chiseled-composite-arm32v7, 10.0.0-rc.2-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-composite-extra-arm32v7, 10.0-noble-chiseled-composite-extra-arm32v7, 10.0.0-rc.2-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-alpine3.22-composite-arm32v7, 10.0-alpine3.22-composite-arm32v7, 10.0-alpine-composite-arm32v7, 10.0.0-rc.2-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22 -9.0.10-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +10.0.0-noble-arm32v7, 10.0-noble-arm32v7, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/aspnet/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-composite-arm32v7, 10.0-noble-chiseled-composite-arm32v7, 10.0.0-noble-chiseled-composite, 10.0-noble-chiseled-composite | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-composite-extra-arm32v7, 10.0-noble-chiseled-composite-extra-arm32v7, 10.0.0-noble-chiseled-composite-extra, 10.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 +10.0.0-alpine3.22-composite-arm32v7, 10.0-alpine3.22-composite-arm32v7, 10.0-alpine-composite-arm32v7, 10.0.0-alpine3.22-composite, 10.0-alpine3.22-composite, 10.0-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile) | Alpine 3.22 +9.0.10-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 9.0.10-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/aspnet/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.10-alpine3.21-composite-arm32v7, 9.0-alpine3.21-composite-arm32v7, 9.0.10-alpine3.21-composite, 9.0-alpine3.21-composite | [Dockerfile](src/aspnet/9.0/alpine3.21-composite/arm32v7/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0-alpine-arm32v7, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 @@ -218,7 +218,7 @@ Tags | Dockerfile | OS Version Tag | Dockerfile ---------| --------------- -10.0.0-rc.2-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile) +10.0.0-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile) 9.0.10-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile) 8.0.21-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile) @@ -226,7 +226,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.0-rc.2-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile) +10.0.0-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile) 9.0.10-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile) 8.0.21-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile) @@ -234,7 +234,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.0-rc.2-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile) +10.0.0-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile) 9.0.10-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2022/amd64/Dockerfile) 8.0.21-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2022/amd64/Dockerfile) @@ -242,7 +242,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.0-rc.2-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile) +10.0.0-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile) 9.0.10-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2022/amd64/Dockerfile) 8.0.21-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2022/amd64/Dockerfile) diff --git a/README.runtime-deps.md b/README.runtime-deps.md index 2db4edbd61..19b6a48522 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -64,15 +64,15 @@ They contain the following features: Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-amd64, 10.0-noble-amd64, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-alpine3.22-extra-amd64, 10.0-alpine3.22-extra-amd64, 10.0-alpine-extra-amd64, 10.0.0-rc.2-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.0-rc.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.0-rc.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.0-rc.2-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 -9.0.10-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +10.0.0-noble-amd64, 10.0-noble-amd64, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 +10.0.0-alpine3.22-extra-amd64, 10.0-alpine3.22-extra-amd64, 10.0-alpine-extra-amd64, 10.0.0-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/amd64/Dockerfile) | Alpine 3.22 +10.0.0-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.0-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.0-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.0-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 +9.0.10-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 9.0.10-alpine3.21-amd64, 9.0-alpine3.21-amd64, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/runtime-deps/9.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 9.0.10-alpine3.21-extra-amd64, 9.0-alpine3.21-extra-amd64, 9.0.10-alpine3.21-extra, 9.0-alpine3.21-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.21-extra/amd64/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0-alpine-amd64, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 @@ -102,15 +102,15 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-arm64v8, 10.0-noble-arm64v8, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-alpine3.22-extra-arm64v8, 10.0-alpine3.22-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.0-rc.2-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.0-rc.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.0-rc.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-rc.2-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 -9.0.10-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +10.0.0-noble-arm64v8, 10.0-noble-arm64v8, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 +10.0.0-alpine3.22-extra-arm64v8, 10.0-alpine3.22-extra-arm64v8, 10.0-alpine-extra-arm64v8, 10.0.0-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/arm64v8/Dockerfile) | Alpine 3.22 +10.0.0-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.0-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.0-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +9.0.10-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 9.0.10-alpine3.21-arm64v8, 9.0-alpine3.21-arm64v8, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/runtime-deps/9.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 9.0.10-alpine3.21-extra-arm64v8, 9.0-alpine3.21-extra-arm64v8, 9.0.10-alpine3.21-extra, 9.0-alpine3.21-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.21-extra/arm64v8/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0-alpine-arm64v8, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 @@ -140,12 +140,12 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-arm32v7, 10.0-noble-arm32v7, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/runtime-deps/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-alpine3.22-extra-arm32v7, 10.0-alpine3.22-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.0-rc.2-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22 -9.0.10-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +10.0.0-noble-arm32v7, 10.0-noble-arm32v7, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/runtime-deps/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 +10.0.0-alpine3.22-extra-arm32v7, 10.0-alpine3.22-extra-arm32v7, 10.0-alpine-extra-arm32v7, 10.0.0-alpine3.22-extra, 10.0-alpine3.22-extra, 10.0-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.22-extra/arm32v7/Dockerfile) | Alpine 3.22 +9.0.10-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 9.0.10-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/runtime-deps/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.10-alpine3.21-extra-arm32v7, 9.0-alpine3.21-extra-arm32v7, 9.0.10-alpine3.21-extra, 9.0-alpine3.21-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.21-extra/arm32v7/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0-alpine-arm32v7, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 diff --git a/README.runtime.md b/README.runtime.md index d8c0054ff5..99af91887e 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -71,14 +71,14 @@ They contain the following features: Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-amd64, 10.0-noble-amd64, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/runtime/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.0-rc.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.0-rc.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.0-rc.2-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 -9.0.10-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/runtime/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +10.0.0-noble-amd64, 10.0-noble-amd64, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-amd64, 10.0-noble-chiseled-amd64, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-amd64, 10.0-noble-chiseled-extra-amd64, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 +10.0.0-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.0-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-amd64, 10.0-azurelinux3.0-distroless-amd64, 10.0.0-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-extra-amd64, 10.0-azurelinux3.0-distroless-extra-amd64, 10.0.0-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 +9.0.10-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 9.0.10-alpine3.21-amd64, 9.0-alpine3.21-amd64, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/runtime/9.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0-alpine-amd64, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 9.0.10-noble-amd64, 9.0-noble-amd64, 9.0.10-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04 @@ -104,14 +104,14 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-arm64v8, 10.0-noble-arm64v8, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/runtime/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 -10.0.0-rc.2-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.0-rc.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.0-rc.2-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.0-rc.2-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-rc.2-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 -9.0.10-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +10.0.0-noble-arm64v8, 10.0-noble-arm64v8, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-arm64v8, 10.0-noble-chiseled-arm64v8, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-arm64v8, 10.0-noble-chiseled-extra-arm64v8, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 +10.0.0-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.0-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-arm64v8, 10.0-azurelinux3.0-distroless-arm64v8, 10.0.0-azurelinux3.0-distroless, 10.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.0-azurelinux3.0-distroless-extra-arm64v8, 10.0-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-azurelinux3.0-distroless-extra, 10.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +9.0.10-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 9.0.10-alpine3.21-arm64v8, 9.0-alpine3.21-arm64v8, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/runtime/9.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0-alpine-arm64v8, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 9.0.10-noble-arm64v8, 9.0-noble-arm64v8, 9.0.10-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 @@ -137,11 +137,11 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.0-rc.2-noble-arm32v7, 10.0-noble-arm32v7, 10.0.0-rc.2-noble, 10.0-noble, 10.0.0-rc.2, 10.0 | [Dockerfile](src/runtime/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.0-rc.2-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.0-rc.2-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.0-rc.2-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.0-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 -9.0.10-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0, latest | [Dockerfile](src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +10.0.0-noble-arm32v7, 10.0-noble-arm32v7, 10.0.0-noble, 10.0-noble, 10.0.0, 10.0, latest | [Dockerfile](src/runtime/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-arm32v7, 10.0-noble-chiseled-arm32v7, 10.0.0-noble-chiseled, 10.0-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-noble-chiseled-extra-arm32v7, 10.0-noble-chiseled-extra-arm32v7, 10.0.0-noble-chiseled-extra, 10.0-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.0-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.0-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/runtime/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 +9.0.10-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.10-bookworm-slim, 9.0-bookworm-slim, 9.0.10, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 9.0.10-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0.10-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/runtime/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.10-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0-alpine-arm32v7, 9.0.10-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 9.0.10-noble-arm32v7, 9.0-noble-arm32v7, 9.0.10-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 @@ -158,7 +158,7 @@ Tags | Dockerfile | OS Version Tag | Dockerfile ---------| --------------- -10.0.0-rc.2-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile) +10.0.0-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile) 9.0.10-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile) 8.0.21-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile) @@ -166,7 +166,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.0-rc.2-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile) +10.0.0-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile) 9.0.10-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile) 8.0.21-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile) @@ -174,7 +174,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.0-rc.2-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile) +10.0.0-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile) 9.0.10-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2022/amd64/Dockerfile) 8.0.21-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2022/amd64/Dockerfile) @@ -182,7 +182,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.0-rc.2-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile) +10.0.0-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile) 9.0.10-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2022/amd64/Dockerfile) 8.0.21-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2022/amd64/Dockerfile) diff --git a/README.sdk.md b/README.sdk.md index 4d53255b34..99e9c845a9 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -67,13 +67,13 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/ Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.100-rc.2-noble-amd64, 10.0-noble-amd64, 10.0.100-rc.2-noble, 10.0-noble, 10.0.100-rc.2, 10.0 | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04 -10.0.100-rc.2-noble-aot-amd64, 10.0-noble-aot-amd64, 10.0.100-rc.2-noble-aot, 10.0-noble-aot, 10.0.100-rc.2-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04 -10.0.100-rc.2-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.100-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 -10.0.100-rc.2-alpine3.22-aot-amd64, 10.0-alpine3.22-aot-amd64, 10.0-alpine-aot-amd64, 10.0.100-rc.2-alpine3.22-aot, 10.0-alpine3.22-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22 -10.0.100-rc.2-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.100-rc.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 -10.0.100-rc.2-azurelinux3.0-aot-amd64, 10.0-azurelinux3.0-aot-amd64, 10.0.100-rc.2-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0 -9.0.306-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.306-bookworm-slim, 9.0-bookworm-slim, 9.0.306, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +10.0.100-noble-amd64, 10.0-noble-amd64, 10.0.100-noble, 10.0-noble, 10.0.100, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04 +10.0.100-noble-aot-amd64, 10.0-noble-aot-amd64, 10.0.100-noble-aot, 10.0-noble-aot, 10.0.100-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04 +10.0.100-alpine3.22-amd64, 10.0-alpine3.22-amd64, 10.0-alpine-amd64, 10.0.100-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 +10.0.100-alpine3.22-aot-amd64, 10.0-alpine3.22-aot-amd64, 10.0-alpine-aot-amd64, 10.0.100-alpine3.22-aot, 10.0-alpine3.22-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile) | Alpine 3.22 +10.0.100-azurelinux3.0-amd64, 10.0-azurelinux3.0-amd64, 10.0.100-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +10.0.100-azurelinux3.0-aot-amd64, 10.0-azurelinux3.0-aot-amd64, 10.0.100-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0 +9.0.306-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.306-bookworm-slim, 9.0-bookworm-slim, 9.0.306, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 9.0.306-alpine3.21-amd64, 9.0-alpine3.21-amd64, 9.0.306-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/sdk/9.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 9.0.306-alpine3.22-amd64, 9.0-alpine3.22-amd64, 9.0-alpine-amd64, 9.0.306-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.22/amd64/Dockerfile) | Alpine 3.22 9.0.306-noble-amd64, 9.0-noble-amd64, 9.0.306-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04 @@ -89,13 +89,13 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.100-rc.2-noble-arm64v8, 10.0-noble-arm64v8, 10.0.100-rc.2-noble, 10.0-noble, 10.0.100-rc.2, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.100-rc.2-noble-aot-arm64v8, 10.0-noble-aot-arm64v8, 10.0.100-rc.2-noble-aot, 10.0-noble-aot, 10.0.100-rc.2-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04 -10.0.100-rc.2-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.100-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 -10.0.100-rc.2-alpine3.22-aot-arm64v8, 10.0-alpine3.22-aot-arm64v8, 10.0-alpine-aot-arm64v8, 10.0.100-rc.2-alpine3.22-aot, 10.0-alpine3.22-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22 -10.0.100-rc.2-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.100-rc.2-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 -10.0.100-rc.2-azurelinux3.0-aot-arm64v8, 10.0-azurelinux3.0-aot-arm64v8, 10.0.100-rc.2-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0 -9.0.306-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.306-bookworm-slim, 9.0-bookworm-slim, 9.0.306, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +10.0.100-noble-arm64v8, 10.0-noble-arm64v8, 10.0.100-noble, 10.0-noble, 10.0.100, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.100-noble-aot-arm64v8, 10.0-noble-aot-arm64v8, 10.0.100-noble-aot, 10.0-noble-aot, 10.0.100-aot, 10.0-aot | [Dockerfile](src/sdk/10.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04 +10.0.100-alpine3.22-arm64v8, 10.0-alpine3.22-arm64v8, 10.0-alpine-arm64v8, 10.0.100-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 +10.0.100-alpine3.22-aot-arm64v8, 10.0-alpine3.22-aot-arm64v8, 10.0-alpine-aot-arm64v8, 10.0.100-alpine3.22-aot, 10.0-alpine3.22-aot, 10.0-alpine-aot | [Dockerfile](src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile) | Alpine 3.22 +10.0.100-azurelinux3.0-arm64v8, 10.0-azurelinux3.0-arm64v8, 10.0.100-azurelinux3.0, 10.0-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.100-azurelinux3.0-aot-arm64v8, 10.0-azurelinux3.0-aot-arm64v8, 10.0.100-azurelinux3.0-aot, 10.0-azurelinux3.0-aot | [Dockerfile](src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0 +9.0.306-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.306-bookworm-slim, 9.0-bookworm-slim, 9.0.306, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 9.0.306-alpine3.21-arm64v8, 9.0-alpine3.21-arm64v8, 9.0.306-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/sdk/9.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 9.0.306-alpine3.22-arm64v8, 9.0-alpine3.22-arm64v8, 9.0-alpine-arm64v8, 9.0.306-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.22/arm64v8/Dockerfile) | Alpine 3.22 9.0.306-noble-arm64v8, 9.0-noble-arm64v8, 9.0.306-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 @@ -111,9 +111,9 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -10.0.100-rc.2-noble-arm32v7, 10.0-noble-arm32v7, 10.0.100-rc.2-noble, 10.0-noble, 10.0.100-rc.2, 10.0 | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 -10.0.100-rc.2-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.100-rc.2-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 -9.0.306-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.306-bookworm-slim, 9.0-bookworm-slim, 9.0.306, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +10.0.100-noble-arm32v7, 10.0-noble-arm32v7, 10.0.100-noble, 10.0-noble, 10.0.100, 10.0, latest | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 +10.0.100-alpine3.22-arm32v7, 10.0-alpine3.22-arm32v7, 10.0-alpine-arm32v7, 10.0.100-alpine3.22, 10.0-alpine3.22, 10.0-alpine | [Dockerfile](src/sdk/10.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 +9.0.306-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.306-bookworm-slim, 9.0-bookworm-slim, 9.0.306, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 9.0.306-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0.306-alpine3.21, 9.0-alpine3.21 | [Dockerfile](src/sdk/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.306-alpine3.22-arm32v7, 9.0-alpine3.22-arm32v7, 9.0-alpine-arm32v7, 9.0.306-alpine3.22, 9.0-alpine3.22, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.22/arm32v7/Dockerfile) | Alpine 3.22 9.0.306-noble-arm32v7, 9.0-noble-arm32v7, 9.0.306-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 @@ -126,7 +126,7 @@ Tags | Dockerfile | OS Version Tag | Dockerfile ---------| --------------- -10.0.100-rc.2-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile) +10.0.100-nanoserver-ltsc2025, 10.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile) 9.0.306-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile) 8.0.415-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile) @@ -134,7 +134,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.100-rc.2-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile) +10.0.100-windowsservercore-ltsc2025, 10.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile) 9.0.306-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile) 8.0.415-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile) @@ -142,7 +142,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.100-rc.2-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile) +10.0.100-nanoserver-ltsc2022, 10.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile) 9.0.306-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile) 8.0.415-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile) @@ -150,7 +150,7 @@ Tag | Dockerfile Tag | Dockerfile ---------| --------------- -10.0.100-rc.2-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile) +10.0.100-windowsservercore-ltsc2022, 10.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile) 9.0.306-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile) 8.0.415-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile) diff --git a/eng/dockerfile-templates/Dockerfile.download-dotnet b/eng/dockerfile-templates/Dockerfile.download-dotnet index fc2f9d9bca..9cf99ff7d1 100644 --- a/eng/dockerfile-templates/Dockerfile.download-dotnet +++ b/eng/dockerfile-templates/Dockerfile.download-dotnet @@ -41,6 +41,10 @@ VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")] )^ set buildVersion to VARIABLES[cat(product, "|", dotnetVersion, "|build-version")] ^ + _ 'Stable' versioning just means that the downloaded file has a stable version. + Internal/release stable builds will use product versions for both paths and filenames. + Public stable builds still use build versions for paths but stable versions for filenames. + Public unstable builds use build versions for both paths and filenames. ^ set isStableVersion to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^ set fileVersion to when(isStableVersion, productVersion, buildVersion) ^ @@ -140,7 +144,7 @@ "dotnet_version")), when(isStableVersion, productVersion, buildVersion) ) -}}{{if (isInternal && isStableVersion):{{lineEnd}} +}}{{if (isStableVersion && (isInternal || buildVersion != productVersion)):{{lineEnd}} {{continue}}{{ _ Internal builds and unreleased RC builds have separate build and product versions ^ assign( diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.envs b/eng/dockerfile-templates/aspnet/Dockerfile.envs index bbfcc38553..f781a195c8 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.envs +++ b/eng/dockerfile-templates/aspnet/Dockerfile.envs @@ -1,21 +1,20 @@ {{ _ ARGS: - is-composite-runtime (optional): Whether to include the runtime version - is-internal (optional): Whether the Dockerfile is targeting an internal build of the product ^ + is-composite-runtime (optional): Whether to include the runtime version ^ set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^ - set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^ - set isStableBranding to ( - find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-servicing") >= 0 - || find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-rtm") >= 0 - || find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-rc") >= 0 - ) ^ - set runtimeVersion to when(isStableBranding && ARGS["is-internal"], + set buildVersion to VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")] ^ + set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^ + + set runtimeVersion to when(isStableBranding, VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], VARIABLES[cat("runtime|", dotnetVersion, "|build-version")]) ^ - set aspnetVersion to when(isStableBranding && ARGS["is-internal"], + + set aspnetVersion to when(isStableBranding, VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")]) ^ + + set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^ set lineContinuation to when(isWindows, "`", "\") ^ set aspnetComment to "# ASP.NET Core version" }}{{if ARGS["is-composite-runtime"]:ENV {{lineContinuation}} diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux b/eng/dockerfile-templates/aspnet/Dockerfile.linux index 024dfa043e..ba1d261eaa 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.linux +++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux @@ -57,6 +57,6 @@ RUN {{InsertTemplate("../Dockerfile.download-dotnet", [ # ASP.NET Core image FROM {{runtimeBaseTag}} -{{InsertTemplate("Dockerfile.envs", ["is-internal": isInternal])}} +{{InsertTemplate("Dockerfile.envs")}} COPY --from=installer ["{{copyFromSrcPath}}", "{{copyFromDstPath}}"] diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.windows b/eng/dockerfile-templates/aspnet/Dockerfile.windows index 7f66b40051..a3f6c3c233 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.windows +++ b/eng/dockerfile-templates/aspnet/Dockerfile.windows @@ -33,6 +33,6 @@ RUN powershell -Command ` # ASP.NET Core image FROM {{runtimeStageFromImage}} -{{InsertTemplate("Dockerfile.envs", ["is-internal": isInternal])}} +{{InsertTemplate("Dockerfile.envs")}} COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/eng/dockerfile-templates/runtime/Dockerfile.envs b/eng/dockerfile-templates/runtime/Dockerfile.envs index 64aa44d5e0..c658e10133 100644 --- a/eng/dockerfile-templates/runtime/Dockerfile.envs +++ b/eng/dockerfile-templates/runtime/Dockerfile.envs @@ -1,15 +1,11 @@ {{ _ ARGS: - is-internal (optional): Whether the Dockerfile is targeting an internal build of the product is-standalone (optional): Whether the ENV instruction should be included ^ set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^ - set isStableBranding to ( - find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-servicing") >= 0 - || find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-rtm") >= 0 - || find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-rc") >= 0 - ) ^ - set runtimeVersion to when(isStableBranding && ARGS["is-internal"], + set runtimeVersion to VARIABLES[cat("runtime|", dotnetVersion, "|build-version")] ^ + set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^ + set runtimeVersion to when(isStableBranding, VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], VARIABLES[cat("runtime|", dotnetVersion, "|build-version")]) diff --git a/eng/dockerfile-templates/runtime/Dockerfile.linux b/eng/dockerfile-templates/runtime/Dockerfile.linux index a24ad9e90b..319dc58175 100644 --- a/eng/dockerfile-templates/runtime/Dockerfile.linux +++ b/eng/dockerfile-templates/runtime/Dockerfile.linux @@ -63,10 +63,7 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image FROM {{runtimeDepsBaseTag}} -{{InsertTemplate("Dockerfile.envs", [ - "is-internal": isInternal, - "is-standalone": "true" -])}} +{{InsertTemplate("Dockerfile.envs", ["is-standalone": "true"])}} {{ if isDistroless: COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/eng/dockerfile-templates/runtime/Dockerfile.windows b/eng/dockerfile-templates/runtime/Dockerfile.windows index ae4c54803a..d36a2ea680 100644 --- a/eng/dockerfile-templates/runtime/Dockerfile.windows +++ b/eng/dockerfile-templates/runtime/Dockerfile.windows @@ -36,7 +36,7 @@ RUN powershell -Command ` FROM {{runtimeStageFromImage}} {{InsertTemplate("../Dockerfile.common-dotnet-envs")}} ` - {{InsertTemplate("Dockerfile.envs", ["is-internal": isInternal], " ")}} + {{InsertTemplate("Dockerfile.envs", [], " ")}} {{InsertTemplate("../Dockerfile.windows.set-path", [ "path": "C:\Program Files\dotnet"])}} diff --git a/eng/dockerfile-templates/sdk/Dockerfile.envs b/eng/dockerfile-templates/sdk/Dockerfile.envs index aef2dc7c30..d730fe0e31 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.envs +++ b/eng/dockerfile-templates/sdk/Dockerfile.envs @@ -1,15 +1,12 @@ {{ _ ARGS: - is-internal (optional): Whether the Dockerfile is targeting an internal build of the product include-powershell-vars (optional): Whether PowerShell will be installed in the image ^ set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^ - set isStableBranding to ( - find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-servicing") >= 0 - || find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-rtm") >= 0 - || find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-rc") >= 0 - ) ^ - set sdkVersion to when(isStableBranding && ARGS["is-internal"], + set buildVersion to VARIABLES[cat("sdk|", dotnetVersion, "|build-version")] ^ + set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^ + + set sdkVersion to when(isStableBranding, VARIABLES[cat("sdk|", dotnetVersion, "|product-version")], VARIABLES[cat("sdk|", dotnetVersion, "|build-version")]) ^ set isAlpine to find(OS_VERSION, "alpine") >= 0 ^ diff --git a/eng/dockerfile-templates/sdk/Dockerfile.linux b/eng/dockerfile-templates/sdk/Dockerfile.linux index ebb0730a3e..f3f338cc84 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.linux +++ b/eng/dockerfile-templates/sdk/Dockerfile.linux @@ -92,7 +92,7 @@ RUN {{InsertTemplate("../Dockerfile.download-dotnet", [ # .NET SDK image FROM {{baseImageTag}} -{{InsertTemplate("Dockerfile.envs", ["is-internal": isInternal, "include-powershell-vars": includePowerShellVars])}} +{{InsertTemplate("Dockerfile.envs", ["include-powershell-vars": includePowerShellVars])}} RUN {{InsertTemplate("../Dockerfile.linux.install-pkgs", [ diff --git a/eng/dockerfile-templates/sdk/Dockerfile.windows b/eng/dockerfile-templates/sdk/Dockerfile.windows index 64a111ab75..6ee5494d75 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.windows +++ b/eng/dockerfile-templates/sdk/Dockerfile.windows @@ -34,7 +34,7 @@ ARG ACCESSTOKEN # SDK image FROM {{aspnetBaseTag}} -{{InsertTemplate("Dockerfile.envs", ["is-internal": isInternal, "include-powershell-vars": "true"])}} +{{InsertTemplate("Dockerfile.envs", ["include-powershell-vars": "true"])}} {{InsertTemplate("../Dockerfile.windows.set-path", [ "path": paths ])}} diff --git a/eng/update-dependencies/ChiselUpdater.cs b/eng/update-dependencies/ChiselUpdater.cs index 9140dd5177..204b134d7f 100644 --- a/eng/update-dependencies/ChiselUpdater.cs +++ b/eng/update-dependencies/ChiselUpdater.cs @@ -21,19 +21,19 @@ internal static class ChiselUpdater private static readonly string[] s_supportedArchitectures = ["amd64", "arm", "arm64"]; - public static IEnumerable GetUpdaters(string repoRoot) => + public static IEnumerable GetUpdaters(string manifestVersionsFilePath) => s_supportedArchitectures .SelectMany(arch => [ new GitHubReleaseUrlUpdater( - repoRoot: repoRoot, + manifestVersionsFilePath: manifestVersionsFilePath, toolName: ToolName, variableName: GetChiselManifestVariable(ToolName, arch, "url", "latest"), owner: Owner, repo: Repo, assetRegex: GetAssetRegex(arch)), new ChiselReleaseShaUpdater( - repoRoot, + manifestVersionsFilePath, arch), ]); @@ -53,10 +53,10 @@ public static string GetChiselManifestVariable(string product, string arch, stri private static string ToManifestArch(string arch) => arch == "amd64" ? "x64" : arch; private class ChiselReleaseShaUpdater( - string repoRoot, + string manifestVersionsFilePath, string arch) : GitHubReleaseUrlUpdater( - repoRoot, + manifestVersionsFilePath, ChiselUpdater.ToolName, GetChiselManifestVariable("chisel", arch, ShaFunction, "latest"), ChiselUpdater.Owner, diff --git a/eng/update-dependencies/GitHubReleaseUrlUpdater.cs b/eng/update-dependencies/GitHubReleaseUrlUpdater.cs index 133b4cbd7a..ce1d6ccece 100644 --- a/eng/update-dependencies/GitHubReleaseUrlUpdater.cs +++ b/eng/update-dependencies/GitHubReleaseUrlUpdater.cs @@ -11,14 +11,14 @@ namespace Dotnet.Docker; /// Updates to the latest download URL when runtime dependencies are being updated. /// internal class GitHubReleaseUrlUpdater( - string repoRoot, + string manifestVersionsFilePath, string toolName, string variableName, string owner, string repo, Regex assetRegex) : GitHubReleaseUpdaterBase( - repoRoot, + manifestVersionsFilePath, toolName, variableName, owner, diff --git a/eng/update-dependencies/MinGitUpdater.cs b/eng/update-dependencies/MinGitUpdater.cs index 7f69022b17..94dc6045a0 100644 --- a/eng/update-dependencies/MinGitUpdater.cs +++ b/eng/update-dependencies/MinGitUpdater.cs @@ -19,16 +19,16 @@ internal static partial class MinGitUpdater private const string Repo = "git"; - public static IEnumerable GetUpdaters(string repoRoot) => + public static IEnumerable GetUpdaters(string manifestVersionsFilePath) => [ new GitHubReleaseUrlUpdater( - repoRoot: repoRoot, + manifestVersionsFilePath: manifestVersionsFilePath, toolName: ToolName, variableName: GetManifestVariableName("url"), owner: Owner, repo: Repo, assetRegex: UrlRegex), - new MinGitShaUpdater(repoRoot) + new MinGitShaUpdater(manifestVersionsFilePath) ]; public static async Task GetBuildInfoAsync() @@ -42,9 +42,9 @@ public static async Task GetBuildInfoAsync() private static string GetManifestVariableName(string type) => "mingit|latest|x64|" + type; - private class MinGitShaUpdater(string repoRoot) + private class MinGitShaUpdater(string manifestVersionsFilePath) : GitHubReleaseUpdaterBase( - repoRoot, + manifestVersionsFilePath, MinGitUpdater.ToolName, GetManifestVariableName("sha"), MinGitUpdater.Owner, diff --git a/eng/update-dependencies/ProductCommits.cs b/eng/update-dependencies/ProductCommits.cs index 89aefd7921..20e3b2ab27 100644 --- a/eng/update-dependencies/ProductCommits.cs +++ b/eng/update-dependencies/ProductCommits.cs @@ -1,45 +1,44 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Text.Json; using System.Text.RegularExpressions; +using Microsoft.DotNet.ProductConstructionService.Client.Models; namespace Dotnet.Docker; /// -/// Represents the product commit versions for the SDK, runtime, and ASP.NET Core. +/// Represents the product versions for the SDK, runtime, and ASP.NET Core. /// -/// -/// { -/// "runtime": { "commit": "721dc7a2a59416b21fc49447d264009d708d6000", "version": "10.0.0-preview.4.25223.119" }, -/// "aspnetcore": { "commit": "721dc7a2a59416b21fc49447d264009d708d6000", "version": "10.0.0-preview.5.25223.119" }, -/// "windowsdesktop": { "commit": "721dc7a2a59416b21fc49447d264009d708d6000", "version": "10.0.0-preview.5.25222.4" }, -/// "sdk": { "commit": "721dc7a2a59416b21fc49447d264009d708d6000", "version": "10.0.100-preview.5.25223.119" } -/// } -/// -internal partial record ProductCommits( - ProductCommit Sdk, - ProductCommit Runtime, - ProductCommit AspNetCore) +internal partial record ProductVersions( + ProductVersion Sdk, + ProductVersion Runtime, + ProductVersion AspNetCore) { - private static readonly JsonSerializerOptions s_jsonOptions = new() - { - PropertyNameCaseInsensitive = true - }; - - [GeneratedRegex("^Sdk/.*/productCommit-linux-x64.json$")] + // Example: Sdk/10.0.100-rtm.25515.111/productVersion.txt + // Find full lists of assets at https://aka.ms/bar + [GeneratedRegex("^Sdk/.*/productVersion.txt$")] public static partial Regex SdkAssetRegex { get; } - public static ProductCommits FromJson(string json) + [GeneratedRegex("^aspnetcore/Runtime/.*/productVersion.txt$")] + public static partial Regex AspNetCoreAssetRegex { get; } + + [GeneratedRegex("^Runtime/.*/productVersion.txt$")] + public static partial Regex RuntimeAssetRegex { get; } + + public static ProductVersions FromVmrBuildAssets(IEnumerable buildAssets) => + new ProductVersions( + Sdk: GetAssetVersionMatchingRegex(buildAssets, SdkAssetRegex), + Runtime: GetAssetVersionMatchingRegex(buildAssets, RuntimeAssetRegex), + AspNetCore: GetAssetVersionMatchingRegex(buildAssets, AspNetCoreAssetRegex)); + + private static ProductVersion GetAssetVersionMatchingRegex(IEnumerable buildAssets, Regex assetRegex) { - return JsonSerializer.Deserialize(json, s_jsonOptions) + Asset asset = buildAssets.FirstOrDefault(a => assetRegex.IsMatch(a.Name)) ?? throw new InvalidOperationException( - $""" - Could not deserialize product commit versions from content: - {json} - """); + $"Could not find asset matching regex '{assetRegex}' in build assets."); + + return new ProductVersion(asset.Version); } }; -internal record ProductCommit(string Commit, string Version); +internal record struct ProductVersion(string Version); diff --git a/eng/update-dependencies/SpecificCommand.cs b/eng/update-dependencies/SpecificCommand.cs index 26a43734a6..d0d6bce559 100644 --- a/eng/update-dependencies/SpecificCommand.cs +++ b/eng/update-dependencies/SpecificCommand.cs @@ -83,7 +83,7 @@ public override async Task ExecuteAsync(SpecificCommandOptions options) if (toolBuildInfos.Length != 0) { - IEnumerable toolUpdaters = Tools.GetToolUpdaters(repoRoot: Options.RepoRoot); + IEnumerable toolUpdaters = Tools.GetToolUpdaters(manifestFilePath); DependencyUpdateResults toolUpdateResults = UpdateFiles(toolBuildInfos, toolUpdaters); updateResults.Add(toolUpdateResults); } diff --git a/eng/update-dependencies/SyftUpdater.cs b/eng/update-dependencies/SyftUpdater.cs index 170b02df0f..e134ad4956 100644 --- a/eng/update-dependencies/SyftUpdater.cs +++ b/eng/update-dependencies/SyftUpdater.cs @@ -21,6 +21,6 @@ public static async Task GetBuildInfoAsync() => SimpleName: ToolName, Release: await GitHubHelper.GetLatestRelease(Owner, Repo)); - public static IDependencyUpdater GetUpdater(string repoRoot) => - new GitHubReleaseVersionUpdater(repoRoot, ToolName, VariableName, Owner, Repo); + public static IDependencyUpdater GetUpdater(string manifestVersionsFilePath) => + new GitHubReleaseVersionUpdater(manifestVersionsFilePath, ToolName, VariableName, Owner, Repo); } diff --git a/eng/update-dependencies/Tools.cs b/eng/update-dependencies/Tools.cs index 4702f285e7..402dd3db48 100644 --- a/eng/update-dependencies/Tools.cs +++ b/eng/update-dependencies/Tools.cs @@ -1,9 +1,6 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.DotNet.VersionTools.Dependencies; namespace Dotnet.Docker; @@ -28,11 +25,11 @@ public static async Task GetToolBuildInfoAsync(string tool) = _ => throw new ArgumentException($"Unknown tool {tool}", nameof(tool)), }; - public static IEnumerable GetToolUpdaters(string repoRoot) => + public static IEnumerable GetToolUpdaters(string manifestVersionsFilePath) => [ - ..MinGitUpdater.GetUpdaters(repoRoot), - ..ChiselUpdater.GetUpdaters(repoRoot), - RocksToolboxUpdater.GetUpdater(repoRoot), - SyftUpdater.GetUpdater(repoRoot), + ..MinGitUpdater.GetUpdaters(manifestVersionsFilePath), + ..ChiselUpdater.GetUpdaters(manifestVersionsFilePath), + RocksToolboxUpdater.GetUpdater(manifestVersionsFilePath), + SyftUpdater.GetUpdater(manifestVersionsFilePath), ]; } diff --git a/eng/update-dependencies/VmrBuildUpdaterService.cs b/eng/update-dependencies/VmrBuildUpdaterService.cs index 8c36615da9..3be8ddd933 100644 --- a/eng/update-dependencies/VmrBuildUpdaterService.cs +++ b/eng/update-dependencies/VmrBuildUpdaterService.cs @@ -8,12 +8,10 @@ namespace Dotnet.Docker; internal class VmrBuildUpdaterService( - IBuildAssetService buildAssetService, IBasicBarClient barClient, ILogger logger ) : IBuildUpdaterService { - private readonly IBuildAssetService _buildAssetService = buildAssetService; private readonly IBasicBarClient _barClient = barClient; private readonly ILogger _logger = logger; @@ -41,14 +39,9 @@ public async Task UpdateFrom(Build build, CreatePullRequestOptions pullRequ } IEnumerable assets = await _barClient.GetAssetsAsync(buildId: build.Id); + var productVersions = ProductVersions.FromVmrBuildAssets(assets); - Asset productCommitsAsset = assets.FirstOrDefault(a => ProductCommits.SdkAssetRegex.IsMatch(a.Name)) - ?? throw new InvalidOperationException($"Could not find product version commit in assets."); - - string productCommitsJson = await _buildAssetService.GetAssetTextContentsAsync(productCommitsAsset); - ProductCommits productCommits = ProductCommits.FromJson(productCommitsJson); - - Version dockerfileVersion = VersionHelper.ResolveMajorMinorVersion(productCommits.Sdk.Version); + Version dockerfileVersion = VersionHelper.ResolveMajorMinorVersion(productVersions.Sdk.Version); // Run old update-dependencies command using the resolved versions var updateDependencies = new SpecificCommand(); @@ -59,11 +52,11 @@ public async Task UpdateFrom(Build build, CreatePullRequestOptions pullRequ { // "dotnet" version is also required. It sets the "dotnet|*|product-version" // variable which is used for runtime-deps, runtime, and aspnet tags. - { "dotnet", productCommits.Runtime.Version }, - { "runtime", productCommits.Runtime.Version }, - { "aspnet", productCommits.AspNetCore.Version }, - { "aspnet-composite", productCommits.AspNetCore.Version }, - { "sdk", productCommits.Sdk.Version }, + { "dotnet", productVersions.Runtime.Version }, + { "runtime", productVersions.Runtime.Version }, + { "aspnet", productVersions.AspNetCore.Version }, + { "aspnet-composite", productVersions.AspNetCore.Version }, + { "sdk", productVersions.Sdk.Version }, }, }; diff --git a/eng/update-dependencies/update-dependencies.csproj b/eng/update-dependencies/update-dependencies.csproj index 4240608e06..cef03e1840 100644 --- a/eng/update-dependencies/update-dependencies.csproj +++ b/eng/update-dependencies/update-dependencies.csproj @@ -31,5 +31,10 @@ + + + + + diff --git a/manifest.json b/manifest.json index bc455747e2..eee074190a 100644 --- a/manifest.json +++ b/manifest.json @@ -1002,8 +1002,7 @@ "$(dotnet|9.0|fixed-tag)-bookworm-slim": {}, "$(dotnet|9.0|minor-tag)-bookworm-slim": {}, "$(dotnet|9.0|fixed-tag)": {}, - "$(dotnet|9.0|minor-tag)": {}, - "latest": {} + "$(dotnet|9.0|minor-tag)": {} }, "platforms": [ { @@ -1632,7 +1631,8 @@ "$(dotnet|10.0|fixed-tag)-noble": {}, "$(dotnet|10.0|minor-tag)-noble": {}, "$(dotnet|10.0|fixed-tag)": {}, - "$(dotnet|10.0|minor-tag)": {} + "$(dotnet|10.0|minor-tag)": {}, + "latest": {} }, "platforms": [ { @@ -3094,8 +3094,7 @@ "$(dotnet|9.0|fixed-tag)-bookworm-slim": {}, "$(dotnet|9.0|minor-tag)-bookworm-slim": {}, "$(dotnet|9.0|fixed-tag)": {}, - "$(dotnet|9.0|minor-tag)": {}, - "latest": {} + "$(dotnet|9.0|minor-tag)": {} }, "platforms": [ { @@ -3739,7 +3738,8 @@ "$(dotnet|10.0|fixed-tag)-noble": {}, "$(dotnet|10.0|minor-tag)-noble": {}, "$(dotnet|10.0|fixed-tag)": {}, - "$(dotnet|10.0|minor-tag)": {} + "$(dotnet|10.0|minor-tag)": {}, + "latest": {} }, "platforms": [ { @@ -5828,8 +5828,7 @@ "$(dotnet|9.0|fixed-tag)-bookworm-slim": {}, "$(dotnet|9.0|minor-tag)-bookworm-slim": {}, "$(dotnet|9.0|fixed-tag)": {}, - "$(dotnet|9.0|minor-tag)": {}, - "latest": {} + "$(dotnet|9.0|minor-tag)": {} }, "platforms": [ { @@ -6855,7 +6854,8 @@ "$(dotnet|10.0|fixed-tag)-noble": {}, "$(dotnet|10.0|minor-tag)-noble": {}, "$(dotnet|10.0|fixed-tag)": {}, - "$(dotnet|10.0|minor-tag)": {} + "$(dotnet|10.0|minor-tag)": {}, + "latest": {} }, "platforms": [ { @@ -8164,8 +8164,7 @@ "$(sdk|9.0|fixed-tag)-bookworm-slim": {}, "$(sdk|9.0|minor-tag)-bookworm-slim": {}, "$(sdk|9.0|fixed-tag)": {}, - "$(sdk|9.0|minor-tag)": {}, - "latest": {} + "$(sdk|9.0|minor-tag)": {} }, "platforms": [ { @@ -8524,7 +8523,8 @@ "$(sdk|10.0|fixed-tag)-noble": {}, "$(sdk|10.0|minor-tag)-noble": {}, "$(sdk|10.0|fixed-tag)": {}, - "$(sdk|10.0|minor-tag)": {} + "$(sdk|10.0|minor-tag)": {}, + "latest": {} }, "platforms": [ { diff --git a/manifest.versions.json b/manifest.versions.json index cdb4ed6ae8..c1d336293d 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -26,7 +26,7 @@ "aspnet|8.0|build-version": "8.0.21", "aspnet-composite|8.0|build-version": "$(aspnet|8.0|build-version)", - "aspnet|10.0|build-version": "10.0.0-rc.2.25502.107", + "aspnet|10.0|build-version": "10.0.0-rtm.25523.113", "aspnet-composite|10.0|build-version": "$(aspnet|10.0|build-version)", "aspnet|9.0|build-version": "9.0.10", @@ -77,12 +77,12 @@ "dotnet|9.0|base-url|checksums|nightly": "$(dotnet|9.0|base-url|nightly)", "dotnet|9.0|aggregate-checksums": "/checksums/$(dotnet|9.0|product-version)-sha.txt", - "dotnet|10.0|product-version": "10.0.0-rc.2", + "dotnet|10.0|product-version": "10.0.0", "dotnet|10.0|fixed-tag": "$(dotnet|10.0|product-version)", "dotnet|10.0|minor-tag": "10.0", - "dotnet|10.0|base-url|main": "$(base-url|public|preview|main)", + "dotnet|10.0|base-url|main": "$(base-url|public|preview|nightly)", "dotnet|10.0|base-url|nightly": "$(base-url|public|preview|nightly)", - "dotnet|10.0|base-url|checksums|main": "$(dotnet|10.0|base-url|main)", + "dotnet|10.0|base-url|checksums|main": "$(base-url|public-checksums|preview|nightly)", "dotnet|10.0|base-url|checksums|nightly": "$(base-url|public-checksums|preview|nightly)", "libicu|bookworm": 72, @@ -197,7 +197,7 @@ "runtime|8.0|build-version": "8.0.21", "runtime|9.0|build-version": "9.0.10", - "runtime|10.0|build-version": "10.0.0-rc.2.25502.107", + "runtime|10.0|build-version": "10.0.0-rtm.25523.113", "sdk|8.0|build-version": "8.0.415", "sdk|8.0|product-version": "8.0.415", @@ -217,11 +217,11 @@ "sdk|9.0|fixed-tag": "$(sdk|9.0|product-version)", "sdk|9.0|minor-tag": "$(dotnet|9.0|minor-tag)", - "sdk|10.0|build-version": "10.0.100-rc.2.25502.107", - "sdk|10.0|product-version": "10.0.100-rc.2", - "sdk|10.0|base-url|main": "$(dotnet|10.0|base-url|main)", + "sdk|10.0|build-version": "10.0.100-rtm.25523.113", + "sdk|10.0|product-version": "10.0.100", + "sdk|10.0|base-url|main": "$(dotnet|10.0|base-url|nightly)", "sdk|10.0|base-url|nightly": "$(dotnet|10.0|base-url|nightly)", - "sdk|10.0|base-url|checksums|main": "$(sdk|10.0|base-url|main)", + "sdk|10.0|base-url|checksums|main": "$(dotnet|10.0|base-url|checksums|nightly)", "sdk|10.0|base-url|checksums|nightly": "$(dotnet|10.0|base-url|checksums|nightly)", "sdk|10.0|fixed-tag": "$(sdk|10.0|product-version)", "sdk|10.0|minor-tag": "$(dotnet|10.0|minor-tag)", diff --git a/src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile b/src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile index f6bfc3d1e1..8e4e5115ff 100644 --- a/src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile +++ b/src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-amd64 AS installer +FROM $REPO:10.0.0-alpine3.22-amd64 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ @@ -17,13 +18,13 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-alpine3.22-amd64 +FROM $REPO:10.0.0-alpine3.22-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile index 589a7cc189..31932748cd 100644 --- a/src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile +++ b/src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm32v7 AS installer +FROM $REPO:10.0.0-alpine3.22-arm32v7 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ @@ -17,13 +18,13 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm32v7 +FROM $REPO:10.0.0-alpine3.22-arm32v7 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile index f971035c0b..75f54e9d12 100644 --- a/src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile +++ b/src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm64v8 AS installer +FROM $REPO:10.0.0-alpine3.22-arm64v8 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ @@ -17,13 +18,13 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm64v8 +FROM $REPO:10.0.0-alpine3.22-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/10.0/alpine3.22/amd64/Dockerfile b/src/aspnet/10.0/alpine3.22/amd64/Dockerfile index a2b31127d6..d593f2dd9e 100644 --- a/src/aspnet/10.0/alpine3.22/amd64/Dockerfile +++ b/src/aspnet/10.0/alpine3.22/amd64/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-amd64 AS installer +FROM $REPO:10.0.0-alpine3.22-amd64 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-alpine3.22-amd64 +FROM $REPO:10.0.0-alpine3.22-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile b/src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile index 961796cc79..4479f9d58d 100644 --- a/src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile +++ b/src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm32v7 AS installer +FROM $REPO:10.0.0-alpine3.22-arm32v7 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm32v7 +FROM $REPO:10.0.0-alpine3.22-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile b/src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile index 609f9ce529..5582329d85 100644 --- a/src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile +++ b/src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm64v8 AS installer +FROM $REPO:10.0.0-alpine3.22-arm64v8 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm64v8 +FROM $REPO:10.0.0-alpine3.22-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile index 7d7528a5db..da4018d752 100644 --- a/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -26,13 +27,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-extra-amd64 +FROM $REPO:10.0.0-azurelinux3.0-distroless-extra-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile index 5e74c452db..43ac61518d 100644 --- a/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -26,13 +27,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-extra-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-distroless-extra-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile index 2617c5c308..55b048658a 100644 --- a/src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -26,13 +27,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-amd64 +FROM $REPO:10.0.0-azurelinux3.0-distroless-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile index d4d18714b8..ab77b0da04 100644 --- a/src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -26,13 +27,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-distroless-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index 804231d73b..8dc96311b6 100644 --- a/src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -23,9 +24,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-extra-amd64 +FROM $REPO:10.0.0-azurelinux3.0-distroless-extra-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index 12fef6bcef..68d4ef0ef0 100644 --- a/src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -23,9 +24,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-extra-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-distroless-extra-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile index 7a22268433..da2029ba46 100644 --- a/src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -23,9 +24,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-amd64 +FROM $REPO:10.0.0-azurelinux3.0-distroless-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 268d7b3748..ca4a930887 100644 --- a/src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -23,9 +24,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-distroless-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile index 93a09291ee..d289d9241f 100644 --- a/src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0/amd64/Dockerfile @@ -1,18 +1,19 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-amd64 AS installer +FROM $REPO:10.0.0-azurelinux3.0-amd64 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -21,9 +22,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-amd64 +FROM $REPO:10.0.0-azurelinux3.0-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile index 62af32320d..55b8c6d93a 100644 --- a/src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/aspnet/10.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,18 +1,19 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-arm64v8 AS installer +FROM $REPO:10.0.0-azurelinux3.0-arm64v8 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -21,9 +22,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile index 198339d61f..867105311e 100644 --- a/src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile +++ b/src/aspnet/10.0/nanoserver-ltsc2022/amd64/Dockerfile @@ -10,12 +10,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $aspnetcore_version = '10.0.0-rc.2.25502.107'; ` + $aspnetcore_version = '10.0.0'; ` + $aspnetcore_build_version = $aspnetcore_version + '-rtm.25523.113'; ` $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; ` + $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $aspnetcore_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -30,9 +31,9 @@ RUN powershell -Command ` # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-nanoserver-ltsc2022 +FROM $REPO:10.0.0-nanoserver-ltsc2022 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile index 0b4b6108c1..1509718462 100644 --- a/src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/aspnet/10.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -10,12 +10,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $aspnetcore_version = '10.0.0-rc.2.25502.107'; ` + $aspnetcore_version = '10.0.0'; ` + $aspnetcore_build_version = $aspnetcore_version + '-rtm.25523.113'; ` $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; ` + $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $aspnetcore_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -30,9 +31,9 @@ RUN powershell -Command ` # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-nanoserver-ltsc2025 +FROM $REPO:10.0.0-nanoserver-ltsc2025 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile index 47d30e4241..610808d8d9 100644 --- a/src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-composite-extra/amd64/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-amd64 +FROM $REPO:10.0.0-noble-chiseled-extra-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile index cedde3e94a..39e7007b0c 100644 --- a/src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-arm32v7 +FROM $REPO:10.0.0-noble-chiseled-extra-arm32v7 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile index df6570dd6c..6b9173d9b1 100644 --- a/src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-composite-extra/arm64v8/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-arm64v8 +FROM $REPO:10.0.0-noble-chiseled-extra-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile index 843bb9e486..057a3573d1 100644 --- a/src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-composite/amd64/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-noble-chiseled-amd64 +FROM $REPO:10.0.0-noble-chiseled-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile index 83cfbd5ccc..003c71416a 100644 --- a/src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-composite/arm32v7/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-noble-chiseled-arm32v7 +FROM $REPO:10.0.0-noble-chiseled-arm32v7 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile index 9c47ca29d6..9299842814 100644 --- a/src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-composite/arm64v8/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,13 +21,13 @@ RUN mkdir /dotnet-symlink \ # ASP.NET Composite Image -FROM $REPO:10.0.0-rc.2-noble-chiseled-arm64v8 +FROM $REPO:10.0.0-noble-chiseled-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 \ + DOTNET_VERSION=10.0.0 \ # ASP.NET Core version - ASPNET_VERSION=10.0.0-rc.2.25502.107 + ASPNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile b/src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile index 7ede4144a8..70dd66ebda 100644 --- a/src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-extra/amd64/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM amd64/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-amd64 +FROM $REPO:10.0.0-noble-chiseled-extra-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile index 8ac70fa104..2fa472d7c5 100644 --- a/src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-arm32v7 +FROM $REPO:10.0.0-noble-chiseled-extra-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile index ca0e1f4e51..15d141ec8a 100644 --- a/src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm64v8/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-arm64v8 +FROM $REPO:10.0.0-noble-chiseled-extra-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/noble-chiseled/amd64/Dockerfile b/src/aspnet/10.0/noble-chiseled/amd64/Dockerfile index 81df413494..4fdc837602 100644 --- a/src/aspnet/10.0/noble-chiseled/amd64/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled/amd64/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM amd64/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-chiseled-amd64 +FROM $REPO:10.0.0-noble-chiseled-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile b/src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile index ba859d16a3..9952bc2f2c 100644 --- a/src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled/arm32v7/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-chiseled-arm32v7 +FROM $REPO:10.0.0-noble-chiseled-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile b/src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile index 274fac1fc7..f84ab12a5b 100644 --- a/src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/aspnet/10.0/noble-chiseled/arm64v8/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm64v8/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-chiseled-arm64v8 +FROM $REPO:10.0.0-noble-chiseled-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/noble/amd64/Dockerfile b/src/aspnet/10.0/noble/amd64/Dockerfile index b14b2c7d63..7c0836d00a 100644 --- a/src/aspnet/10.0/noble/amd64/Dockerfile +++ b/src/aspnet/10.0/noble/amd64/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM amd64/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-amd64 +FROM $REPO:10.0.0-noble-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/noble/arm32v7/Dockerfile b/src/aspnet/10.0/noble/arm32v7/Dockerfile index a6c02f9bd4..aea65b782f 100644 --- a/src/aspnet/10.0/noble/arm32v7/Dockerfile +++ b/src/aspnet/10.0/noble/arm32v7/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-arm32v7 +FROM $REPO:10.0.0-noble-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/noble/arm64v8/Dockerfile b/src/aspnet/10.0/noble/arm64v8/Dockerfile index 2e076133f3..63c1291cf0 100644 --- a/src/aspnet/10.0/noble/arm64v8/Dockerfile +++ b/src/aspnet/10.0/noble/arm64v8/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm64v8/buildpack-deps:noble-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ +RUN aspnetcore_version=10.0.0 \ + && aspnetcore_build_version=$aspnetcore_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ @@ -17,9 +18,9 @@ RUN aspnetcore_version=10.0.0-rc.2.25502.107 \ # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-noble-arm64v8 +FROM $REPO:10.0.0-noble-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile index a53fa98c99..00e13df165 100644 --- a/src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile +++ b/src/aspnet/10.0/windowsservercore-ltsc2022/amd64/Dockerfile @@ -10,12 +10,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $aspnetcore_version = '10.0.0-rc.2.25502.107'; ` + $aspnetcore_version = '10.0.0'; ` + $aspnetcore_build_version = $aspnetcore_version + '-rtm.25523.113'; ` $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; ` + $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $aspnetcore_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -30,9 +31,9 @@ RUN powershell -Command ` # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-windowsservercore-ltsc2022 +FROM $REPO:10.0.0-windowsservercore-ltsc2022 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile index 56ee68dc12..58ffca0862 100644 --- a/src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/aspnet/10.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -10,12 +10,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $aspnetcore_version = '10.0.0-rc.2.25502.107'; ` + $aspnetcore_version = '10.0.0'; ` + $aspnetcore_build_version = $aspnetcore_version + '-rtm.25523.113'; ` $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; ` + $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $aspnetcore_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -30,9 +31,9 @@ RUN powershell -Command ` # ASP.NET Core image -FROM $REPO:10.0.0-rc.2-windowsservercore-ltsc2025 +FROM $REPO:10.0.0-windowsservercore-ltsc2025 # ASP.NET Core version -ENV ASPNET_VERSION=10.0.0-rc.2.25502.107 +ENV ASPNET_VERSION=10.0.0 COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile index f6b378a934..00973542c6 100644 --- a/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile +++ b/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile @@ -23,7 +23,7 @@ RUN dotnet_monitor_version=10.0.0-rc.2.25503.6 \ # .NET Monitor Base image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-amd64 +FROM $REPO:10.0.0-azurelinux3.0-distroless-amd64 WORKDIR /app COPY --from=installer /app . diff --git a/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile index 475eba5eaf..6d0c071474 100644 --- a/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile +++ b/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile @@ -23,7 +23,7 @@ RUN dotnet_monitor_version=10.0.0-rc.2.25503.6 \ # .NET Monitor Base image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-distroless-arm64v8 WORKDIR /app COPY --from=installer /app . diff --git a/src/runtime/10.0/alpine3.22/amd64/Dockerfile b/src/runtime/10.0/alpine3.22/amd64/Dockerfile index cdc678e249..891fdf6725 100644 --- a/src/runtime/10.0/alpine3.22/amd64/Dockerfile +++ b/src/runtime/10.0/alpine3.22/amd64/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-amd64 AS installer +FROM $REPO:10.0.0-alpine3.22-amd64 AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ @@ -17,10 +18,10 @@ RUN dotnet_version=10.0.0-rc.2.25502.107 \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-alpine3.22-amd64 +FROM $REPO:10.0.0-alpine3.22-amd64 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/10.0/alpine3.22/arm32v7/Dockerfile b/src/runtime/10.0/alpine3.22/arm32v7/Dockerfile index f3862d1f06..73fb99d0c6 100644 --- a/src/runtime/10.0/alpine3.22/arm32v7/Dockerfile +++ b/src/runtime/10.0/alpine3.22/arm32v7/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm32v7 AS installer +FROM $REPO:10.0.0-alpine3.22-arm32v7 AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ @@ -17,10 +18,10 @@ RUN dotnet_version=10.0.0-rc.2.25502.107 \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm32v7 +FROM $REPO:10.0.0-alpine3.22-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/10.0/alpine3.22/arm64v8/Dockerfile b/src/runtime/10.0/alpine3.22/arm64v8/Dockerfile index a9d6c2d483..57aa465de8 100644 --- a/src/runtime/10.0/alpine3.22/arm64v8/Dockerfile +++ b/src/runtime/10.0/alpine3.22/arm64v8/Dockerfile @@ -1,14 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm64v8 AS installer +FROM $REPO:10.0.0-alpine3.22-arm64v8 AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ @@ -17,10 +18,10 @@ RUN dotnet_version=10.0.0-rc.2.25502.107 \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm64v8 +FROM $REPO:10.0.0-alpine3.22-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index ffecf0f168..da7900e878 100644 --- a/src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -26,10 +27,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-extra-amd64 +FROM $REPO:10.0.0-azurelinux3.0-distroless-extra-amd64 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index 3746c16abd..0240e224ac 100644 --- a/src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -26,10 +27,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-extra-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-distroless-extra-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile index 7d2e50e0a9..bf8a367d8d 100644 --- a/src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -26,10 +27,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-amd64 +FROM $REPO:10.0.0-azurelinux3.0-distroless-amd64 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 4f87ee78ca..e99a071d17 100644 --- a/src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -10,11 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -26,10 +27,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-distroless-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-distroless-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/10.0/azurelinux3.0/amd64/Dockerfile index 2ddb5cd504..14271fd25d 100644 --- a/src/runtime/10.0/azurelinux3.0/amd64/Dockerfile +++ b/src/runtime/10.0/azurelinux3.0/amd64/Dockerfile @@ -1,18 +1,19 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-amd64 AS installer +FROM $REPO:10.0.0-azurelinux3.0-amd64 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ && rm \ @@ -21,10 +22,10 @@ RUN dotnet_version=10.0.0-rc.2.25502.107 \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-amd64 +FROM $REPO:10.0.0-azurelinux3.0-amd64 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile index 3c5198bc82..2f37194e90 100644 --- a/src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,18 +1,19 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-arm64v8 AS installer +FROM $REPO:10.0.0-azurelinux3.0-arm64v8 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ && rm \ @@ -21,10 +22,10 @@ RUN dotnet_version=10.0.0-rc.2.25502.107 \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile index f33766af3d..8595ce49c3 100644 --- a/src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile +++ b/src/runtime/10.0/nanoserver-ltsc2022/amd64/Dockerfile @@ -8,12 +8,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $dotnet_version = '10.0.0-rc.2.25502.107'; ` + $dotnet_version = '10.0.0'; ` + $dotnet_build_version = $dotnet_version + '-rtm.25523.113'; ` $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -36,7 +37,7 @@ ENV ` # Enable detection of running in a container DOTNET_RUNNING_IN_CONTAINER=true ` # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 + DOTNET_VERSION=10.0.0 # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile index 3f62f43714..e6a31c6f26 100644 --- a/src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/runtime/10.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -8,12 +8,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $dotnet_version = '10.0.0-rc.2.25502.107'; ` + $dotnet_version = '10.0.0'; ` + $dotnet_build_version = $dotnet_version + '-rtm.25523.113'; ` $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -36,7 +37,7 @@ ENV ` # Enable detection of running in a container DOTNET_RUNNING_IN_CONTAINER=true ` # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 + DOTNET_VERSION=10.0.0 # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile index 213fa01335..1846a1a9dd 100644 --- a/src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime/10.0/noble-chiseled-extra/amd64/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:noble-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-amd64 +FROM $REPO:10.0.0-noble-chiseled-extra-amd64 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile index 81b508c41d..20804f8087 100644 --- a/src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-arm32v7 +FROM $REPO:10.0.0-noble-chiseled-extra-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile index aae18f96b1..9b1e1e87d4 100644 --- a/src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime/10.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:noble-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-chiseled-extra-arm64v8 +FROM $REPO:10.0.0-noble-chiseled-extra-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/noble-chiseled/amd64/Dockerfile b/src/runtime/10.0/noble-chiseled/amd64/Dockerfile index 3cf55cd5da..3098a7d299 100644 --- a/src/runtime/10.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime/10.0/noble-chiseled/amd64/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:noble-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-chiseled-amd64 +FROM $REPO:10.0.0-noble-chiseled-amd64 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile index d7be58a652..df342c2b05 100644 --- a/src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile +++ b/src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-chiseled-arm32v7 +FROM $REPO:10.0.0-noble-chiseled-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile index 3ada05e504..2b83d42ccf 100644 --- a/src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime/10.0/noble-chiseled/arm64v8/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:noble-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ @@ -20,10 +21,10 @@ RUN mkdir /dotnet-symlink \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-chiseled-arm64v8 +FROM $REPO:10.0.0-noble-chiseled-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/10.0/noble/amd64/Dockerfile b/src/runtime/10.0/noble/amd64/Dockerfile index bc2384730b..53174daea0 100644 --- a/src/runtime/10.0/noble/amd64/Dockerfile +++ b/src/runtime/10.0/noble/amd64/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:noble-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ && rm \ @@ -17,10 +18,10 @@ RUN dotnet_version=10.0.0-rc.2.25502.107 \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-amd64 +FROM $REPO:10.0.0-noble-amd64 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/10.0/noble/arm32v7/Dockerfile b/src/runtime/10.0/noble/arm32v7/Dockerfile index 46c3632b28..79fa4c5207 100644 --- a/src/runtime/10.0/noble/arm32v7/Dockerfile +++ b/src/runtime/10.0/noble/arm32v7/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \ && rm \ @@ -17,10 +18,10 @@ RUN dotnet_version=10.0.0-rc.2.25502.107 \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-arm32v7 +FROM $REPO:10.0.0-noble-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/10.0/noble/arm64v8/Dockerfile b/src/runtime/10.0/noble/arm64v8/Dockerfile index 865895a02a..620a1683b0 100644 --- a/src/runtime/10.0/noble/arm64v8/Dockerfile +++ b/src/runtime/10.0/noble/arm64v8/Dockerfile @@ -4,11 +4,12 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:noble-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=10.0.0-rc.2.25502.107 \ +RUN dotnet_version=10.0.0 \ + && dotnet_build_version=$dotnet_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ && rm \ @@ -17,10 +18,10 @@ RUN dotnet_version=10.0.0-rc.2.25502.107 \ # .NET runtime image -FROM $REPO:10.0.0-rc.2-noble-arm64v8 +FROM $REPO:10.0.0-noble-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=10.0.0-rc.2.25502.107 +ENV DOTNET_VERSION=10.0.0 COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile index b69a2c521f..a526b2c394 100644 --- a/src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile +++ b/src/runtime/10.0/windowsservercore-ltsc2022/amd64/Dockerfile @@ -8,12 +8,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $dotnet_version = '10.0.0-rc.2.25502.107'; ` + $dotnet_version = '10.0.0'; ` + $dotnet_build_version = $dotnet_version + '-rtm.25523.113'; ` $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -36,7 +37,7 @@ ENV ` # Enable detection of running in a container DOTNET_RUNNING_IN_CONTAINER=true ` # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 + DOTNET_VERSION=10.0.0 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" diff --git a/src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile index b39de66cfb..25fdfdc38b 100644 --- a/src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/runtime/10.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -8,12 +8,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $dotnet_version = '10.0.0-rc.2.25502.107'; ` + $dotnet_version = '10.0.0'; ` + $dotnet_build_version = $dotnet_version + '-rtm.25523.113'; ` $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_build_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -36,7 +37,7 @@ ENV ` # Enable detection of running in a container DOTNET_RUNNING_IN_CONTAINER=true ` # .NET Runtime version - DOTNET_VERSION=10.0.0-rc.2.25502.107 + DOTNET_VERSION=10.0.0 RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" diff --git a/src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile b/src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile index 34b15932e1..4f8b733241 100644 --- a/src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile +++ b/src/sdk/10.0/alpine3.22-aot/amd64/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:10.0.100-rc.2-alpine3.22-amd64 +FROM $REPO:10.0.100-alpine3.22-amd64 RUN apk add --upgrade --no-cache \ build-base \ diff --git a/src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile b/src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile index 767c160cc8..f3fb2750af 100644 --- a/src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile +++ b/src/sdk/10.0/alpine3.22-aot/arm64v8/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:10.0.100-rc.2-alpine3.22-arm64v8 +FROM $REPO:10.0.100-alpine3.22-arm64v8 RUN apk add --upgrade --no-cache \ build-base \ diff --git a/src/sdk/10.0/alpine3.22/amd64/Dockerfile b/src/sdk/10.0/alpine3.22/amd64/Dockerfile index 1862934a9a..ff613e2381 100644 --- a/src/sdk/10.0/alpine3.22/amd64/Dockerfile +++ b/src/sdk/10.0/alpine3.22/amd64/Dockerfile @@ -1,13 +1,14 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-amd64 AS installer +FROM $REPO:10.0.0-alpine3.22-amd64 AS installer # Install .NET SDK -RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ +RUN dotnet_sdk_version=10.0.100 \ + && dotnet_sdk_build_version=$dotnet_sdk_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ @@ -16,7 +17,7 @@ RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ # .NET SDK image -FROM $REPO:10.0.0-rc.2-alpine3.22-amd64 +FROM $REPO:10.0.0-alpine3.22-amd64 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 \ + DOTNET_SDK_VERSION=10.0.100 \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/10.0/alpine3.22/arm32v7/Dockerfile b/src/sdk/10.0/alpine3.22/arm32v7/Dockerfile index e926db42dc..b4c8f490fe 100644 --- a/src/sdk/10.0/alpine3.22/arm32v7/Dockerfile +++ b/src/sdk/10.0/alpine3.22/arm32v7/Dockerfile @@ -1,13 +1,14 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm32v7 AS installer +FROM $REPO:10.0.0-alpine3.22-arm32v7 AS installer # Install .NET SDK -RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ +RUN dotnet_sdk_version=10.0.100 \ + && dotnet_sdk_build_version=$dotnet_sdk_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ @@ -16,7 +17,7 @@ RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ # .NET SDK image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm32v7 +FROM $REPO:10.0.0-alpine3.22-arm32v7 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 \ + DOTNET_SDK_VERSION=10.0.100 \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/10.0/alpine3.22/arm64v8/Dockerfile b/src/sdk/10.0/alpine3.22/arm64v8/Dockerfile index 171f776414..fdaa2cdce2 100644 --- a/src/sdk/10.0/alpine3.22/arm64v8/Dockerfile +++ b/src/sdk/10.0/alpine3.22/arm64v8/Dockerfile @@ -1,13 +1,14 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm64v8 AS installer +FROM $REPO:10.0.0-alpine3.22-arm64v8 AS installer # Install .NET SDK -RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ +RUN dotnet_sdk_version=10.0.100 \ + && dotnet_sdk_build_version=$dotnet_sdk_version-rtm.25523.113 \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ @@ -16,7 +17,7 @@ RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ # .NET SDK image -FROM $REPO:10.0.0-rc.2-alpine3.22-arm64v8 +FROM $REPO:10.0.0-alpine3.22-arm64v8 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 \ + DOTNET_SDK_VERSION=10.0.100 \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile b/src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile index e391ff1751..b156fc8fa1 100644 --- a/src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile +++ b/src/sdk/10.0/azurelinux3.0-aot/amd64/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:10.0.100-rc.2-azurelinux3.0-amd64 +FROM $REPO:10.0.100-azurelinux3.0-amd64 RUN tdnf install -y \ build-essential \ diff --git a/src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile b/src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile index 30a564fb70..aff01510b9 100644 --- a/src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile +++ b/src/sdk/10.0/azurelinux3.0-aot/arm64v8/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:10.0.100-rc.2-azurelinux3.0-arm64v8 +FROM $REPO:10.0.100-azurelinux3.0-arm64v8 RUN tdnf install -y \ build-essential \ diff --git a/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile index 7fdfb489a6..2bf4091d96 100644 --- a/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile +++ b/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile @@ -1,17 +1,18 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-amd64 AS installer +FROM $REPO:10.0.0-azurelinux3.0-amd64 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Install .NET SDK -RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ +RUN dotnet_sdk_version=10.0.100 \ + && dotnet_sdk_build_version=$dotnet_sdk_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ @@ -20,7 +21,7 @@ RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ # .NET SDK image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-amd64 +FROM $REPO:10.0.0-azurelinux3.0-amd64 ENV \ # Do not generate certificate @@ -28,7 +29,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 \ + DOTNET_SDK_VERSION=10.0.100 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile index 894420af22..908299116c 100644 --- a/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,17 +1,18 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-arm64v8 AS installer +FROM $REPO:10.0.0-azurelinux3.0-arm64v8 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Install .NET SDK -RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ +RUN dotnet_sdk_version=10.0.100 \ + && dotnet_sdk_build_version=$dotnet_sdk_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ @@ -20,7 +21,7 @@ RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ # .NET SDK image -FROM $REPO:10.0.0-rc.2-azurelinux3.0-arm64v8 +FROM $REPO:10.0.0-azurelinux3.0-arm64v8 ENV \ # Do not generate certificate @@ -28,7 +29,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 \ + DOTNET_SDK_VERSION=10.0.100 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile index e84c089b12..8f07d57a33 100644 --- a/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile +++ b/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile @@ -25,12 +25,13 @@ RUN powershell -Command " ` $ProgressPreference = 'SilentlyContinue'; ` ` # Retrieve .NET SDK - $dotnet_sdk_version = '10.0.100-rc.2.25502.107'; ` + $dotnet_sdk_version = '10.0.100'; ` + $dotnet_sdk_build_version = $dotnet_sdk_version + '-rtm.25523.113'; ` $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -64,7 +65,7 @@ RUN powershell -Command " ` # SDK image -FROM $REPO:10.0.0-rc.2-nanoserver-ltsc2022 +FROM $REPO:10.0.0-nanoserver-ltsc2022 ENV ` # Do not generate certificate @@ -72,7 +73,7 @@ ENV ` # Do not show first run text DOTNET_NOLOGO=true ` # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 ` + DOTNET_SDK_VERSION=10.0.100 ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile index 0d9d8341d7..fe2e53598b 100644 --- a/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -25,12 +25,13 @@ RUN powershell -Command " ` $ProgressPreference = 'SilentlyContinue'; ` ` # Retrieve .NET SDK - $dotnet_sdk_version = '10.0.100-rc.2.25502.107'; ` + $dotnet_sdk_version = '10.0.100'; ` + $dotnet_sdk_build_version = $dotnet_sdk_version + '-rtm.25523.113'; ` $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -64,7 +65,7 @@ RUN powershell -Command " ` # SDK image -FROM $REPO:10.0.0-rc.2-nanoserver-ltsc2025 +FROM $REPO:10.0.0-nanoserver-ltsc2025 ENV ` # Do not generate certificate @@ -72,7 +73,7 @@ ENV ` # Do not show first run text DOTNET_NOLOGO=true ` # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 ` + DOTNET_SDK_VERSION=10.0.100 ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/10.0/noble-aot/amd64/Dockerfile b/src/sdk/10.0/noble-aot/amd64/Dockerfile index df4b02643c..38e59c903f 100644 --- a/src/sdk/10.0/noble-aot/amd64/Dockerfile +++ b/src/sdk/10.0/noble-aot/amd64/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:10.0.100-rc.2-noble-amd64 +FROM $REPO:10.0.100-noble-amd64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/10.0/noble-aot/arm64v8/Dockerfile b/src/sdk/10.0/noble-aot/arm64v8/Dockerfile index 184c66aa83..a7bde45cf8 100644 --- a/src/sdk/10.0/noble-aot/arm64v8/Dockerfile +++ b/src/sdk/10.0/noble-aot/arm64v8/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:10.0.100-rc.2-noble-arm64v8 +FROM $REPO:10.0.100-noble-arm64v8 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/10.0/noble/amd64/Dockerfile b/src/sdk/10.0/noble/amd64/Dockerfile index 4411c86e14..c056dbcaeb 100644 --- a/src/sdk/10.0/noble/amd64/Dockerfile +++ b/src/sdk/10.0/noble/amd64/Dockerfile @@ -3,11 +3,12 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet FROM amd64/buildpack-deps:noble-curl AS installer # Install .NET SDK -RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ +RUN dotnet_sdk_version=10.0.100 \ + && dotnet_sdk_build_version=$dotnet_sdk_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ @@ -16,7 +17,7 @@ RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ # .NET SDK image -FROM $REPO:10.0.0-rc.2-noble-amd64 +FROM $REPO:10.0.0-noble-amd64 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 \ + DOTNET_SDK_VERSION=10.0.100 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/10.0/noble/arm32v7/Dockerfile b/src/sdk/10.0/noble/arm32v7/Dockerfile index fd1516c295..d71031d93d 100644 --- a/src/sdk/10.0/noble/arm32v7/Dockerfile +++ b/src/sdk/10.0/noble/arm32v7/Dockerfile @@ -3,11 +3,12 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet FROM arm32v7/buildpack-deps:jammy-curl AS installer # Install .NET SDK -RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ +RUN dotnet_sdk_version=10.0.100 \ + && dotnet_sdk_build_version=$dotnet_sdk_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ @@ -16,7 +17,7 @@ RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ # .NET SDK image -FROM $REPO:10.0.0-rc.2-noble-arm32v7 +FROM $REPO:10.0.0-noble-arm32v7 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 \ + DOTNET_SDK_VERSION=10.0.100 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/10.0/noble/arm64v8/Dockerfile b/src/sdk/10.0/noble/arm64v8/Dockerfile index 0070ef0633..0ec6cb9573 100644 --- a/src/sdk/10.0/noble/arm64v8/Dockerfile +++ b/src/sdk/10.0/noble/arm64v8/Dockerfile @@ -3,11 +3,12 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet FROM arm64v8/buildpack-deps:noble-curl AS installer # Install .NET SDK -RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ +RUN dotnet_sdk_version=10.0.100 \ + && dotnet_sdk_build_version=$dotnet_sdk_version-rtm.25523.113 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ @@ -16,7 +17,7 @@ RUN dotnet_sdk_version=10.0.100-rc.2.25502.107 \ # .NET SDK image -FROM $REPO:10.0.0-rc.2-noble-arm64v8 +FROM $REPO:10.0.0-noble-arm64v8 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 \ + DOTNET_SDK_VERSION=10.0.100 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile index ce354f43f7..a13efa5a92 100644 --- a/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile +++ b/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile @@ -25,12 +25,13 @@ RUN powershell -Command " ` $ProgressPreference = 'SilentlyContinue'; ` ` # Retrieve .NET SDK - $dotnet_sdk_version = '10.0.100-rc.2.25502.107'; ` + $dotnet_sdk_version = '10.0.100'; ` + $dotnet_sdk_build_version = $dotnet_sdk_version + '-rtm.25523.113'; ` $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -64,7 +65,7 @@ RUN powershell -Command " ` # SDK image -FROM $REPO:10.0.0-rc.2-windowsservercore-ltsc2022 +FROM $REPO:10.0.0-windowsservercore-ltsc2022 ENV ` # Do not generate certificate @@ -72,7 +73,7 @@ ENV ` # Do not show first run text DOTNET_NOLOGO=true ` # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 ` + DOTNET_SDK_VERSION=10.0.100 ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile index 27e9075f61..a2af731da9 100644 --- a/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -25,12 +25,13 @@ RUN powershell -Command " ` $ProgressPreference = 'SilentlyContinue'; ` ` # Retrieve .NET SDK - $dotnet_sdk_version = '10.0.100-rc.2.25502.107'; ` + $dotnet_sdk_version = '10.0.100'; ` + $dotnet_sdk_build_version = $dotnet_sdk_version + '-rtm.25523.113'; ` $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_build_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -64,7 +65,7 @@ RUN powershell -Command " ` # SDK image -FROM $REPO:10.0.0-rc.2-windowsservercore-ltsc2025 +FROM $REPO:10.0.0-windowsservercore-ltsc2025 ENV ` # Do not generate certificate @@ -72,7 +73,7 @@ ENV ` # Do not show first run text DOTNET_NOLOGO=true ` # SDK version - DOTNET_SDK_VERSION=10.0.100-rc.2.25502.107 ` + DOTNET_SDK_VERSION=10.0.100 ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-amd64-Dockerfile.approved.txt index 57cc13e47c..9068f85424 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt index fecc264cad..65f34758e6 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt index 8b582b3053..86cadbe030 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-amd64-Dockerfile.approved.txt index 934bed0d0b..1b4ba481c4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt index d4f7e29776..46a8ba7239 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt index 971ff2df28..1f4f83d7f5 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-alpine3.22-composite-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt index d5dfad3088..c7b8830d9b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -11,9 +11,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index c44ba14e88..a4edd6d68b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -11,9 +11,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt index 7903185595..dbb90ffad3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt index 5bf3e8670b..a7a7858828 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt index a1242a0b86..77932f0870 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt index a2b9dca9fa..f100092cd1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt index 8342b60432..90a60d84e1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt index c3128df0d3..5754d8469b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt index 9e473c85ca..1d4e0dbdfc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt index 55647a6beb..0dd7271377 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt index 055b3dfa1d..744463fbf3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt @@ -13,6 +13,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $aspnetcore_version = '0.0.0'; ` + $aspnetcore_build_version = 0.0.0; ` $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` @@ -20,8 +21,8 @@ RUN powershell -Command ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index c2cb3ef7d3..e2ff8f8633 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -13,6 +13,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $aspnetcore_version = '0.0.0'; ` + $aspnetcore_build_version = 0.0.0; ` $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` @@ -20,8 +21,8 @@ RUN powershell -Command ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-amd64-Dockerfile.approved.txt index 8dc91c999a..b68c8d2281 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-arm32v7-Dockerfile.approved.txt index 7a3ff00ae2..813eddda2f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-arm64v8-Dockerfile.approved.txt index d28739a32d..296b9d430f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-amd64-Dockerfile.approved.txt index d258da52bc..348732dddb 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt index c7f6fb134a..22513254a6 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt index 2c44a5970a..0b2eb02446 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt index b3c5467a81..a93a9ae370 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt index d47198e5fd..12493dcb5a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt index c3ae522b01..c85d083e0b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt index 63ffb52700..5c6a6848ce 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt index 0003363e50..7b56626ddf 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt index 96f71a926a..6cd0494495 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt index e699dbf047..53620c2b3f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt index 3abf5598f7..3e0b5f4fe8 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt index b0c49aaffe..aeba0be286 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt index 7911975006..8f3b3ef93d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt @@ -13,6 +13,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $aspnetcore_version = '0.0.0'; ` + $aspnetcore_build_version = 0.0.0; ` $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` @@ -20,8 +21,8 @@ RUN powershell -Command ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index 0c0fc95cdf..651dc2dbf0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -13,6 +13,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $aspnetcore_version = '0.0.0'; ` + $aspnetcore_build_version = 0.0.0; ` $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` @@ -20,8 +21,8 @@ RUN powershell -Command ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$aspnetcore_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-amd64-Dockerfile.approved.txt index 32b28e65af..5de9d41bc9 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt index 531f790cac..231c812ac3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt index 3bb298e1ca..a5fcd904ae 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt index 1661f6e865..011eddd49e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -11,9 +11,10 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index 561daf3a1a..8f772fda4c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -11,9 +11,10 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt index c0eb0dfd5b..de3f4ef01a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt index 64f97a946d..442fe49870 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt index 7b89b776aa..1bb59a810a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt index 660a144524..33c606ceb2 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -13,9 +13,10 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt index 9011152344..59d25f8299 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt @@ -11,6 +11,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $dotnet_version = '0.0.0'; ` + $dotnet_build_version = 0.0.0; ` $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` @@ -18,8 +19,8 @@ RUN powershell -Command ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index d4f1527b5a..db20a91d31 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -11,6 +11,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $dotnet_version = '0.0.0'; ` + $dotnet_build_version = 0.0.0; ` $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` @@ -18,8 +19,8 @@ RUN powershell -Command ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-amd64-Dockerfile.approved.txt index dc2de68df3..03acf17fd1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-arm32v7-Dockerfile.approved.txt index 72897c32a4..527e145375 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-arm64v8-Dockerfile.approved.txt index 8984eaa268..91fd8cd40e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-amd64-Dockerfile.approved.txt index fc6f1f23d2..e369a0ead2 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt index 57bd96f297..c932546204 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt index d115a80a78..d1b014623c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt index b36195ea03..96c7f21e28 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-amd64-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt index d2e5f24442..a2ea289ff6 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt index 4b01581877..0112418c3d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-noble-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -7,9 +7,10 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt index 064d0a1b00..ff30c9bca1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt @@ -11,6 +11,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $dotnet_version = '0.0.0'; ` + $dotnet_build_version = 0.0.0; ` $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` @@ -18,8 +19,8 @@ RUN powershell -Command ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index a161d997f0..73a3b61f35 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -11,6 +11,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $dotnet_version = '0.0.0'; ` + $dotnet_build_version = 0.0.0; ` $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` @@ -18,8 +19,8 @@ RUN powershell -Command ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-amd64-Dockerfile.approved.txt index f3aeb7a6eb..9c802571ba 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-amd64-Dockerfile.approved.txt @@ -6,9 +6,10 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \ && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt index 34dc206b0e..e65958efad 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-arm32v7-Dockerfile.approved.txt @@ -6,9 +6,10 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \ && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt index 691687fa4a..3087254b38 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.22-arm64v8-Dockerfile.approved.txt @@ -6,9 +6,10 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_build_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt index 0f6b1c0d8c..fc9d466378 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -10,9 +10,10 @@ RUN tdnf install -y \ # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index cba4d6df79..5134936c1e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -10,9 +10,10 @@ RUN tdnf install -y \ # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt index 2514713dfc..2bbf859c23 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt @@ -29,6 +29,7 @@ RUN ` ` # Retrieve .NET SDK $dotnet_sdk_version = '0.0.0'; ` + $dotnet_sdk_build_version = 0.0.0; ` $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` @@ -36,8 +37,8 @@ RUN ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index 126cf83a04..04fbcd774c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -29,6 +29,7 @@ RUN ` ` # Retrieve .NET SDK $dotnet_sdk_version = '0.0.0'; ` + $dotnet_sdk_build_version = 0.0.0; ` $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` @@ -36,8 +37,8 @@ RUN ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-amd64-Dockerfile.approved.txt index 809f546e2b..928ac11581 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-amd64-Dockerfile.approved.txt @@ -6,9 +6,10 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm32v7-Dockerfile.approved.txt index 74368d911a..fe28bdd3bc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm32v7-Dockerfile.approved.txt @@ -6,9 +6,10 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \ && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm64v8-Dockerfile.approved.txt index d7087ff840..91b9a28a85 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm64v8-Dockerfile.approved.txt @@ -6,9 +6,10 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_build_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt index fb8a140661..76e7a08f42 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt @@ -29,6 +29,7 @@ RUN ` ` # Retrieve .NET SDK $dotnet_sdk_version = '0.0.0'; ` + $dotnet_sdk_build_version = 0.0.0; ` $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` @@ -36,8 +37,8 @@ RUN ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index 5aa5d6d377..dab74d751a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -29,6 +29,7 @@ RUN ` ` # Retrieve .NET SDK $dotnet_sdk_version = '0.0.0'; ` + $dotnet_sdk_build_version = 0.0.0; ` $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` @@ -36,8 +37,8 @@ RUN ` Authorization = \"Bearer $env:ACCESSTOKEN\"; ` 'x-ms-version' = '2017-11-09'; ` }; ` - Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_file -Headers $Headers; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/$dotnet_sha512_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_file -Headers $Headers; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_build_version/$dotnet_sha512_file -Headers $Headers; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/DockerfileHelper.cs b/tests/Microsoft.DotNet.Docker.Tests/DockerfileHelper.cs index 9c6246bc49..c281972f63 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/DockerfileHelper.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/DockerfileHelper.cs @@ -23,10 +23,16 @@ public static partial class DockerfileHelper [GeneratedRegex(@"\d+\.\d+\.\d+(\.\d+)?(-[A-Za-z]+(\.\d+)+)?")] public static partial Regex VersionRegex { get; } - // Match unstable versions that have been partially replaced with variables, like `$aspnetcore_version.25326.107` - [GeneratedRegex(@"\$[a-zA-Z0-9_]+\.\d+\.\d+")] + // Match unstable versions that have been partially replaced with variables, + // like `$aspnetcore_version.25326.107` or `$aspnetcore_version-rtm.25326.107` + [GeneratedRegex(@"\$[a-zA-Z0-9_]+((-[A-Za-z]+)?(\.\d+)+)")] public static partial Regex VersionWithVariableRegex { get; } + // Match unstable versions that have been partially replaced with variables + // using string addition, like `$dotnet_sdk_version + '-rtm.25515.111'` + [GeneratedRegex(@"\$[a-zA-Z0-9_]+\s*\+\s*'(-[A-Za-z]+(\.\d+)+)'")] + public static partial Regex StringVersionWithVariableRegex { get; } + [GeneratedRegex(@"v\d+\.\d+\.\d+\.windows\.\d+")] public static partial Regex MinGitVersionRegex { get; } diff --git a/tests/Microsoft.DotNet.Docker.Tests/GeneratedArtifactTests.cs b/tests/Microsoft.DotNet.Docker.Tests/GeneratedArtifactTests.cs index 9d978a3b75..9d7f6ad60d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/GeneratedArtifactTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/GeneratedArtifactTests.cs @@ -90,6 +90,7 @@ public void VerifyInternalDockerfilesOutput() (DockerfileHelper.Sha256Regex, "{sha256_placeholder}"), (DockerfileHelper.VersionRegex, "0.0.0"), (DockerfileHelper.VersionWithVariableRegex, "0.0.0"), + (DockerfileHelper.StringVersionWithVariableRegex, "0.0.0"), (DockerfileHelper.MinGitVersionRegex, "v0.0.0.windows.0"), (DockerfileHelper.AlpineVersionRegex, "alpine3.XX"), ]; diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config b/tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config index 5dae513501..dedf8bae7f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config +++ b/tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config @@ -1,2 +1,8 @@ - + + + + + + + diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config.nightly b/tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config.nightly index 138dc5b1b1..aca40d026c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config.nightly +++ b/tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config.nightly @@ -5,6 +5,6 @@ - + diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/TestDockerfile.cs b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/TestDockerfile.cs index 57ae2944dd..7279c0a2b3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/TestDockerfile.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestScenarios/TestDockerfile.cs @@ -46,8 +46,6 @@ COPY NuGet.config . ? DockerOS.Linux : DockerOS.Windows; - private static bool s_useNuGetConfig = Config.IsNightlyRepo || Config.IsInternal; - private static string[] s_commonArgs = [ "sdk_image", "runtime_image", @@ -132,30 +130,21 @@ COPY tests/ . public static TestDockerfile GetBlazorWasmDockerfile(bool useWasmTools) { - string nugetConfigFileOption = s_useNuGetConfig - ? "--configfile NuGet.config" - : string.Empty; - StringBuilder buildStageBuilder = new( $""" FROM $sdk_image AS {TestDockerfile.BuildStageName} ARG InternalAccessToken ARG port EXPOSE $port + {CopyNuGetConfigCommands} """); - if (s_useNuGetConfig) - { - buildStageBuilder.AppendLine(); - buildStageBuilder.AppendLine(CopyNuGetConfigCommands); - } - if (useWasmTools) { buildStageBuilder.AppendLine(); buildStageBuilder.AppendLine( $""" - RUN dotnet workload install {nugetConfigFileOption} wasm-tools \ + RUN dotnet workload install --configfile NuGet.config wasm-tools \ && . /etc/os-release \ && case $ID in \ alpine) apk add --no-cache python3 ;; \ @@ -210,17 +199,7 @@ ARG rid ARG InternalAccessToken ARG port EXPOSE $port - """); - - if (s_useNuGetConfig) - { - buildStageBuilder.AppendLine(); - buildStageBuilder.AppendLine(CopyNuGetConfigCommands); - } - - buildStageBuilder.AppendLine(); - buildStageBuilder.AppendLine( - $""" + {CopyNuGetConfigCommands} WORKDIR /source/app COPY app/*.csproj . RUN dotnet restore -r {FormatArg("rid")} diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs b/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs index f83b1e18ba..b50cc4c669 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs @@ -56,22 +56,19 @@ private string CreateTestSolutionWithSdkImage(string solutionDir, string appType CreateProjectWithSdkImage("xunit", _testProjectDir, testProjectContainerName); File.Copy(Path.Combine(DockerHelper.TestArtifactsDir, "UnitTests.cs"), Path.Combine(_testProjectDir, "UnitTests.cs")); - string nuGetConfigFileName = string.Empty; + string nuGetConfigFileName = "NuGet.config"; if (Config.IsInternal) { - nuGetConfigFileName = "NuGet.config.internal"; + nuGetConfigFileName += "NuGet.config.internal"; } else if (Config.IsNightlyRepo) { nuGetConfigFileName = "NuGet.config.nightly"; } - if (!string.IsNullOrEmpty(nuGetConfigFileName)) - { - File.Copy( - Path.Combine(DockerHelper.TestArtifactsDir, nuGetConfigFileName), - Path.Combine(solutionDir, "NuGet.config")); - } + File.Copy( + Path.Combine(DockerHelper.TestArtifactsDir, nuGetConfigFileName), + Path.Combine(solutionDir, "NuGet.config")); File.Copy(Path.Combine(DockerHelper.TestArtifactsDir, ".dockerignore"), Path.Combine(solutionDir, ".dockerignore")); }