Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9d02068

Browse files
committed
Use new checksum file formats for .NET 10
1 parentd525f6b commit9d02068

File tree

70 files changed

+83
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+83
-75
lines changed

‎eng/dockerfile-templates/Dockerfile.download-dotnet

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,19 @@
6060
separate condition for bare checksum files. ^
6161
_ Aggregate checksum files are also not available for internal builds. ^
6262
set shaUrlIsAggregate to (!isInternal && (dotnetVersion = "8.0" || dotnetVersion = "9.0")) ^
63-
set shaUrlIsBare to (isInternal || dotnetVersion = "10.0") ^
64-
65-
set shaUrlPath to when(shaUrlIsAggregate,
66-
VARIABLES[cat("dotnet|", dotnetVersion, "|aggregate-checksums")],
67-
cat(downloadPath, ".sha512")) ^
63+
_ Bare files don't exist internally yet, see https://github.com/dotnet/release/issues/1382 ^
64+
set bareFileExists to (!isInternal && dotnetVersion != "8.0" && dotnetVersion != "9.0") ^
65+
_ Checksum files can contain bare shas, even if the file doesn't have the .sha512-bare extension.
66+
We basically want to use the bare file on Windows only. However, we're currently also forced to use bare files internally.
67+
When https://github.com/dotnet/release/issues/1382 is fixed, internal sha files will not be bare by default. ^
68+
set shaFileContentIsBare to (isInternal || (isWindows && bareFileExists)) ^
69+
70+
set shaUrlPath to
71+
when(shaUrlIsAggregate,
72+
VARIABLES[cat("dotnet|", dotnetVersion, "|aggregate-checksums")],
73+
when(bareFileExists && shaFileContentIsBare,
74+
cat(downloadPath, ".sha512-bare"),
75+
cat(downloadPath, ".sha512"))) ^
6876
set shaUrl to cat(checksumsBaseUrl, shaUrlPath) ^
6977

7078
set shaUrlParts to split(shaUrl, "/") ^
@@ -175,7 +183,7 @@
175183
"file": replaceVariables(fileName),
176184
"sha-function": shaFunction,
177185
"sha-file": replaceVariables(shaFileName),
178-
"sha-file-is-bare":shaUrlIsBare,
186+
"sha-file-is-bare":shaFileContentIsBare,
179187
"sha-file-is-aggregate": shaUrlIsAggregate,
180188
"use-cmd-escape": isWindows && product = "sdk"
181189
])

‎src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
1010
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
11-
&&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 - \
11+
&&sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
1212
&& mkdir --parents /dotnet \
1313
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \
1414
&& rm \

‎src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
1010
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
11-
&&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 - \
11+
&&sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
1212
&& mkdir --parents /dotnet \
1313
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \
1414
&& rm \

‎src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
1010
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
11-
&&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 - \
11+
&&sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
1212
&& mkdir --parents /dotnet \
1313
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \
1414
&& rm \

‎src/aspnet/10.0/alpine3.22/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
1010
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
11-
&&echo"$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \
11+
&&sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
1212
&& mkdir --parents /dotnet \
1313
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
1414
&& rm \

‎src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
1010
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
11-
&&echo"$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \
11+
&&sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
1212
&& mkdir --parents /dotnet \
1313
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
1414
&& rm \

‎src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
1010
https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
11-
&&echo"$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \
11+
&&sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
1212
&& mkdir --parents /dotnet \
1313
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \
1414
&& rm \

‎src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
1414
&& curl --fail --show-error --location \
1515
--remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
1616
--remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
17-
&&echo"$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
17+
&&sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
1818
&& mkdir --parents /usr/share/dotnet \
1919
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
2020
&& rm \

‎src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
1414
&& curl --fail --show-error --location \
1515
--remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \
1616
--remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
17-
&&echo"$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \
17+
&&sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \
1818
&& mkdir --parents /usr/share/dotnet \
1919
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \
2020
&& rm \

‎src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
1414
&& curl --fail --show-error --location \
1515
--remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
1616
--remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
17-
&&echo"$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \
17+
&&sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
1818
&& mkdir --parents /usr/share/dotnet \
1919
&& tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \
2020
&& rm \

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp