From 4801fd13abdf6591a09c726b51f814708750402f Mon Sep 17 00:00:00 2001 From: ManickaP Date: Thu, 19 Aug 2021 13:26:40 +0200 Subject: [PATCH] Updated docker TFM references to 7.0 after branching --- eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile | 2 +- eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile | 2 +- eng/docker/libraries-sdk.linux.Dockerfile | 2 +- eng/docker/libraries-sdk.windows.Dockerfile | 2 +- .../System.Net.Http/tests/StressTests/HttpStress/Dockerfile | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile index 2a232ee452418..49a9e2bfdc24a 100644 --- a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile @@ -21,7 +21,7 @@ ARG CONFIGURATION=Release ARG COREFX_SHARED_FRAMEWORK_NAME=Microsoft.NETCore.App ARG ASPNETCORE_SHARED_NAME=Microsoft.AspNetCore.App -ARG SOURCE_COREFX_VERSION=6.0.0 +ARG SOURCE_COREFX_VERSION=7.0.0 ARG TARGET_SHARED_FRAMEWORK=/usr/share/dotnet/shared ARG TARGET_COREFX_VERSION=$DOTNET_VERSION diff --git a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile index 9fcb11a9a0c9e..18e42d3da0379 100644 --- a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile @@ -11,7 +11,7 @@ ARG CONFIGURATION=Release ARG COREFX_SHARED_FRAMEWORK_NAME=Microsoft.NETCore.App ARG ASPNETCORE_SHARED_NAME=Microsoft.AspNetCore.App -ARG SOURCE_COREFX_VERSION=6.0.0 +ARG SOURCE_COREFX_VERSION=7.0.0 ARG TARGET_SHARED_FRAMEWORK="C:\\Program Files\\dotnet\\shared" ARG TARGET_COREFX_VERSION=$DOTNET_VERSION diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index fd4f071da198d..8c9c4225045da 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -19,7 +19,7 @@ ARG ARCH=x64 ARG CONFIGURATION=Release ARG COREFX_SHARED_FRAMEWORK_NAME=Microsoft.NETCore.App -ARG SOURCE_COREFX_VERSION=6.0.0 +ARG SOURCE_COREFX_VERSION=7.0.0 ARG TARGET_SHARED_FRAMEWORK=/usr/share/dotnet/shared ARG TARGET_COREFX_VERSION=$DOTNET_VERSION diff --git a/eng/docker/libraries-sdk.windows.Dockerfile b/eng/docker/libraries-sdk.windows.Dockerfile index c8d993b18d389..d0e4a5bb839a9 100644 --- a/eng/docker/libraries-sdk.windows.Dockerfile +++ b/eng/docker/libraries-sdk.windows.Dockerfile @@ -10,7 +10,7 @@ ARG ARCH=x64 ARG CONFIGURATION=Release ARG COREFX_SHARED_FRAMEWORK_NAME=Microsoft.NETCore.App -ARG SOURCE_COREFX_VERSION=6.0.0 +ARG SOURCE_COREFX_VERSION=7.0.0 ARG TARGET_SHARED_FRAMEWORK="C:\\Program Files\\dotnet\\shared" ARG TARGET_COREFX_VERSION=$DOTNET_VERSION diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile index 28c10ddfa8a08..6d317afa03e08 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile @@ -10,9 +10,9 @@ COPY . . # Pulling the msquic Debian package from msquic-ci public pipeline and from a hardcoded build. # Note that this is a temporary solution until we have properly published Linux packages. # Also note that in order to update to a newer msquic build, you have update this link. -ARG MSQUIC_PACKAGE=libmsquic_1.6.0_amd64.deb +ARG MSQUIC_PACKAGE=libmsquic_1.7.0_amd64.deb ARG PACKAGES_DIR=LinuxPackages -RUN wget 'https://dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_apis/build/builds/1266893/artifacts?artifactName=LinuxPackages&api-version=6.0&%24format=zip' -O "$PACKAGES_DIR".zip +RUN wget 'https://dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_apis/build/builds/1298721/artifacts?artifactName=LinuxPackages&api-version=6.0&%24format=zip' -O "$PACKAGES_DIR".zip RUN apt-get update RUN apt-get install unzip RUN unzip $PACKAGES_DIR.zip