diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt index e49bb23c41..57cc13e47c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt index 12d9f130d1..fecc264cad 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt index 3ddde0ea96..8b582b3053 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt index 5d6c84d437..934bed0d0b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt index a89fca2e29..d4f7e29776 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt index 0057586750..971ff2df28 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt index 2e57e6944b..e0b5d64300 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt index 7a9cd17d92..a14ff3c1ee 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt index 0f66c1466e..a0c2ff4a9d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt index ea85ab7290..9ad16a77c0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt index a4f2871a16..943c45a2c4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt index 7bfd2ca361..3c5e0d5f4a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt index 7e05b03ffb..d5dfad3088 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -11,16 +11,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index 7d55833591..c44ba14e88 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -11,16 +11,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt index 56799d4c32..7903185595 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt index 3ee57dd1ba..5bf3e8670b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt index 69c009f630..a1242a0b86 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt index 823d687280..a2b9dca9fa 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt index 254a8e7e23..8342b60432 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt index 6153d66fce..c3128df0d3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt index ada82e7899..9e473c85ca 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt index a3f5686c48..55647a6beb 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index 62f67b21d3..c2cb3ef7d3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -13,8 +13,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $aspnetcore_version = '0.0.0'; ` - $aspnetcore_file_version = '0.0.0'; ` - $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_file_version + '-win-x64.zip'; ` + $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt index 18c1de6619..95e1542ef7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt index dbfb42cb01..0905fc0457 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt index bfa0aa1ed6..db97c2c6a5 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt index 9e6545e979..0bc5f6e7c7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt index 4f3de89ae4..a37f64045f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt index 8da1cdaddf..11258b5de3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt index cfaa5b7300..5b87c84de1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt index ff8a10d533..157701fdfa 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt index 6a71145b93..6175f132a6 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt index c9f6809e0d..e9caafdf3d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt index f473f12d6e..28ebae5394 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt index bad86dce53..be8f037fff 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt index c35c8957d9..f83ae763fc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt index 2783260edd..1a14adc929 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt index 5603729122..b5807fce68 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ - && aspnetcore_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index d4362b0923..0c0fc95cdf 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -13,8 +13,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $aspnetcore_version = '0.0.0'; ` - $aspnetcore_file_version = '0.0.0'; ` - $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_file_version + '-win-x64.zip'; ` + $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt index 974af2a703..32b28e65af 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt index 5c39065cf9..531f790cac 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ + dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt index e6953988eb..3bb298e1ca 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt index 891b2a1f4c..970977d515 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt index 5f36fcecb3..319ebb6062 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ + dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt index 3f6c3c19f2..aa51503f49 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt index df000f65a4..1661f6e865 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -11,16 +11,15 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index c1b92c38e4..561daf3a1a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -11,16 +11,15 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt index 4dc54d7171..c0eb0dfd5b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt index f4afa7df48..64f97a946d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt index 9ffd1b876d..7b89b776aa 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt index 6a22a6ca3e..660a144524 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -13,16 +13,15 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index 5df0621e8a..d4f1527b5a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -11,8 +11,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $dotnet_version = '0.0.0'; ` - $dotnet_file_version = '0.0.0'; ` - $dotnet_file = 'dotnet-runtime-' + $dotnet_file_version + '-win-x64.zip'; ` + $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt index 7b3fc7496d..ef487ff40e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt index e8042d7937..18bae7933b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt index d6dfa88fca..a769da48c4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt index 013bbd6532..e6c59471ec 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt index 9b84e1e8e1..555e4d1f18 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt index 3c7f88082f..dedb36674c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt index 844110968f..0e3f915e43 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt index fc6ec1732b..b12db930e7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt index 908899d466..d9775a00e2 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -7,16 +7,15 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ - && dotnet_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index 169088e177..a161d997f0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -11,8 +11,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $dotnet_version = '0.0.0'; ` - $dotnet_file_version = '0.0.0'; ` - $dotnet_file = 'dotnet-runtime-' + $dotnet_file_version + '-win-x64.zip'; ` + $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt index b9ad426fd3..e5cce2b97f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -6,16 +6,15 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ - && dotnet_sdk_file_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_file_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && 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 \ - dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt index 315ebc8a29..34dc206b0e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -6,16 +6,15 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ - && dotnet_sdk_file_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_file_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && 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 \ - dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz \ - dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ + dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt index 61fc072a90..691687fa4a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -6,16 +6,15 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ - && dotnet_sdk_file_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_file_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + 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 \ + && 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_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && 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 \ - dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt index 7b8e0ac0df..0f6b1c0d8c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -10,16 +10,15 @@ RUN tdnf install -y \ # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ - && dotnet_sdk_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && 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 \ - dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index e5e2f43235..cba4d6df79 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -10,16 +10,15 @@ RUN tdnf install -y \ # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ - && dotnet_sdk_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && 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_file_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && 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 \ - dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index 1ff9302686..126cf83a04 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -29,8 +29,7 @@ RUN ` ` # Retrieve .NET SDK $dotnet_sdk_version = '0.0.0'; ` - $dotnet_sdk_file_version = '0.0.0'; ` - $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_file_version + '-win-x64.zip'; ` + $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt index 02aa5cbfe1..e4c89146c0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt @@ -6,16 +6,15 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ - && dotnet_sdk_file_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_file_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && 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 \ - dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt index 4ca3c626ea..ed9910aabf 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt @@ -6,16 +6,15 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ - && dotnet_sdk_file_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_file_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && 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 \ - dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz \ - dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ + dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt index 09ec6c5eae..e78f70f64f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt @@ -6,16 +6,15 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ - && dotnet_sdk_file_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_file_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz" | sha512sum -c - \ + --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 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') 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_file_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && 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 \ - dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index 2e0a706674..5aa5d6d377 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -29,8 +29,7 @@ RUN ` ` # Retrieve .NET SDK $dotnet_sdk_version = '0.0.0'; ` - $dotnet_sdk_file_version = '0.0.0'; ` - $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_file_version + '-win-x64.zip'; ` + $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` $Headers = @{ `