From 6d31aa834eaf6204703ec978954ef26f7ff128ca Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Sat, 23 Jan 2021 11:23:38 +0000 Subject: [PATCH 1/2] Update .Net SDK to 3.1.405 --- .devcontainer/Dockerfile | 2 +- global.json | 2 +- tools/releaseBuild/Image/DockerFile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 571a36cf7..438d4c370 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.405 # This Dockerfile adds a non-root user with sudo access. Use the "remoteUser" # property in devcontainer.json to use it. On Linux, the container user's GID/UIDs diff --git a/global.json b/global.json index 775c52f92..18993d68a 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.101" + "version": "3.1.405" } } diff --git a/tools/releaseBuild/Image/DockerFile b/tools/releaseBuild/Image/DockerFile index 771b8c9fb..327ac36c7 100644 --- a/tools/releaseBuild/Image/DockerFile +++ b/tools/releaseBuild/Image/DockerFile @@ -18,8 +18,8 @@ RUN Import-Module PackageManagement; ` Install-ChocolateyPackage -PackageName git -Executable git.exe; ` Install-ChocolateyPackage -PackageName nuget.commandline -Executable nuget.exe -Cleanup; ` Install-Module -Force -Name platyPS -Repository PSGallery; ` - Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1 -outfile C:/dotnet-install.ps1; ` - C:/dotnet-install.ps1 -Channel Release -Version 2.1.4; ` + Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile C:/dotnet-install.ps1; ` + C:/dotnet-install.ps1 -Version 3.1.405; ` Add-Path C:/Users/ContainerAdministrator/AppData/Local/Microsoft/dotnet; COPY buildPSSA.ps1 containerFiles/buildPSSA.ps1 From 8bee5f615bec519a4c419ae87dc48e3f681e67ec Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Wed, 21 Apr 2021 13:50:44 -0700 Subject: [PATCH 2/2] Update .NET SDK to 3.1.408 --- .devcontainer/Dockerfile | 2 +- global.json | 2 +- tools/releaseBuild/Image/DockerFile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 438d4c370..713099409 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.405 +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.408 # This Dockerfile adds a non-root user with sudo access. Use the "remoteUser" # property in devcontainer.json to use it. On Linux, the container user's GID/UIDs diff --git a/global.json b/global.json index 18993d68a..a4152ac91 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.405" + "version": "3.1.408" } } diff --git a/tools/releaseBuild/Image/DockerFile b/tools/releaseBuild/Image/DockerFile index 327ac36c7..b73b770da 100644 --- a/tools/releaseBuild/Image/DockerFile +++ b/tools/releaseBuild/Image/DockerFile @@ -19,7 +19,7 @@ RUN Import-Module PackageManagement; ` Install-ChocolateyPackage -PackageName nuget.commandline -Executable nuget.exe -Cleanup; ` Install-Module -Force -Name platyPS -Repository PSGallery; ` Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile C:/dotnet-install.ps1; ` - C:/dotnet-install.ps1 -Version 3.1.405; ` + C:/dotnet-install.ps1 -Version 3.1.408; ` Add-Path C:/Users/ContainerAdministrator/AppData/Local/Microsoft/dotnet; COPY buildPSSA.ps1 containerFiles/buildPSSA.ps1