From be3c15212e072427f608f0f97e4f4ee7294b47c1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 10 Feb 2025 09:11:56 -0600 Subject: [PATCH 1/2] Add SymCrypt packages to expected list for Azure Linux 3 (#6219) --- tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs index fcb873357f..ba7d629675 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs @@ -313,6 +313,8 @@ internal static IEnumerable GetExpectedPackages(ProductImageData imageDa { { OS: string os } when os.Contains(OS.AzureLinux) => new[] { + "SymCrypt", + "SymCrypt-OpenSSL", "azurelinux-release", "distroless-packages-minimal", "filesystem", From 761bbb00ab7a65973f749794240268d217f44bcb Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Mon, 10 Feb 2025 09:37:41 -0800 Subject: [PATCH 2/2] Update domains (#6217) --- eng/Get-DropVersions.ps1 | 2 +- eng/update-dependencies/DockerfileShaUpdater.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Get-DropVersions.ps1 b/eng/Get-DropVersions.ps1 index 5153e7bfe3..2e189d4c54 100644 --- a/eng/Get-DropVersions.ps1 +++ b/eng/Get-DropVersions.ps1 @@ -110,7 +110,7 @@ function ResolveSdkUrl([string]$sdkVersion, [bool]$useStableBranding) { $sdkUrl = "https://dotnetstage.blob.core.windows.net/$containerVersion-internal/Sdk/$sdkVersion/$zipFile" } else { - $sdkUrl = "https://dotnetbuilds.blob.core.windows.net/public/Sdk/$sdkVersion/$zipFile" + $sdkUrl = "https://ci.dot.net/public/Sdk/$sdkVersion/$zipFile" } return $sdkUrl } diff --git a/eng/update-dependencies/DockerfileShaUpdater.cs b/eng/update-dependencies/DockerfileShaUpdater.cs index cb1e89b6b8..14e67f1f46 100644 --- a/eng/update-dependencies/DockerfileShaUpdater.cs +++ b/eng/update-dependencies/DockerfileShaUpdater.cs @@ -230,7 +230,6 @@ private static string GetArch(string[] variableParts) .Replace("/dotnetcli", "/dotnetclichecksums") .Replace("/internal/", "/internal-checksums/") .Replace("/public/", "/public-checksums/") - .Replace("azureedge.net", "blob.core.windows.net") + shaExt; Trace.TraceInformation($"Downloading '{shaUrl}'.");