Backport commits for 5B (#7172)

Author: mthalman

tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs

@@ -313,7 +313,7 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                     [
                         "ca-certificates",
                         "gcc-14-base",
-                        ..GetResoluteChiseledAmd64Packages(imageData),
+                        ..GetResoluteChiseledArchSpecificPackages(imageData),
                         "libc6",
                         "libgcc-s1",
                         "libssl3t64",
@@ -392,11 +392,16 @@ private static string GetZLibPackage(OSInfo os)
         }
 
         /// <summary>
-        /// Syft detects gcc-16 and openssl-provider-legacy as separate binary packages
-        /// on amd64 resolute chiseled images but not on arm64/arm32.
+        /// Syft detects additional binary packages on specific architectures
+        /// for resolute chiseled images: gcc-16 on amd64, openssl-provider-legacy on arm32.
         /// </summary>
-        private static IEnumerable<string> GetResoluteChiseledAmd64Packages(ProductImageData imageData) =>
-            imageData.Arch == Arch.Amd64 ? ["gcc-16", "openssl-provider-legacy"] : [];
+        private static IEnumerable<string> GetResoluteChiseledArchSpecificPackages(ProductImageData imageData) =>
+            imageData.Arch switch
+            {
+                Arch.Amd64 => ["gcc-16"],
+                Arch.Arm => ["openssl-provider-legacy"],
+                _ => []
+            };
 
         private static IEnumerable<string> GetExtraPackages(ProductImageData imageData) => imageData switch
             {
@@ -409,7 +414,8 @@ private static IEnumerable<string> GetResoluteChiseledAmd64Packages(ProductImage
                     {
                         "icu",
                         "libicu78",
-                        "tzdata"
+                        "tzdata",
+                        "tzdata-legacy"
                     },
                 { OS: var os } when os == OS.NobleChiseled => new[]
                     {

tests/Microsoft.DotNet.Docker.Tests/TestAppArtifacts/NuGet.config.nightly

@@ -3,8 +3,8 @@
   <packageSources>
     <clear />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
-    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-0fc3e418/nuget/v3/index.json" />
+    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
   </packageSources>
 </configuration>