From fca1d9a6d8792a12371727c58084798d7dfa831a Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Mon, 23 Dec 2024 22:55:58 -0800 Subject: [PATCH 1/2] Update dotnetcli domain --- custom/linux/agent/amd/custom.dotnet.sdk.amd.Dockerfile | 4 ++-- custom/linux/agent/arm/custom.dotnet.sdk.arm.Dockerfile | 4 ++-- custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/custom/linux/agent/amd/custom.dotnet.sdk.amd.Dockerfile b/custom/linux/agent/amd/custom.dotnet.sdk.amd.Dockerfile index 6e58c6c30..53bc2cc45 100644 --- a/custom/linux/agent/amd/custom.dotnet.sdk.amd.Dockerfile +++ b/custom/linux/agent/amd/custom.dotnet.sdk.amd.Dockerfile @@ -4,7 +4,7 @@ # # @param teamCityAgentImage target TeamCity Agent image, e.g. 'jetbrains/teamcity-agent:2023.05.4' # @param dotnetSdkVersion target .NET SDK version, e.g. '7.0.401' -# @param dotnetSdkChecksum checksum of .NET SDK's archive obtained from "dotnetcli.azureedge.net/dotnet/Sdk" +# @param dotnetSdkChecksum checksum of .NET SDK's archive obtained from "builds.dotnet.microsoft.com/dotnet/Sdk" # ARG teamCityAgentImage @@ -18,7 +18,7 @@ ARG dotnetSdkChecksum RUN rm -rf /usr/share/dotnet && \ mkdir -p /usr/share/dotnet && \ echo "Downloading .NET SDK [$dotnetSdkVersion] ..." && \ - curl -SL https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnetSdkVersion}/dotnet-sdk-${dotnetSdkVersion}-linux-x64.tar.gz \ + curl -SL https://builds.dotnet.microsoft.com/dotnet/Sdk/${dotnetSdkVersion}/dotnet-sdk-${dotnetSdkVersion}-linux-x64.tar.gz \ --output /tmp/dotnet.tar.gz && \ echo "Downloaded .NET SDK $dotnetSdkVersion (Linux AMD64) checksum: $(sha512sum tmp/dotnet.tar.gz)" && \ echo "$dotnetSdkChecksum */tmp/dotnet.tar.gz" | sha512sum -c - && \ diff --git a/custom/linux/agent/arm/custom.dotnet.sdk.arm.Dockerfile b/custom/linux/agent/arm/custom.dotnet.sdk.arm.Dockerfile index a38660bc7..214264554 100644 --- a/custom/linux/agent/arm/custom.dotnet.sdk.arm.Dockerfile +++ b/custom/linux/agent/arm/custom.dotnet.sdk.arm.Dockerfile @@ -4,7 +4,7 @@ # # @param teamCityAgentImage target TeamCity Agent image, e.g. 'jetbrains/teamcity-agent:2023.05.4' # @param dotnetSdkVersion target .NET SDK version, e.g. '7.0.401' -# @param dotnetSdkChecksum checksum of .NET SDK's archive obtained from "dotnetcli.azureedge.net/dotnet/Sdk" +# @param dotnetSdkChecksum checksum of .NET SDK's archive obtained from "builds.dotnet.microsoft.com/dotnet/Sdk" # ARG teamCityAgentImage @@ -16,7 +16,7 @@ ARG dotnetSdkChecksum RUN rm -rf /usr/share/dotnet && \ mkdir -p /usr/share/dotnet && \ echo "Downloading .NET SDK [$dotnetSdkVersion] ..." && \ - curl -SL https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnetSdkVersion}/dotnet-sdk-${dotnetSdkVersion}-linux-arm64.tar.gz \ + curl -SL https://builds.dotnet.microsoft.com/dotnet/Sdk/${dotnetSdkVersion}/dotnet-sdk-${dotnetSdkVersion}-linux-arm64.tar.gz \ --output /tmp/dotnet.tar.gz && \ echo "Downloaded .NET SDK $dotnetSdkVersion (Linux ARM64) checksum: '$(sha512sum /tmp/dotnet.tar.gz)'" && \ echo "${dotnetSdkChecksum} /tmp/dotnet.tar.gz" | sha512sum -c - && \ diff --git a/custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile b/custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile index 6749fc913..de82fb493 100644 --- a/custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile +++ b/custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile @@ -4,7 +4,7 @@ # # @param teamCityAgentImage target TeamCity Agent image, e.g. 'jetbrains/teamcity-agent:2023.05.4' # @param dotnetSdkVersion target .NET SDK version, e.g. '7.0.401' -# @param dotnetSdkChecksum checksum of .NET SDK's archive obtained from "dotnetcli.azureedge.net/dotnet/Sdk" +# @param dotnetSdkChecksum checksum of .NET SDK's archive obtained from "builds.dotnet.microsoft.com/dotnet/Sdk" # ARG teamCityAgentImage From 33ffd645deb51a39df94664a778bdb6cdd7b6688 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Thu, 26 Dec 2024 09:01:40 -0800 Subject: [PATCH 2/2] Updating storage account references --- configs/linux.config | 2 +- configs/linuxARM.config | 2 +- configs/windows.config | 2 +- .../linux/Agent/Ubuntu/18.04/Dockerfile | 2 +- .../linux/Agent/Ubuntu/20.04/Dockerfile | 2 +- .../linux/Agent/Ubuntu/22.04/Dockerfile | 2 +- .../linux/Agent/UbuntuARM/18.04/Dockerfile | 2 +- .../linux/Agent/UbuntuARM/20.04/Dockerfile | 2 +- .../linux/Agent/UbuntuARM/22.04/Dockerfile | 2 +- context/generated/teamcity-agent.md | 44 +++++++++---------- .../windows/Agent/nanoserver/1803/Dockerfile | 2 +- .../Agent/windowsservercore/1803/Dockerfile | 2 +- .../Agent/windowsservercore/1809/Dockerfile | 2 +- .../Agent/windowsservercore/1903/Dockerfile | 2 +- .../Agent/windowsservercore/1909/Dockerfile | 2 +- .../Agent/windowsservercore/2022/Dockerfile | 2 +- .../custom.dotnet.sdk.win.amd.Dockerfile | 2 +- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/configs/linux.config b/configs/linux.config index b6809c156..72f702314 100644 --- a/configs/linux.config +++ b/configs/linux.config @@ -12,7 +12,7 @@ jdkServerLinuxComponentName=JDK Amazon Corretto x64 v.17.0.7.7.1 Checksum (MD5) feb7eab99c647a0b4347be9f0a3276de](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-windows-x64-jdk.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows @@ -452,7 +452,7 @@ Installed components: - [JDK Amazon Corretto x64 v.17.0.7.7.1 Checksum (MD5) feb7eab99c647a0b4347be9f0a3276de](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-windows-x64-jdk.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows @@ -488,7 +488,7 @@ Installed components: - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Mercurial x64 v.5.9.1](https://www.mercurial-scm.org/release/windows/mercurial-5.9.1-x64.msi) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows @@ -523,7 +523,7 @@ Installed components: - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Mercurial x64 v.5.9.1](https://www.mercurial-scm.org/release/windows/mercurial-5.9.1-x64.msi) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows @@ -560,7 +560,7 @@ Installed components: - Mercurial - [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) - Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) Container platform: linux @@ -597,7 +597,7 @@ Installed components: - Mercurial - [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz) - Perforce Helix Core client (p4) [2022.2-2637361](https://www.perforce.com/products/helix-core) Container platform: linux @@ -634,7 +634,7 @@ Installed components: - Mercurial - [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) -- [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) +- [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) Container platform: linux @@ -670,7 +670,7 @@ Installed components: - Mercurial - [Docker v.27.3.1](https://docs.docker.com/engine/release-notes/27) - [Containerd.io v1.6.28-2](https://github.com/containerd/containerd/releases/tag/v1.6.28) -- [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) +- [.NET SDK v.6.0.413 (LTS) ARM64 Checksum (SHA512) 7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz) Container platform: linux @@ -699,7 +699,7 @@ The docker image is not available and may be created manually. Installed components: -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) Container platform: windows @@ -731,7 +731,7 @@ Installed components: - [JDK Amazon Corretto x64 v.17.0.7.7.1 Checksum (MD5) feb7eab99c647a0b4347be9f0a3276de](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-windows-x64-jdk.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows @@ -763,7 +763,7 @@ Installed components: - [JDK Amazon Corretto x64 v.17.0.7.7.1 Checksum (MD5) feb7eab99c647a0b4347be9f0a3276de](https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-windows-x64-jdk.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows @@ -796,7 +796,7 @@ Installed components: - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Mercurial x64 v.5.9.1](https://www.mercurial-scm.org/release/windows/mercurial-5.9.1-x64.msi) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows @@ -827,7 +827,7 @@ Installed components: - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Mercurial x64 v.5.9.1](https://www.mercurial-scm.org/release/windows/mercurial-5.9.1-x64.msi) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows @@ -859,7 +859,7 @@ Installed components: - [Git x64 v.2.47.1 Checksum (SHA256) 50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a](https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip) - [PowerShell](https://github.com/PowerShell/PowerShell#get-powershell) - [Mercurial x64 v.5.9.1](https://www.mercurial-scm.org/release/windows/mercurial-5.9.1-x64.msi) -- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) +- [.NET SDK v.6.0.413 (LTS) x86 Checksum (SHA512) a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e](https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip) Container platform: windows diff --git a/context/generated/windows/Agent/nanoserver/1803/Dockerfile b/context/generated/windows/Agent/nanoserver/1803/Dockerfile index 088758529..11936ab4b 100644 --- a/context/generated/windows/Agent/nanoserver/1803/Dockerfile +++ b/context/generated/windows/Agent/nanoserver/1803/Dockerfile @@ -1,5 +1,5 @@ # Default arguments -ARG dotnetWindowsComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' +ARG dotnetWindowsComponent='https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' ARG powershellImage='mcr.microsoft.com/powershell:nanoserver-1803' ARG teamcityWindowsservercoreImage='teamcity-agent:EAP-windowsservercore-1803' diff --git a/context/generated/windows/Agent/windowsservercore/1803/Dockerfile b/context/generated/windows/Agent/windowsservercore/1803/Dockerfile index 027de5a2a..9c58e433c 100644 --- a/context/generated/windows/Agent/windowsservercore/1803/Dockerfile +++ b/context/generated/windows/Agent/windowsservercore/1803/Dockerfile @@ -1,5 +1,5 @@ # Default arguments -ARG dotnetWindowsComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' +ARG dotnetWindowsComponent='https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' ARG dotnetWindowsComponentSHA512='a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e' ARG gitWindowsComponent='https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip' ARG gitWindowsComponentSHA256='50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a' diff --git a/context/generated/windows/Agent/windowsservercore/1809/Dockerfile b/context/generated/windows/Agent/windowsservercore/1809/Dockerfile index ba3836645..b300076ec 100644 --- a/context/generated/windows/Agent/windowsservercore/1809/Dockerfile +++ b/context/generated/windows/Agent/windowsservercore/1809/Dockerfile @@ -1,5 +1,5 @@ # Default arguments -ARG dotnetWindowsComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' +ARG dotnetWindowsComponent='https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' ARG dotnetWindowsComponentSHA512='a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e' ARG gitWindowsComponent='https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip' ARG gitWindowsComponentSHA256='50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a' diff --git a/context/generated/windows/Agent/windowsservercore/1903/Dockerfile b/context/generated/windows/Agent/windowsservercore/1903/Dockerfile index 8cd6d3c70..97032154f 100644 --- a/context/generated/windows/Agent/windowsservercore/1903/Dockerfile +++ b/context/generated/windows/Agent/windowsservercore/1903/Dockerfile @@ -1,5 +1,5 @@ # Default arguments -ARG dotnetWindowsComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' +ARG dotnetWindowsComponent='https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' ARG dotnetWindowsComponentSHA512='a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e' ARG gitWindowsComponent='https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip' ARG gitWindowsComponentSHA256='50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a' diff --git a/context/generated/windows/Agent/windowsservercore/1909/Dockerfile b/context/generated/windows/Agent/windowsservercore/1909/Dockerfile index 254499f02..4a949a39b 100644 --- a/context/generated/windows/Agent/windowsservercore/1909/Dockerfile +++ b/context/generated/windows/Agent/windowsservercore/1909/Dockerfile @@ -1,5 +1,5 @@ # Default arguments -ARG dotnetWindowsComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' +ARG dotnetWindowsComponent='https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' ARG dotnetWindowsComponentSHA512='a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e' ARG gitWindowsComponent='https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip' ARG gitWindowsComponentSHA256='50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a' diff --git a/context/generated/windows/Agent/windowsservercore/2022/Dockerfile b/context/generated/windows/Agent/windowsservercore/2022/Dockerfile index 637698c05..bea5c9de2 100644 --- a/context/generated/windows/Agent/windowsservercore/2022/Dockerfile +++ b/context/generated/windows/Agent/windowsservercore/2022/Dockerfile @@ -1,5 +1,5 @@ # Default arguments -ARG dotnetWindowsComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' +ARG dotnetWindowsComponent='https://builds.dotnet.microsoft.com/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-win-x64.zip' ARG dotnetWindowsComponentSHA512='a9e1bbb52484ad0667b258451ebb6b47ce6c7b788c015aee8a86c5e0c4dcf4ee8c82d796921869d64c92bb2afef2c7ceea09cfe255d8519d48f2471a098c361e' ARG gitWindowsComponent='https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip' ARG gitWindowsComponentSHA256='50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a' diff --git a/custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile b/custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile index de82fb493..50740b7dc 100644 --- a/custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile +++ b/custom/windows/agent/custom.dotnet.sdk.win.amd.Dockerfile @@ -24,7 +24,7 @@ RUN setx /M PATH ('{0};{1}\bin;C:\Program Files\Git\cmd;C:\Program Files\Mercuri RUN [Net.ServicePointManager]::SecurityProtocol = 'tls12, tls11, tls' ; \ $code = Get-Content -Path "scripts/Web.cs" -Raw ; \ Add-Type -IgnoreWarnings -TypeDefinition "$code" -Language CSharp ; \ - $url = 'https://dotnetcli.blob.core.windows.net/dotnet/Sdk/' + $Env:dotnetSdkVersion + '/dotnet-sdk-' + $Env:dotnetSdkVersion + '-win-x64.zip'; \ + $url = 'https://builds.dotnet.microsoft.com/dotnet/Sdk/' + $Env:dotnetSdkVersion + '/dotnet-sdk-' + $Env:dotnetSdkVersion + '-win-x64.zip'; \ $downloadScript = [Scripts.Web]::DownloadFiles($url + '#SHA512#' + $Env:dotnetSdkChecksum, 'dotnet.zip') ; \ # Remove to successfully expand archive Remove-Item -Force -Recurse $Env:ProgramFiles\dotnet; \