From ff9ad3ef2362aaca11a2246103f45056faab09b7 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 5 Jul 2022 00:38:26 -0700 Subject: [PATCH 1/3] Update alpine.3.13 to the new one --- .vsts-ci.yml | 4 ++-- eng/docker/{alpine.3.13 => alpine.3.15}/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename eng/docker/{alpine.3.13 => alpine.3.15}/Dockerfile (93%) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 20ed99836..74bea93e8 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -238,7 +238,7 @@ stages: _TestArg: '' Build_Linux_musl_Debug_x64: _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.13' + _DockerParameter: '--docker alpine.3.15' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' @@ -283,7 +283,7 @@ stages: _TestArg: '' Build_Linux_musl_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker alpine.3.13' + _DockerParameter: '--docker alpine.3.15' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' diff --git a/eng/docker/alpine.3.13/Dockerfile b/eng/docker/alpine.3.15/Dockerfile similarity index 93% rename from eng/docker/alpine.3.13/Dockerfile rename to eng/docker/alpine.3.15/Dockerfile index 272f9596a..2d7e65698 100644 --- a/eng/docker/alpine.3.13/Dockerfile +++ b/eng/docker/alpine.3.15/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-20210714125444-ae5be29 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-20220610131707-f0ea7ba RUN apk update && apk upgrade && apk add --no-cache curl ncurses From e77bb371d7309738cd75d088bb15e9c9f5b06878 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Jul 2022 00:32:05 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/sdk build 20220705.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22351.11 -> To Version 6.0.400-preview.22355.11 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed9353018..7905af2dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - 02bb1e5b70925a299386e6cec6ce9d184e502208 + c48fc73bd169eba4957dfae32b8e2bc4070b5210 - + https://github.com/dotnet/sdk - 02bb1e5b70925a299386e6cec6ce9d184e502208 + c48fc73bd169eba4957dfae32b8e2bc4070b5210 diff --git a/eng/Versions.props b/eng/Versions.props index 4d0639bef..c6b484073 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22351.11 - 6.0.400-preview.22351.11 + 6.0.400-preview.22355.11 + 6.0.400-preview.22355.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b27b4ecf9f1274ae4431a799b282c7f1cec8a1a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Jul 2022 22:38:20 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/sdk build 20220706.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22355.11 -> To Version 6.0.400-preview.22356.20 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7905af2dc..9cbc85253 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://github.com/dotnet/templating 4fba13f8c6414d685e7a30efd41a4af05fb099c5 - + https://github.com/dotnet/sdk - c48fc73bd169eba4957dfae32b8e2bc4070b5210 + 7e5b406e3d427266db6e0c284e437f512f47a8c6 - + https://github.com/dotnet/sdk - c48fc73bd169eba4957dfae32b8e2bc4070b5210 + 7e5b406e3d427266db6e0c284e437f512f47a8c6 diff --git a/eng/Versions.props b/eng/Versions.props index c6b484073..fbca69db5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-preview.22355.11 - 6.0.400-preview.22355.11 + 6.0.400-preview.22356.20 + 6.0.400-preview.22356.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)