Merge branch 'main' into release/2025-feb

dotnet · Feb 11, 2025 · 5d539f2 · 5d539f2
2 parents 1498c9c + 761bbb0
commit 5d539f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -229,7 +229,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}'.");

diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
@@ -313,6 +313,8 @@ internal static IEnumerable<string> GetExpectedPackages(ProductImageData imageDa
             {
                 { OS: string os } when os.Contains(OS.AzureLinux) => new[]
                     {
+                        "SymCrypt",
+                        "SymCrypt-OpenSSL",
                         "azurelinux-release",
                         "distroless-packages-minimal",
                         "filesystem",