Normalize line endings for aggregate checksum files

Author: lbussell

eng/dockerfile-templates/Dockerfile.linux.validate-checksum

@@ -40,9 +40,12 @@ if ARGS["sha-var-name"]:{{ARGS["sha-var-name"]}}='{{ARGS["sha"]}}' \
 && }}echo "{{shaValue}}  {{ARGS["file"]}}" | sha{{ARGS["sha-function"]}}sum -c -^
 elif (ARGS["file"]):{{
     if (ARGS["sha-file-is-aggregate"]):{{
+        _ As a temporary workaround, these commands need to normalize line endings in the checksum files.
+          Remove the `sed` and `gsub` calls when https://github.com/dotnet/core/issues/9958 is fixed. ^
         if (isAlpine)
             :awk -v file="{{ARGS["file"]}}" '{gsub(/\r/, "")} $2 == file' {{ARGS["sha-file"]}} | sha{{ARGS["sha-function"]}}sum -c^
         else
-            :sha{{ARGS["sha-function"]}}sum -c {{ARGS["sha-file"]}} --ignore-missing}}^
+            :sed -i 's/\r$//' {{ARGS["sha-file"]}} \
+&& sha{{ARGS["sha-function"]}}sum -c {{ARGS["sha-file"]}} --ignore-missing}}^
     else
         :sha{{ARGS["sha-function"]}}sum -c {{ARGS["sha-file"]}}}}}}

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

@@ -14,6 +14,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && 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 \

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

@@ -14,6 +14,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && 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 \

src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile

@@ -14,6 +14,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && 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 \

src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile

@@ -14,6 +14,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && 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 \

src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile

@@ -14,6 +14,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \

src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile

@@ -14,6 +14,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \

src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile

@@ -14,6 +14,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \

src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile

@@ -14,6 +14,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \

src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile

@@ -12,6 +12,7 @@ RUN aspnetcore_version=8.0.17 \
     && 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/checksums/8.0.17-sha.txt \
+    && sed -i 's/\r$//' 8.0.17-sha.txt \
     && sha512sum -c 8.0.17-sha.txt --ignore-missing \
     && mkdir --parents /dotnet \
     && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \