From d262b547e5426241583be787d1a8a599ce6e4a9c Mon Sep 17 00:00:00 2001
From: Noah Gilson <noahgilson@microsoft.com>
Date: Mon, 4 Nov 2024 16:26:09 -0800
Subject: [PATCH 001/127] Create Subdirectory for Temp Deps.Json File. Please
 contact me for further information regarding this change.

---
 .../CommandResolution/ProjectToolsCommandResolver.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
index 5cef06aac0bb..df194aee92a3 100644
--- a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
+++ b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
@@ -337,7 +337,7 @@ internal void GenerateDepsJsonFile(
                 LocalizableStrings.GeneratingDepsJson,
                 depsPath));
 
-            var tempDepsFile = Path.GetTempFileName();
+            var tempDepsFile = Path.Combine(PathUtilities.CreateTempSubdirectory(), Path.GetRandomFileName());
 
             var args = new List<string>();
 

From 9d48fb07696ecd794916dd6d7086d9b18c9b51cf Mon Sep 17 00:00:00 2001
From: Noah Gilson <noahgilson@microsoft.com>
Date: Mon, 4 Nov 2024 16:29:04 -0800
Subject: [PATCH 002/127] Create Subdirectory for Temp Deps.Json File. Please
 contact me for further information regarding this change.

---
 .../CommandResolution/ProjectToolsCommandResolver.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
index 5cef06aac0bb..df194aee92a3 100644
--- a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
+++ b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
@@ -337,7 +337,7 @@ internal void GenerateDepsJsonFile(
                 LocalizableStrings.GeneratingDepsJson,
                 depsPath));
 
-            var tempDepsFile = Path.GetTempFileName();
+            var tempDepsFile = Path.Combine(PathUtilities.CreateTempSubdirectory(), Path.GetRandomFileName());
 
             var args = new List<string>();
 

From aaaba35c60c58e388637d347d6836853efcf792d Mon Sep 17 00:00:00 2001
From: maestro-prod-Primary <maestro-prod-Primary>
Date: Wed, 4 Dec 2024 00:36:41 +0000
Subject: [PATCH 003/127] Merged PR 45636: [internal/release/8.0.1xx] Update
 dependencies from dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.11 to 8.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:dd95552e-72fb-4363-9b59-08dbd5a5c3e7)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: dd95552e-72fb-4363-9b59-08dbd5a5c3e7
- **Build**: 20241203.5
- **Date Produced**: December 3, 2024 11:28:49 PM UTC
- **Commit**: 89ef51c5d8f5239345127a1e282e11036e590c8b
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1]
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.11 to 8.0.12][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5&targetVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&_a=files
[2]: https://github.com/dotnet/emsdk/compare/f6237140b3...c458a7647c

[DependencyUpdate]: <> (End)

[marker]: <> (End:dd95552e-72fb-4363-9b59-08dbd5a5c3e7)
---
 NuGet.config            |  3 +++
 eng/Version.Details.xml | 40 ++++++++++++++++++++--------------------
 eng/Versions.props      | 14 +++++++-------
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 8a7b728112d4..39308e49c28c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,6 +3,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
+    <add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
@@ -24,6 +25,7 @@
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-7e0acf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7e0acf90/nuget/v3/index.json" />
@@ -67,6 +69,7 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4264b816e973..9d853eaa109f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -14,46 +14,46 @@
       <Sha>7e0acf900fbe1081a0cf8981b0139aba830b3318</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.11">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.11-servicing.24517.7">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.12-servicing.24603.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.11-servicing.24517.7">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.12-servicing.24603.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.11">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.11">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.11-servicing.24517.7">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.12-servicing.24603.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.11-servicing.24517.7">
+    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.12-servicing.24603.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.11">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.11" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.12" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>f6237140b33bf18c72dccfeda14be8d103c3b93e</Sha>
+      <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.8.5">
       <Uri>https://github.com/dotnet/msbuild</Uri>
@@ -200,9 +200,9 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>aa59400b11e1aeee2e8af48928dbd48748a8bef9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.11">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
     <Dependency Name="System.Formats.Asn1" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index bdb8f07c54d1..551ea952c125 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,18 +49,18 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>8.0.11</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.11-servicing.24517.7</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.12</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.12-servicing.24603.5</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.11</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>8.0.11-servicing.24517.7</MicrosoftNETHostModelVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.12</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETHostModelVersion>8.0.12-servicing.24603.5</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
     <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.2</MicrosoftExtensionsLoggingAbstractionsVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>8.0.1</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>8.0.11</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>8.0.12</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
     <MicrosoftExtensionsObjectPoolPackageVersion>8.0.11</MicrosoftExtensionsObjectPoolPackageVersion>
@@ -225,7 +225,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Workloads from dotnet/emsdk -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.11</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.12</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
     <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion>
     <!-- emsdk workload prerelease version band must match the emsdk feature band -->
     <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))</EmscriptenWorkloadFeatureBand>

From c180688f2f7bb740d96700bc10be6300af68d6ce Mon Sep 17 00:00:00 2001
From: maestro-prod-Primary <maestro-prod-Primary>
Date: Wed, 4 Dec 2024 00:36:41 +0000
Subject: [PATCH 004/127] Merged PR 45635: [internal/release/8.0.3xx] Update
 dependencies from dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.11 to 8.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:471db9b4-49ec-4921-de46-08dc11e85c3a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 471db9b4-49ec-4921-de46-08dc11e85c3a
- **Build**: 20241203.5
- **Date Produced**: December 3, 2024 11:28:49 PM UTC
- **Commit**: 89ef51c5d8f5239345127a1e282e11036e590c8b
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1]
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.11 to 8.0.12][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5&targetVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&_a=files
[2]: https://github.com/dotnet/emsdk/compare/f6237140b3...c458a7647c

[DependencyUpdate]: <> (End)

[marker]: <> (End:471db9b4-49ec-4921-de46-08dc11e85c3a)
---
 NuGet.config            |  3 +++
 eng/Version.Details.xml | 40 ++++++++++++++++++++--------------------
 eng/Versions.props      | 14 +++++++-------
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index ddf5b0a2a10f..1451abf54494 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,6 +4,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
+    <add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-86f5186d/nuget/v3/index.json" />
@@ -24,6 +25,7 @@
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-1bd9e10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1bd9e103/nuget/v3/index.json" />
@@ -70,6 +72,7 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2e8df806deda..a991389e314f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -14,46 +14,46 @@
       <Sha>1bd9e10367ab7c8fec384f0915fdb5db046e9286</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.11">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.11-servicing.24517.7">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.12-servicing.24603.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.11-servicing.24517.7">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.12-servicing.24603.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.11">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.11">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.11-servicing.24517.7">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.12-servicing.24603.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.11-servicing.24517.7">
+    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.12-servicing.24603.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.11">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.11" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.12" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>f6237140b33bf18c72dccfeda14be8d103c3b93e</Sha>
+      <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.10.4">
       <Uri>https://github.com/dotnet/msbuild</Uri>
@@ -200,9 +200,9 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.11">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
+      <Sha>89ef51c5d8f5239345127a1e282e11036e590c8b</Sha>
     </Dependency>
     <Dependency Name="System.Formats.Asn1" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 2af4b58e59ae..b165274992a2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -51,19 +51,19 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>8.0.11</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.11-servicing.24517.7</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.12</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.12-servicing.24603.5</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.11</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>8.0.11-servicing.24517.7</MicrosoftNETHostModelVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.12</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETHostModelVersion>8.0.12-servicing.24603.5</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.2</MicrosoftExtensionsLoggingAbstractionsVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>8.0.1</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>8.0.11</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>8.0.12</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
     <MicrosoftExtensionsObjectPoolPackageVersion>8.0.11</MicrosoftExtensionsObjectPoolPackageVersion>
@@ -229,7 +229,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Workloads from dotnet/emsdk -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.11</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.12</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
     <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion>
     <!-- emsdk workload prerelease version band must match the emsdk feature band -->
     <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))</EmscriptenWorkloadFeatureBand>

From d27975b5ef47a37a4ca3990f1a25b996feae3755 Mon Sep 17 00:00:00 2001
From: maestro-prod-Primary <maestro-prod-Primary>
Date: Wed, 4 Dec 2024 05:20:14 +0000
Subject: [PATCH 005/127] Merged PR 45648: [internal/release/8.0.1xx] Update
 dependencies from dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 5ae73aca-14b4-4570-17b0-08dbd53e3897
- **Build**: 20241203.9
- **Date Produced**: December 4, 2024 3:01:09 AM UTC
- **Commit**: 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **dotnet-user-jwts**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **dotnet-user-secrets**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.AspNetCore.Authorization**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]
  - **Microsoft.AspNetCore.TestHost**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.Extensions.ObjectPool**: [from 8.0.11 to 8.0.12][1]
  - **Microsoft.JSInterop**: [from 8.0.11 to 8.0.12][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC47576478939fdd59b4400ad135f47938af486ab3&targetVersion=GC6b7b74f519fd8876bdcd2939a45e3fdab2b3513f&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:5ae73aca-14b4-4570-17b0-08dbd53e3897)
---
 NuGet.config            |  2 ++
 eng/Version.Details.xml | 72 ++++++++++++++++++++---------------------
 eng/Versions.props      | 16 ++++-----
 3 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 39308e49c28c..3a9ab426f754 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,6 +18,7 @@
     <add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-6b7b74f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6b7b74f5/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
@@ -55,6 +56,7 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-6b7b74f" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-int-dotnet-format-27f1865-1" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9d853eaa109f..7c6ab00ce03d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,13 +111,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.8.1-rc.2">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
@@ -248,50 +248,50 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
       <Sha>42a83a56d421ac71312453e53dbacc3d2ae6d432</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.12-servicing.24603.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24574.1">
       <Uri>https://github.com/dotnet/razor</Uri>
@@ -306,21 +306,21 @@
       <Uri>https://github.com/dotnet/razor</Uri>
       <Sha>0d10fb38d28484fc4189a5441d258d60c3cf2ca3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.11">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="8.0.11">
+    <Dependency Name="Microsoft.JSInterop" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
       <Uri>https://github.com/dotnet/xdt</Uri>
@@ -437,9 +437,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.11">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 551ea952c125..1d8b944b38eb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -63,7 +63,7 @@
     <MicrosoftNETILLinkTasksPackageVersion>8.0.12</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsObjectPoolPackageVersion>8.0.11</MicrosoftExtensionsObjectPoolPackageVersion>
+    <MicrosoftExtensionsObjectPoolPackageVersion>8.0.12</MicrosoftExtensionsObjectPoolPackageVersion>
     <MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
     <SystemCompositionAttributedModelPackageVersion>8.0.0</SystemCompositionAttributedModelPackageVersion>
     <SystemCompositionConventionPackageVersion>8.0.0</SystemCompositionConventionPackageVersion>
@@ -165,13 +165,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.11</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.11</MicrosoftAspNetCoreTestHostPackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.12</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.12</MicrosoftAspNetCoreTestHostPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>

From f7cd007b9d25fd00e34a9e31da5e9b6b47de2ca2 Mon Sep 17 00:00:00 2001
From: maestro-prod-Primary <maestro-prod-Primary>
Date: Wed, 4 Dec 2024 17:36:26 +0000
Subject: [PATCH 006/127] Merged PR 45652: [internal/release/8.0.1xx] Update
 dependencies from dnceng/internal/dotnet-aspnetcore,
 dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 5ae73aca-14b4-4570-17b0-08dbd53e3897
- **Build**: 20241203.12
- **Date Produced**: December 4, 2024 7:28:32 AM UTC
- **Commit**: 31d685b2d9a86ca1243014d175a3da813f78e428
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **dotnet-user-jwts**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **dotnet-user-secrets**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.12 to 8.0.12][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.12 to 8.0.12][1]
  - **Microsoft.AspNetCore.Authorization**: [from 8.0.12 to 8.0.12][1]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 8.0.12 to 8.0.12][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]
  - **Microsoft.AspNetCore.TestHost**: [from 8.0.12 to 8.0.12][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.12 to 8.0.12][1]
  - **Microsoft.Extensions.ObjectPool**: [from 8.0.12 to 8.0.12][1]
  - **Microsoft.JSInterop**: [from 8.0.12 to 8.0.12][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC6b7b74f519fd8876bdcd2939a45e3fdab2b3513f&targetVersion=GC31d685b2d9a86ca1243014d175a3da813f78e428&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:5ae73aca-14b4-4570-17b0-08dbd53e3897)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.11-servicing.24521.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.Windows...
---
 NuGet.config            |  6 ++--
 eng/Version.Details.xml | 76 ++++++++++++++++++++---------------------
 eng/Versions.props      | 12 +++----
 3 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 3a9ab426f754..76221a981af5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-6b7b74f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6b7b74f5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
@@ -32,6 +32,7 @@
     <add key="darc-pub-dotnet-templating-7e0acf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7e0acf90/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -56,7 +57,7 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-6b7b74f" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-int-dotnet-format-27f1865-1" value="true" />
@@ -74,6 +75,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7c6ab00ce03d..c8f43e0a244a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,13 +111,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>4ff64493649bd045ced204661958393dc5575e96</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.8.1-rc.2">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
@@ -228,70 +228,70 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.11">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>d3e7d292233dc8a3d2df128698239b078d13cdb0</Sha>
+      <Sha>0dad47b40c489631d0d3e7c6cc10f0035590a17c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.11-servicing.24521.5">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.12-servicing.24604.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>d3e7d292233dc8a3d2df128698239b078d13cdb0</Sha>
+      <Sha>0dad47b40c489631d0d3e7c6cc10f0035590a17c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.11">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>d3e7d292233dc8a3d2df128698239b078d13cdb0</Sha>
+      <Sha>0dad47b40c489631d0d3e7c6cc10f0035590a17c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.11-servicing.24521.5">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.12-servicing.24604.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>d3e7d292233dc8a3d2df128698239b078d13cdb0</Sha>
+      <Sha>0dad47b40c489631d0d3e7c6cc10f0035590a17c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.11-servicing.24521.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.12-servicing.24603.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>42a83a56d421ac71312453e53dbacc3d2ae6d432</Sha>
+      <Sha>6a2a510ae56ff16665d95b96a0920e2fd45e1d2b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.12-servicing.24603.9">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24574.1">
       <Uri>https://github.com/dotnet/razor</Uri>
@@ -308,19 +308,19 @@
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.JSInterop" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
       <Uri>https://github.com/dotnet/xdt</Uri>
@@ -439,7 +439,7 @@
     </Dependency>
     <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>6b7b74f519fd8876bdcd2939a45e3fdab2b3513f</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1d8b944b38eb..cce63cff76d7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -166,11 +166,11 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRefPackageVersion>8.0.12</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.12-servicing.24603.9</MicrosoftAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreAnalyzersPackageVersion>
     <MicrosoftAspNetCoreTestHostPackageVersion>8.0.12</MicrosoftAspNetCoreTestHostPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
@@ -181,7 +181,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
-    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.11-servicing.24521.7</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.12-servicing.24603.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Manually updated">
     <!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

From 55a73a0e7f0c08bb832c2dceeb49287223efef1f Mon Sep 17 00:00:00 2001
From: maestro-prod-Primary <maestro-prod-Primary>
Date: Wed, 4 Dec 2024 17:47:27 +0000
Subject: [PATCH 007/127] Merged PR 45649: [internal/release/8.0.3xx] Update
 dependencies from dnceng/internal/dotnet-aspnetcore,
 dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a
- **Build**: 20241203.12
- **Date Produced**: December 4, 2024 7:28:32 AM UTC
- **Commit**: 31d685b2d9a86ca1243014d175a3da813f78e428
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **dotnet-user-jwts**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **dotnet-user-secrets**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.11 to 8.0.12][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][2]
  - **Microsoft.AspNetCore.Authorization**: [from 8.0.11 to 8.0.12][2]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **Microsoft.AspNetCore.Components.Web**: [from 8.0.11 to 8.0.12][2]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]
  - **Microsoft.AspNetCore.TestHost**: [from 8.0.11 to 8.0.12][2]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.11 to 8.0.12][2]
  - **Microsoft.Extensions.ObjectPool**: [from 8.0.11 to 8.0.12][2]
  - **Microsoft.JSInterop**: [from 8.0.11 to 8.0.12][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC47576478939fdd59b4400ad135f47938af486ab3&targetVersion=GC31d685b2d9a86ca1243014d175a3da813f78e428&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:911684f3-0faa-4fc9-de45-08dc11e85c3a)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.11-servicing.24521.7 to 8.0.12-servicing.24603.5 (parent:...
---
 NuGet.config            |  4 ++
 eng/Version.Details.xml | 92 ++++++++++++++++++++---------------------
 eng/Versions.props      | 18 ++++----
 3 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 1451abf54494..7d316a4cfe4c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -19,6 +19,7 @@
     <add key="darc-int-dotnet-format-86f5186-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
@@ -31,6 +32,7 @@
     <add key="darc-pub-dotnet-templating-1bd9e10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1bd9e103/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -57,6 +59,7 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
@@ -75,6 +78,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a991389e314f..b99188470017 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,13 +111,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>64e323ff5a3f88b1eae1c6d728441e73a38a9daa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.10.2-rc.8">
       <Uri>https://github.com/nuget/nuget.client</Uri>
@@ -228,70 +228,70 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.11">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>d3e7d292233dc8a3d2df128698239b078d13cdb0</Sha>
+      <Sha>0dad47b40c489631d0d3e7c6cc10f0035590a17c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.11-servicing.24521.5">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.12-servicing.24604.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>d3e7d292233dc8a3d2df128698239b078d13cdb0</Sha>
+      <Sha>0dad47b40c489631d0d3e7c6cc10f0035590a17c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.11">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>d3e7d292233dc8a3d2df128698239b078d13cdb0</Sha>
+      <Sha>0dad47b40c489631d0d3e7c6cc10f0035590a17c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.11-servicing.24521.5">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.12-servicing.24604.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>d3e7d292233dc8a3d2df128698239b078d13cdb0</Sha>
+      <Sha>0dad47b40c489631d0d3e7c6cc10f0035590a17c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.11-servicing.24521.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.12-servicing.24603.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>42a83a56d421ac71312453e53dbacc3d2ae6d432</Sha>
+      <Sha>6a2a510ae56ff16665d95b96a0920e2fd45e1d2b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.11-servicing.24521.16">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24574.6">
       <Uri>https://github.com/dotnet/razor</Uri>
@@ -306,21 +306,21 @@
       <Uri>https://github.com/dotnet/razor</Uri>
       <Sha>aa2c76f75e60f3f6ae500bbf0eae9eb11af0bd4f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.11">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.11">
+    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="8.0.11">
+    <Dependency Name="Microsoft.JSInterop" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
       <Uri>https://github.com/dotnet/xdt</Uri>
@@ -437,9 +437,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.11">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
+      <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index b165274992a2..ce4ad5118db0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -66,7 +66,7 @@
     <MicrosoftNETILLinkTasksPackageVersion>8.0.12</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsObjectPoolPackageVersion>8.0.11</MicrosoftExtensionsObjectPoolPackageVersion>
+    <MicrosoftExtensionsObjectPoolPackageVersion>8.0.12</MicrosoftExtensionsObjectPoolPackageVersion>
     <MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
     <SystemCompositionAttributedModelPackageVersion>8.0.0</SystemCompositionAttributedModelPackageVersion>
     <SystemCompositionConventionPackageVersion>8.0.0</SystemCompositionConventionPackageVersion>
@@ -169,13 +169,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.11</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.11-servicing.24521.16</MicrosoftAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.11</MicrosoftAspNetCoreTestHostPackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.12</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.12-servicing.24603.12</MicrosoftAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.12</MicrosoftAspNetCoreTestHostPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>
@@ -185,7 +185,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
-    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.11-servicing.24521.7</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.12-servicing.24603.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Manually updated">
     <!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

From 2976c8e4e0b62c19d87169a7f198553c9ac52cc9 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Tue, 14 Jan 2025 14:08:49 -0800
Subject: [PATCH 008/127] Update dependencies from dotnet/deployment-tools

---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 98ec60e84691..1acc83440cf6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -359,9 +359,9 @@
       <Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.23463.1">
+    <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">
       <Uri>https://github.com/dotnet/deployment-tools</Uri>
-      <Sha>5957c5c5f85f17c145e7fab4ece37ad6aafcded9</Sha>
+      <Sha>5255d40e228ea1d4b624781b5b97ec16484a3b4b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.Tasks.Git" Version="8.0.0-beta.23615.1">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
@@ -390,9 +390,9 @@
     </Dependency>
     <!-- Explicit dependency because Microsoft.Deployment.DotNet.Releases has different versioning
          than the SB intermediate -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.deployment-tools" Version="8.0.0-preview.6.23463.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.deployment-tools" Version="8.0.0-rtm.25064.1">
       <Uri>https://github.com/dotnet/deployment-tools</Uri>
-      <Sha>5957c5c5f85f17c145e7fab4ece37ad6aafcded9</Sha>
+      <Sha>5255d40e228ea1d4b624781b5b97ec16484a3b4b</Sha>
       <SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-23228-03">
diff --git a/eng/Versions.props b/eng/Versions.props
index b2292c6d07ef..ef981a0356eb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -43,7 +43,7 @@
     <SystemReflectionMetadataLoadContextVersion>8.0.1</SystemReflectionMetadataLoadContextVersion>
     <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
     <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
-    <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
+    <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-rtm.1.25064.1</MicrosoftDeploymentDotNetReleasesVersion>
     <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
     <MicrosoftWindowsCsWin32PackageVersion>0.3.49-beta</MicrosoftWindowsCsWin32PackageVersion>
   </PropertyGroup>

From 222381361c799fdac8990d411d4371ada124342f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 05:02:39 +0000
Subject: [PATCH 009/127] Update dependencies from
 https://github.com/dotnet/roslyn build 20250114.8

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.10.0-3.25056.12 -> To Version 4.10.0-3.25064.8
---
 eng/Version.Details.xml | 28 ++++++++++++++--------------
 eng/Versions.props      | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e8e8682934ec..2b099f1dae29 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -82,34 +82,34 @@
       <Sha>86f5186deeea364bd8541d51657e52a54b2a96b2</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.25056.12">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.25064.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3bdcd8b471bef9a522c16a0ada911eb9890b1a6c</Sha>
+      <Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.25056.12">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.25064.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3bdcd8b471bef9a522c16a0ada911eb9890b1a6c</Sha>
+      <Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.25056.12">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.25064.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3bdcd8b471bef9a522c16a0ada911eb9890b1a6c</Sha>
+      <Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0-3.25056.12">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0-3.25064.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3bdcd8b471bef9a522c16a0ada911eb9890b1a6c</Sha>
+      <Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0-3.25056.12">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0-3.25064.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3bdcd8b471bef9a522c16a0ada911eb9890b1a6c</Sha>
+      <Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0-3.25056.12">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0-3.25064.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3bdcd8b471bef9a522c16a0ada911eb9890b1a6c</Sha>
+      <Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0-3.25056.12">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0-3.25064.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>3bdcd8b471bef9a522c16a0ada911eb9890b1a6c</Sha>
+      <Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.11-servicing.24521.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index c69ec945bb6d..af4d7e0c1995 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -158,13 +158,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.25056.12</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>4.10.0-3.25056.12</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-3.25056.12</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.10.0-3.25056.12</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.10.0-3.25056.12</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-3.25056.12</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.10.0-3.25056.12</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.25064.8</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>4.10.0-3.25064.8</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-3.25064.8</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.10.0-3.25064.8</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.10.0-3.25064.8</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-3.25064.8</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.10.0-3.25064.8</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <PropertyGroup>

From e4f75d4c0509a125b0c5f933b8da749a9fe3083f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 03:51:54 +0000
Subject: [PATCH 010/127] Update dependencies from
 https://github.com/dotnet/msbuild build 20250116.3

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.8.15-preview-24613-11 -> To Version 17.8.18-preview-25066-03
---
 NuGet.config            | 19 ++++++++++++++++++-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 97f57f595d5d..e4e533b1ea7c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,6 +4,9 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
@@ -19,20 +22,27 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-e2abee0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e2abee08/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-31744df" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-31744dfc/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-3dc94e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3dc94e39/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -57,6 +67,9 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
@@ -72,9 +85,13 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
     <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 34285d9be1c7..72bea52a38b3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.8.15">
+    <Dependency Name="Microsoft.Build" Version="17.8.18">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
+      <Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.8.15-preview-24613-11">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.8.18-preview-25066-03">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
+      <Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.15-preview-24613-11">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.18-preview-25066-03">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef</Sha>
+      <Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index 022b502ff51a..8b1ee6b9d2ff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -121,7 +121,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.8.15</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.8.18</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -130,7 +130,7 @@
     <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.8.15-preview-24613-11</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.8.18-preview-25066-03</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From a6d33904cc3cc31a411df352cf1e3f101bf242fe Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 05:01:45 +0000
Subject: [PATCH 011/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250114.11

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11
---
 NuGet.config            | 17 +++++++++++++++++
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  6 +++---
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 97f57f595d5d..aae89ebfae9f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,6 +4,9 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
@@ -19,6 +22,9 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-e2abee0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e2abee08/nuget/v3/index.json" />
@@ -27,12 +33,16 @@
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-3dc94e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3dc94e39/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -57,6 +67,9 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
@@ -72,9 +85,13 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
     <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 34285d9be1c7..b3db0f8d5149 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25064.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
+      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25064.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
+      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25060.1">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25064.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
+      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25060.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25064.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
+      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 022b502ff51a..fa131aca1a99 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25060.1</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25064.11</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25060.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25064.11</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 20106ebd00aa..d785ea18f069 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.110",
+    "dotnet": "8.0.112",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25064.11"
   }
 }

From 0de318aa1d09b81562ef1d689f43b1194035b3c4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 05:01:53 +0000
Subject: [PATCH 012/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250114.11

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2b099f1dae29..dc9486dbbb23 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25064.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
+      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25064.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
+      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25060.1">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25064.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
+      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25060.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25064.11">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
+      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index af4d7e0c1995..ad3cab820562 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25060.1</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25064.11</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25060.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25064.11</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 20106ebd00aa..d785ea18f069 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.110",
+    "dotnet": "8.0.112",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25064.11"
   }
 }

From 7636d5ad5ba1a060ea7a2f334eb3283686f55054 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 07:07:32 +0000
Subject: [PATCH 013/127] Update dependencies from
 https://github.com/dotnet/templating build 20250115.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25062.5 -> To Version 8.0.113-servicing.25065.1
---
 NuGet.config            | 19 ++++++++++++++++++-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 97f57f595d5d..509e4a9bd001 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,6 +4,9 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
@@ -19,6 +22,9 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-e2abee0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e2abee08/nuget/v3/index.json" />
@@ -27,12 +33,16 @@
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-3dc94e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3dc94e39/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-4d0f12a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4d0f12a0/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -57,6 +67,9 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
@@ -72,9 +85,13 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
     <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 34285d9be1c7..9b184ebe4c8a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.113">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>3dc94e390f9d515149fe99e64bf5daa8133aff4d</Sha>
+      <Sha>4d0f12a0d6a2cfd586d8308021be21c61ef9c52f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.113-servicing.25062.5">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.113-servicing.25065.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>3dc94e390f9d515149fe99e64bf5daa8133aff4d</Sha>
+      <Sha>4d0f12a0d6a2cfd586d8308021be21c61ef9c52f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.113-servicing.25062.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.113-servicing.25065.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>3dc94e390f9d515149fe99e64bf5daa8133aff4d</Sha>
+      <Sha>4d0f12a0d6a2cfd586d8308021be21c61ef9c52f</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index 022b502ff51a..2b24a4c9afb9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.113-servicing.25062.5</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.113-servicing.25065.1</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From ca7f5481aa70131599d7aa6e0950aa078cbd319f Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 16 Jan 2025 16:20:28 -0600
Subject: [PATCH 014/127] Fix typo in condition check for container publishing
 that led to inadvertend multi-arch publishing

---
 .../packaging/build/Microsoft.NET.Build.Containers.targets      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 1b6ad491c8af..8332145ee29d 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -399,7 +399,7 @@
   Condition="'$(IsPublishable)' == 'true' AND '$(EnableSdkContainerSupport)' == 'true'">
     <PropertyGroup>
       <_IsMultiTFMBuild Condition="'$(TargetFrameworks)' != '' and '$(TargetFramework)' == ''">true</_IsMultiTFMBuild>
-      <_IsMultiRIDBuild Condition="'$(BuildingInsideVisualStudio)' != 'true' and (('$(RuntimeIdentifiers)' != '' and '$(RuntimeIdentifier)' == '') or ('$(ContainerRuntimeIdentifiers)' != '' and '$(ContainerRuntimeIdentfier)' == ''))">true</_IsMultiRIDBuild>
+      <_IsMultiRIDBuild Condition="'$(BuildingInsideVisualStudio)' != 'true' and (('$(RuntimeIdentifiers)' != '' and '$(RuntimeIdentifier)' == '') or ('$(ContainerRuntimeIdentifiers)' != '' and '$(ContainerRuntimeIdentifier)' == ''))">true</_IsMultiRIDBuild>
       <_IsSingleRIDBuild Condition="'$(_IsMultiRIDBuild)' == ''">true</_IsSingleRIDBuild>
     </PropertyGroup>
 

From 56701a1afe85ff0d3f959d578a41d9ff8a31e32e Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 16 Jan 2025 16:56:22 -0600
Subject: [PATCH 015/127] Add two new failing tests detailing scenarios that
 should work:

* using Container-specific properties to target a single RID
* using normal RID properties to target a single RID
---
 .../EndToEndTests.cs                          | 116 +++++++++++++++++-
 1 file changed, 111 insertions(+), 5 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index c78cf0eb8d5b..2dac6823b586 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -181,7 +181,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
 
     [DockerAvailableFact]
     public async Task TarballsHaveCorrectStructure()
-    { 
+    {
         var archiveFile = Path.Combine(TestSettings.TestArtifactsDirectory,
             nameof(TarballsHaveCorrectStructure), "app.tar.gz");
 
@@ -190,7 +190,7 @@ public async Task TarballsHaveCorrectStructure()
             await BuildDockerImageWithArciveDestinationAsync(archiveFile, ["latest"], nameof(TarballsHaveCorrectStructure));
 
         await destinationReference.LocalRegistry!.LoadAsync(dockerImage, sourceReference, destinationReference, default).ConfigureAwait(false);
-        
+
         Assert.True(File.Exists(archiveFile), $"File.Exists({archiveFile})");
 
         CheckDockerTarballStructure(archiveFile);
@@ -778,6 +778,112 @@ public void EndToEndMultiArch_LocalRegistry()
         newProjectDir.Delete(true);
     }
 
+    [DockerAvailableFact]
+    public void MultiArchStillAllowsSingleRID()
+    {
+        string imageName = NewImageName();
+        string imageTag = "1.0";
+        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
+        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+
+        // Create a new console project
+        DirectoryInfo newProjectDir = CreateNewProject("console");
+
+        // Run PublishContainer for multi-arch-capable, but single-arch actual
+        CommandResult commandResult = new DotnetCommand(
+            _testOutput,
+            "publish",
+            "/t:PublishContainer",
+            // make it so the app is _able_ to target both linux TFMs
+            "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
+            // and that it opts into to multi-targeting containers for both of those linux TFMs
+            "/p:ContainerRuntimeIdentifiers=\"linux-x64;linux-arm64\"",
+            // but then only actually publishes for one of them
+            "/p:ContainerRuntimeIdentifier=linux-x64",
+            $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
+            $"/p:ContainerRepository={imageName}",
+            $"/p:ContainerImageTag={imageTag}",
+            "/p:EnableSdkContainerSupport=true",
+            "/bl")
+            .WithWorkingDirectory(newProjectDir.FullName)
+            .Execute();
+
+        // Check that the app was published for each RID,
+        // images were created locally for each RID
+        // and image index was NOT created
+        commandResult.Should().Pass()
+            .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
+            .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
+            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to local registry")
+            .And.NotHaveStdOutContaining($"Pushed image '{imageArm64}' to local registry")
+            .And.NotHaveStdOutContaining("Pushed image index");
+
+        // Check that the containers can be run
+        CommandResult processResultX64 = ContainerCli.RunCommand(
+            _testOutput,
+            "--rm",
+            "--name",
+            $"test-container-{imageName}-x64",
+            imageX64)
+        .Execute();
+        processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
+
+        // Cleanup
+        newProjectDir.Delete(true);
+    }
+
+    [DockerAvailableFact]
+    public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
+    {
+        string imageName = NewImageName();
+        string imageTag = "1.0";
+        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
+        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+
+        // Create a new console project
+        DirectoryInfo newProjectDir = CreateNewProject("console");
+
+        // Run PublishContainer for multi-arch-capable, but single-arch actual
+        CommandResult commandResult = new DotnetCommand(
+            _testOutput,
+            "publish",
+            "/t:PublishContainer",
+            // make it so the app is _able_ to target both linux TFMs
+            "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
+            // but then only actually publishes for one of them
+            "-r linux-x64",
+            $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
+            $"/p:ContainerRepository={imageName}",
+            $"/p:ContainerImageTag={imageTag}",
+            "/p:EnableSdkContainerSupport=true",
+            "/bl")
+            .WithWorkingDirectory(newProjectDir.FullName)
+            .Execute();
+
+        // Check that the app was published for each RID,
+        // images were created locally for each RID
+        // and image index was NOT created
+        commandResult.Should().Pass()
+            .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
+            .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
+            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to local registry")
+            .And.NotHaveStdOutContaining($"Pushed image '{imageArm64}' to local registry")
+            .And.NotHaveStdOutContaining("Pushed image index");
+
+        // Check that the containers can be run
+        CommandResult processResultX64 = ContainerCli.RunCommand(
+            _testOutput,
+            "--rm",
+            "--name",
+            $"test-container-{imageName}-x64",
+            imageX64)
+        .Execute();
+        processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
+
+        // Cleanup
+        newProjectDir.Delete(true);
+    }
+
     private DirectoryInfo CreateNewProject(string template, [CallerMemberName] string callerMemberName = "")
     {
         DirectoryInfo newProjectDir = new DirectoryInfo(Path.Combine(TestSettings.TestArtifactsDirectory, callerMemberName));
@@ -839,8 +945,8 @@ public void EndToEndMultiArch_ArchivePublishing()
             .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to local archive at '{imageArm64Tarball}'")
             .And.NotHaveStdOutContaining("Pushed image index");
 
-        // Check that tarballs were created    
-        File.Exists(imageX64Tarball).Should().BeTrue(); 
+        // Check that tarballs were created
+        File.Exists(imageX64Tarball).Should().BeTrue();
         File.Exists(imageArm64Tarball).Should().BeTrue();
 
         // Load the images from the tarballs
@@ -886,7 +992,7 @@ public void EndToEndMultiArch_RemoteRegistry()
 
         // Create a new console project
         DirectoryInfo newProjectDir = CreateNewProject("console");
-        
+
         // Run PublishContainer for multi-arch with ContainerRegistry
         CommandResult commandResult = new DotnetCommand(
             _testOutput,

From ca7ee82a5f1c40567c0dfbff4b4169355e80f782 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 16 Jan 2025 18:12:09 -0600
Subject: [PATCH 016/127] Green up one of the two tests by making the
 _IsMultiRIDBuild condition more correct

---
 .../Microsoft.NET.Build.Containers.targets    | 15 ++++++++----
 .../EndToEndTests.cs                          | 24 ++++++++-----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 8332145ee29d..868614abe354 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -297,9 +297,9 @@
 
   <Target Name="_PublishMultiArchContainers" DependsOnTargets="$(PublishContainerDependsOn)" >
     <Error Text="ContainerArchiveOutputPath is invalid. It can only be a directory in multi-arch scenario because the runtime identifier is appended in the end of the filename."
-      Condition="'$(ContainerArchiveOutputPath)' != '' and 
-                 !$(ContainerArchiveOutputPath.EndsWith('/')) and 
-                 !$(ContainerArchiveOutputPath.EndsWith('\\')) and 
+      Condition="'$(ContainerArchiveOutputPath)' != '' and
+                 !$(ContainerArchiveOutputPath.EndsWith('/')) and
+                 !$(ContainerArchiveOutputPath.EndsWith('\\')) and
                  $(ContainerArchiveOutputPath.EndsWith('.tar.gz'))" />
 
     <ItemGroup>
@@ -399,7 +399,14 @@
   Condition="'$(IsPublishable)' == 'true' AND '$(EnableSdkContainerSupport)' == 'true'">
     <PropertyGroup>
       <_IsMultiTFMBuild Condition="'$(TargetFrameworks)' != '' and '$(TargetFramework)' == ''">true</_IsMultiTFMBuild>
-      <_IsMultiRIDBuild Condition="'$(BuildingInsideVisualStudio)' != 'true' and (('$(RuntimeIdentifiers)' != '' and '$(RuntimeIdentifier)' == '') or ('$(ContainerRuntimeIdentifiers)' != '' and '$(ContainerRuntimeIdentifier)' == ''))">true</_IsMultiRIDBuild>
+      <!-- we are multi-RID if:
+          * we have CRIDs and no CRID
+          * we have RIDs and no (CRIDs or CRID or RID)
+      -->
+      <_HasCRIDsAndNoCRID Condition="'$(ContainerRuntimeIdentifiers)' != '' and '$(ContainerRuntimeIdentifier)' == ''">true</_HasCRIDsAndNoCRID>
+      <_HasRIDs Condition="'$(RuntimeIdentifiers)' != ''">true</_HasRIDs>
+      <_NoCRIDsOrCRIDorRID Condition="'$(ContainerRuntimeIdentifiers)' == '' and '$(ContainerRuntimeIdentifier)' == '' and '$(RuntimeIdentifier)' == ''">true</_NoCRIDsOrCRIDorRID>
+      <_IsMultiRIDBuild Condition="'$(BuildingInsideVisualStudio)' != 'true' and ('$(_HasCRIDsAndNoCRID)' == true or ('$(_HasRIDs)' == 'true' and '$(_NoCRIDsOrCRIDorRID)' == 'true'))">true</_IsMultiRIDBuild>
       <_IsSingleRIDBuild Condition="'$(_IsMultiRIDBuild)' == ''">true</_IsSingleRIDBuild>
     </PropertyGroup>
 
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 2dac6823b586..f60c0bff20dc 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -783,8 +783,7 @@ public void MultiArchStillAllowsSingleRID()
     {
         string imageName = NewImageName();
         string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
-        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+        string qualifiedImageName = $"{imageName}:{imageTag}";
 
         // Create a new console project
         DirectoryInfo newProjectDir = CreateNewProject("console");
@@ -812,10 +811,9 @@ public void MultiArchStillAllowsSingleRID()
         // images were created locally for each RID
         // and image index was NOT created
         commandResult.Should().Pass()
-            .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
-            .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
-            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to local registry")
-            .And.NotHaveStdOutContaining($"Pushed image '{imageArm64}' to local registry")
+            // no rid-specific path because we didn't pass RuntimeIdentifier
+            .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
+            .And.HaveStdOutContaining($"Pushed image '{qualifiedImageName}' to local registry")
             .And.NotHaveStdOutContaining("Pushed image index");
 
         // Check that the containers can be run
@@ -823,8 +821,8 @@ public void MultiArchStillAllowsSingleRID()
             _testOutput,
             "--rm",
             "--name",
-            $"test-container-{imageName}-x64",
-            imageX64)
+            $"test-container-{imageName}",
+            qualifiedImageName)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
 
@@ -837,8 +835,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
     {
         string imageName = NewImageName();
         string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
-        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+        string qualifiedImageName = $"{imageName}:{imageTag}";
 
         // Create a new console project
         DirectoryInfo newProjectDir = CreateNewProject("console");
@@ -851,7 +848,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
             // make it so the app is _able_ to target both linux TFMs
             "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
             // but then only actually publishes for one of them
-            "-r linux-x64",
+            "-r", "linux-x64",
             $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
             $"/p:ContainerRepository={imageName}",
             $"/p:ContainerImageTag={imageTag}",
@@ -866,8 +863,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
-            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to local registry")
-            .And.NotHaveStdOutContaining($"Pushed image '{imageArm64}' to local registry")
+            .And.HaveStdOutContaining($"Pushed image '{qualifiedImageName}' to local registry")
             .And.NotHaveStdOutContaining("Pushed image index");
 
         // Check that the containers can be run
@@ -876,7 +872,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
             "--rm",
             "--name",
             $"test-container-{imageName}-x64",
-            imageX64)
+            qualifiedImageName)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
 

From 81b3df5c7fb54a30fbafe6c60e9a233a3332b057 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 16 Jan 2025 18:23:37 -0600
Subject: [PATCH 017/127] Fix second test problem by more carefully considering
 the order of single/multi rid checking

---
 .../build/Microsoft.NET.Build.Containers.targets          | 8 ++++----
 .../EndToEndTests.cs                                      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 868614abe354..5a45aa87a8be 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -34,19 +34,19 @@
   <Target Name="ComputeContainerBaseImage"
           Returns="$(ContainerBaseImage)">
     <PropertyGroup>
-      <ContainerRuntimeIdentifiers Condition="'$(BuildingInsideVisualStudio)' != 'true' and '$(ContainerRuntimeIdentifiers)' == '' and '$(IsRidAgnostic)' != 'true'">$(RuntimeIdentifiers)</ContainerRuntimeIdentifiers>
       <!-- The Container RID should default to the RID used for the entire build (to ensure things run on the platform they are built for), but the user knows best and so should be able to set it explicitly.
            For builds that have a RID, we default to that RID. Otherwise, we default to the Linux RID matching the architecture of the currently-executing SDK. -->
-      <ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(ContainerRuntimeIdentifiers)' == '' and '$(IsRidAgnostic)' != 'true'">$(RuntimeIdentifier)</ContainerRuntimeIdentifier>
+      <ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</ContainerRuntimeIdentifier>
       <ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(ContainerRuntimeIdentifiers)' == ''">linux-$(NETCoreSdkPortableRuntimeIdentifier.Split('-')[1])</ContainerRuntimeIdentifier>
+      <ContainerRuntimeIdentifiers Condition="'$(BuildingInsideVisualStudio)' != 'true' and '$(ContainerRuntimeIdentifiers)' == '' and '$(IsRidAgnostic)' != 'true'">$(RuntimeIdentifiers)</ContainerRuntimeIdentifiers>
 
       <_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' == ''">true</_ContainerIsUsingMicrosoftDefaultImages>
       <_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' != ''">false</_ContainerIsUsingMicrosoftDefaultImages>
     </PropertyGroup>
 
     <ItemGroup>
-      <_TargetRuntimeIdentifiers Include="$(ContainerRuntimeIdentifiers)" Condition="'$(ContainerRuntimeIdentifiers)' != ''" />
-      <_TargetRuntimeIdentifiers Include="$(ContainerRuntimeIdentifier)" Condition="'$(ContainerRuntimeIdentifiers)' == ''" />
+      <_TargetRuntimeIdentifiers Include="$(ContainerRuntimeIdentifier)" Condition="'$(ContainerRuntimeIdentifier)' != ''" />
+      <_TargetRuntimeIdentifiers Include="$(ContainerRuntimeIdentifiers)" Condition="@(_TargetRuntimeIdentifiers->Count()) == 0" />
     </ItemGroup>
 
     <ComputeDotnetBaseImageAndTag
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index f60c0bff20dc..943a30026cbb 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -861,8 +861,8 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
         // images were created locally for each RID
         // and image index was NOT created
         commandResult.Should().Pass()
-            .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
-            .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
+            .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64", configuration: "Release"))
+            .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64", configuration: "Release"))
             .And.HaveStdOutContaining($"Pushed image '{qualifiedImageName}' to local registry")
             .And.NotHaveStdOutContaining("Pushed image index");
 
@@ -900,8 +900,8 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
         return newProjectDir;
     }
 
-    private string GetPublishArtifactsPath(string projectDir, string rid)
-        => Path.Combine(projectDir, "bin", "Debug", ToolsetInfo.CurrentTargetFramework, rid, "publish");
+    private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
+        => Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
 
     [DockerSupportsArchFact("linux/arm64")]
     public void EndToEndMultiArch_ArchivePublishing()

From 605bc4d9de4702636a7227ad5f0b7534b452d15e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 05:01:54 +0000
Subject: [PATCH 018/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250116.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25064.11 -> To Version 8.0.0-beta.25066.6
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 eng/common/sdk-task.ps1 |  2 +-
 eng/common/tools.ps1    |  4 ++--
 global.json             |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 754169a3044f..b93ee049e67b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25064.11">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
+      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25064.11">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
+      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25064.11">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
+      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25064.11">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
+      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9ad4977a8231..19b91a625601 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25064.11</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25064.11</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 73828dd30d31..4f0546dce120 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
       $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
     }
     if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
         $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 60352ede194e..a00577ed17aa 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # If the version of msbuild is going to be xcopied,
   # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
-  $defaultXCopyMSBuildVersion = '17.8.1-2'
+  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
+  $defaultXCopyMSBuildVersion = '17.12.0'
 
   if (!$vsRequirements) {
     if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
diff --git a/global.json b/global.json
index d785ea18f069..8b18dee78510 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25064.11"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
   }
 }

From 809a22affb3435b26c72cc3c9660e058f27a675c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 05:01:56 +0000
Subject: [PATCH 019/127] Update dependencies from
 https://github.com/dotnet/templating build 20250116.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.309-servicing.25062.11 -> To Version 8.0.309-servicing.25066.1
---
 NuGet.config            | 19 ++++++++++++++++++-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 3e4099f6c0bb..49fd094d2eae 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,9 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-86f5186d/nuget/v3/index.json" />
@@ -20,6 +23,9 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-7c2b926" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7c2b9262/nuget/v3/index.json" />
@@ -28,12 +34,16 @@
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-499f473" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-499f473f/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -60,6 +70,9 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
@@ -76,9 +89,13 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
     <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 208a452a5c9f..493b0f50a0e3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.309">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>499f473f00b21f4d2cb2a979769cba765032cb8a</Sha>
+      <Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.309-servicing.25062.11">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.309-servicing.25066.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>499f473f00b21f4d2cb2a979769cba765032cb8a</Sha>
+      <Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.309-servicing.25062.11">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.309-servicing.25066.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>499f473f00b21f4d2cb2a979769cba765032cb8a</Sha>
+      <Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index 616a2ce7be6a..5f495e7b0d88 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.309-servicing.25062.11</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.309-servicing.25066.1</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From d0024ccf6d17d411db351cffdee7d62893157ad1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 05:02:00 +0000
Subject: [PATCH 020/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250116.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25064.11 -> To Version 8.0.0-beta.25066.6
---
 NuGet.config            | 17 +++++++++++++++++
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 eng/common/sdk-task.ps1 |  2 +-
 eng/common/tools.ps1    |  4 ++--
 global.json             |  4 ++--
 6 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 3e4099f6c0bb..e34a709e5726 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,9 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-86f5186d/nuget/v3/index.json" />
@@ -20,6 +23,9 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-7c2b926" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7c2b9262/nuget/v3/index.json" />
@@ -28,12 +34,16 @@
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-499f473" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-499f473f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -60,6 +70,9 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
@@ -76,9 +89,13 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
     <add key="darc-int-dotnet-runtime-89ef51c" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 208a452a5c9f..519c6ddfab9c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25064.11">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
+      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25064.11">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
+      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25064.11">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
+      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25064.11">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>872c7fa04100b26c93f66f8ca5d0519d056c5861</Sha>
+      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 616a2ce7be6a..2158e51746b4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25064.11</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25064.11</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 73828dd30d31..4f0546dce120 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
       $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
     }
     if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
         $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 60352ede194e..a00577ed17aa 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # If the version of msbuild is going to be xcopied,
   # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
-  $defaultXCopyMSBuildVersion = '17.8.1-2'
+  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
+  $defaultXCopyMSBuildVersion = '17.12.0'
 
   if (!$vsRequirements) {
     if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
diff --git a/global.json b/global.json
index d785ea18f069..8b18dee78510 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25064.11"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
   }
 }

From 44a65477553df8aba3de97b77bb85e63384bcc20 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 16 Jan 2025 23:02:08 -0600
Subject: [PATCH 021/127] fix ordering to make sure that we only ever _write_ a
 default value after we've checked all possible user-provided values

---
 .../packaging/build/Microsoft.NET.Build.Containers.targets      | 2 +-
 .../EndToEndTests.cs                                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 5a45aa87a8be..2a006d665a6b 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -37,8 +37,8 @@
       <!-- The Container RID should default to the RID used for the entire build (to ensure things run on the platform they are built for), but the user knows best and so should be able to set it explicitly.
            For builds that have a RID, we default to that RID. Otherwise, we default to the Linux RID matching the architecture of the currently-executing SDK. -->
       <ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</ContainerRuntimeIdentifier>
-      <ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(ContainerRuntimeIdentifiers)' == ''">linux-$(NETCoreSdkPortableRuntimeIdentifier.Split('-')[1])</ContainerRuntimeIdentifier>
       <ContainerRuntimeIdentifiers Condition="'$(BuildingInsideVisualStudio)' != 'true' and '$(ContainerRuntimeIdentifiers)' == '' and '$(IsRidAgnostic)' != 'true'">$(RuntimeIdentifiers)</ContainerRuntimeIdentifiers>
+      <ContainerRuntimeIdentifier Condition="'$(ContainerRuntimeIdentifier)' == '' and '$(ContainerRuntimeIdentifiers)' == ''">linux-$(NETCoreSdkPortableRuntimeIdentifier.Split('-')[1])</ContainerRuntimeIdentifier>
 
       <_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' == ''">true</_ContainerIsUsingMicrosoftDefaultImages>
       <_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' != ''">false</_ContainerIsUsingMicrosoftDefaultImages>
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 943a30026cbb..3b0015a10f0a 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -1276,7 +1276,7 @@ public void EndToEndMultiArch_Labels()
         // Run PublishContainer for multi-arch with ContainerGenerateLabels
         new DotnetCommand(
             _testOutput,
-            "build",
+            "publish",
             "/t:PublishContainer",
             "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
             $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",

From 55168de68e3071a5217001a70902b5e1599ca773 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 06:55:32 +0000
Subject: [PATCH 022/127] Update dependencies from
 https://github.com/dotnet/templating build 20250116.8

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25062.5 -> To Version 8.0.113-servicing.25066.8
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 509e4a9bd001..c334ee4b4e40 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -36,7 +36,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-4d0f12a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4d0f12a0/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9b184ebe4c8a..997cd06556d0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.113">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4d0f12a0d6a2cfd586d8308021be21c61ef9c52f</Sha>
+      <Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.113-servicing.25065.1">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.113-servicing.25066.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4d0f12a0d6a2cfd586d8308021be21c61ef9c52f</Sha>
+      <Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.113-servicing.25065.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.113-servicing.25066.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4d0f12a0d6a2cfd586d8308021be21c61ef9c52f</Sha>
+      <Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index 2b24a4c9afb9..65820b370a78 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.113-servicing.25065.1</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.113-servicing.25066.8</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 7be3985e8238c5d5127acd32bad65f21b1d65ebc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 05:02:08 +0000
Subject: [PATCH 023/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250117.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25067.1
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67da9f6730ec..7b66829361c9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25067.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
+      <Sha>f896ca2ca61f482526e25ea092b11eadaa682c68</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From 3ac3563c19cda87c11eac2aacbdd56fb867bd88f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 05:02:15 +0000
Subject: [PATCH 024/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250117.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25067.1
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87da96b25065..4d050fe27a39 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25067.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
+      <Sha>f896ca2ca61f482526e25ea092b11eadaa682c68</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From c148a53e6165f7953711c81af7083c4724bd1462 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 05:02:17 +0000
Subject: [PATCH 025/127] Update dependencies from
 https://github.com/dotnet/templating build 20250116.9

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.309-servicing.25066.1 -> To Version 8.0.309-servicing.25066.9
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 49fd094d2eae..d4beb22b84c5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,7 +37,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-6ede63a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6ede63a6/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87da96b25065..c1e2d85c19cc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.309">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
+      <Sha>6ede63a60b3426dad74a95eb1bcddf5669d067c2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.309-servicing.25066.1">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.309-servicing.25066.9">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
+      <Sha>6ede63a60b3426dad74a95eb1bcddf5669d067c2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.309-servicing.25066.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.309-servicing.25066.9">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>ee4a55eed3826b986bdacb0a833061fe2e7e54cc</Sha>
+      <Sha>6ede63a60b3426dad74a95eb1bcddf5669d067c2</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index a0beb2aa63e7..ef179ad16f7b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.309-servicing.25066.1</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.309-servicing.25066.9</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 872679832369e4da71469c1c93bbbe540c8d25bb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 05:02:22 +0000
Subject: [PATCH 026/127] Update dependencies from
 https://github.com/dotnet/templating build 20250116.12

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.406-servicing.25066.2 -> To Version 8.0.406-servicing.25066.12
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9a7c8ee1ea01..0e2360657fbd 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,7 +37,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78823ee85fe2..0be96e9b705e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.406">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>93a589449f7f40bbef42d1e8df97737b1ba976ed</Sha>
+      <Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.406-servicing.25066.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.406-servicing.25066.12">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>93a589449f7f40bbef42d1e8df97737b1ba976ed</Sha>
+      <Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.406-servicing.25066.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.406-servicing.25066.12">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>93a589449f7f40bbef42d1e8df97737b1ba976ed</Sha>
+      <Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index 679fa1eddb64..b4b738ea155e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.406-servicing.25066.2</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.406-servicing.25066.12</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From b0e9724c259889021a37c99124e920da4366bfc8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 05:02:25 +0000
Subject: [PATCH 027/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250117.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25067.1
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78823ee85fe2..1f8afa8ed8e5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25067.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
+      <Sha>f896ca2ca61f482526e25ea092b11eadaa682c68</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From edd7d922b29408159a3172b8a9a16b2e734b9403 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 21 Jan 2025 05:01:46 +0000
Subject: [PATCH 028/127] Update dependencies from
 https://github.com/dotnet/msbuild build 20250120.13

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.10.14-preview-24613-10 -> To Version 17.10.18-preview-25070-13
---
 NuGet.config            |  3 ++-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 49fd094d2eae..560cea0a5894 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -28,7 +28,8 @@
     <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-7c2b926" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7c2b9262/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-789a00e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-789a00e8/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-789a00e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-789a00e8-1/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87da96b25065..63f8501e126c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.10.14">
+    <Dependency Name="Microsoft.Build" Version="17.10.18">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
+      <Sha>789a00e84038641e94b712bb22c133741e7daf85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.10.14-preview-24613-10">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.10.18-preview-25070-13">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
+      <Sha>789a00e84038641e94b712bb22c133741e7daf85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.14-preview-24613-10">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.18-preview-25070-13">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>7c2b92622c44c2d0ad0cc9d9f5fa2796d0c5c81c</Sha>
+      <Sha>789a00e84038641e94b712bb22c133741e7daf85</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
diff --git a/eng/Versions.props b/eng/Versions.props
index a0beb2aa63e7..b64419dfd403 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,7 +124,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.10.14</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.10.18</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
     <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.10.14-preview-24613-10</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.10.18-preview-25070-13</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From 164a867866b1e390f00e14d093c1833904c65c22 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 21 Jan 2025 07:03:51 +0000
Subject: [PATCH 029/127] Update dependencies from
 https://github.com/dotnet/msbuild build 20250121.4

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.8.18-preview-25066-03 -> To Version 17.8.19-preview-25071-04
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e9ee8ac05b38..12d4303a5113 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -27,7 +27,7 @@
     <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-31744df" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-31744dfc/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-c3ade83" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c3ade832/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67da9f6730ec..0a62d9aa4f58 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.8.18">
+    <Dependency Name="Microsoft.Build" Version="17.8.19">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
+      <Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.8.18-preview-25066-03">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.8.19-preview-25071-04">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
+      <Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.18-preview-25066-03">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.19-preview-25071-04">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>31744dfcae98daa4dcc011c6ebf6d404b93fcf5c</Sha>
+      <Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index d83a97a85d7e..ca3d7a10c163 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -121,7 +121,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.8.18</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.8.19</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -130,7 +130,7 @@
     <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.8.18-preview-25066-03</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.8.19-preview-25071-04</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From 50df1c97e870226f5a7a2ce6f259de47462ff4a0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 05:02:51 +0000
Subject: [PATCH 030/127] Update dependencies from
 https://github.com/dotnet/msbuild build 20250121.10

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.10.14-preview-24613-10 -> To Version 17.10.19-preview-25071-10
---
 NuGet.config            |  3 +--
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 560cea0a5894..16fc2a17b27e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -28,8 +28,7 @@
     <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-789a00e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-789a00e8/nuget/v3/index.json" />
-    <add key="darc-pub-DotNet-msbuild-Trusted-789a00e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-789a00e8-1/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-939cc33" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-939cc332/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 63f8501e126c..0cc815364a6a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.10.18">
+    <Dependency Name="Microsoft.Build" Version="17.10.19">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>789a00e84038641e94b712bb22c133741e7daf85</Sha>
+      <Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.10.18-preview-25070-13">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.10.19-preview-25071-10">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>789a00e84038641e94b712bb22c133741e7daf85</Sha>
+      <Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.18-preview-25070-13">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.19-preview-25071-10">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>789a00e84038641e94b712bb22c133741e7daf85</Sha>
+      <Sha>939cc332cc357d59cc6cfdde70ddc03372e22c26</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
diff --git a/eng/Versions.props b/eng/Versions.props
index b64419dfd403..779dd0b3a99c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,7 +124,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.10.18</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.10.19</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
     <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.10.18-preview-25070-13</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.10.19-preview-25071-10</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From 0d9dad7e039a353916b4fd504cb7644f32ab34af Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 05:02:54 +0000
Subject: [PATCH 031/127] Update dependencies from
 https://github.com/dotnet/msbuild build 20250122.1

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.11.22-servicing-25065-03 -> To Version 17.11.24-servicing-25072-01
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9a7c8ee1ea01..1698848e3ee7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -28,7 +28,7 @@
     <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-17752ce" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-17752ceb/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-89b5892" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-89b58924/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78823ee85fe2..0702acefe5c8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.11.22">
+    <Dependency Name="Microsoft.Build" Version="17.11.24">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
+      <Sha>89b58924da213679505c63060e5c84786865000f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.11.22-servicing-25065-03">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.11.24-servicing-25072-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
+      <Sha>89b58924da213679505c63060e5c84786865000f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.22-servicing-25065-03">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.24-servicing-25072-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>17752cebd2495744980da84649957e5b66144af0</Sha>
+      <Sha>89b58924da213679505c63060e5c84786865000f</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index 679fa1eddb64..4c5415d39c2f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,7 +124,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.11.22</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.11.24</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
     <MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.11.22-servicing-25065-03</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.11.24-servicing-25072-01</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From d33ab31bc9f8e67275dc49a539743c62ee761cc6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 06:09:08 +0000
Subject: [PATCH 032/127] Update dependencies from
 https://github.com/dotnet/roslyn build 20250121.7

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.8.0-7.25056.18 -> To Version 4.8.0-7.25071.7
---
 eng/Version.Details.xml | 28 ++++++++++++++--------------
 eng/Versions.props      | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67da9f6730ec..e8c4d9fde335 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -82,34 +82,34 @@
       <Sha>27f18656aab37d71839f562c0653afce07a2d2fd</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.25056.18">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.25071.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha>
+      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.25056.18">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.25071.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha>
+      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.25056.18">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.25071.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha>
+      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.25056.18">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.25071.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha>
+      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.25056.18">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.25071.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha>
+      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.25056.18">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.25071.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha>
+      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.25056.18">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.25071.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha>
+      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d83a97a85d7e..dea3c26f0160 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -154,13 +154,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.25056.18</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>4.8.0-7.25056.18</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.25056.18</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.25056.18</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.25056.18</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.25056.18</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.25056.18</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.25071.7</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <PropertyGroup>

From bfef062f19e0388b28caa0b41335947e36500a78 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 07:11:28 +0000
Subject: [PATCH 033/127] Update dependencies from
 https://github.com/dotnet/roslyn build 20250121.8

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.8.0-7.25056.18 -> To Version 4.8.0-7.25071.8
---
 eng/Version.Details.xml | 28 ++++++++++++++--------------
 eng/Versions.props      | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e8c4d9fde335..11985a332408 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -82,34 +82,34 @@
       <Sha>27f18656aab37d71839f562c0653afce07a2d2fd</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.25071.7">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.25071.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
+      <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.25071.7">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.25071.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
+      <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.25071.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.25071.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
+      <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.25071.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.25071.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
+      <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.25071.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.25071.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
+      <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.25071.7">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.25071.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
+      <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.25071.7">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.25071.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>db3db2bdeec36cb69bc63f238aed1e91f7b3f8e8</Sha>
+      <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.12-servicing.24603.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index dea3c26f0160..d93331aed6e6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -154,13 +154,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.25071.7</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.25071.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.25071.8</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <PropertyGroup>

From e7b6cffb2c0dcdfcfe4d0e63d9a840a814d469c0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 22:03:12 +0000
Subject: [PATCH 034/127] Update dependencies from
 https://github.com/dotnet/roslyn-analyzers build 20250124.1

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers
 From Version 3.11.0-beta1.24303.2 -> To Version 3.11.0-beta1.25074.1
---
 NuGet.config            |  3 +++
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e9ee8ac05b38..6a3356b86601 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,6 +37,9 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67da9f6730ec..de4fe4f8408b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -327,17 +327,17 @@
       <Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
       <SourceBuild RepoName="xdt" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.24303.2">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.25074.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>223fa62ea09457588b4b0f88ee8ac62ea5ab5db5</Sha>
+      <Sha>de4aff542dacdc8027c1b4c4580a385dc097341f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.24303.2">
+    <Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.25074.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>223fa62ea09457588b4b0f88ee8ac62ea5ab5db5</Sha>
+      <Sha>de4aff542dacdc8027c1b4c4580a385dc097341f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.11.0-beta1.24303.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.11.0-beta1.25074.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>223fa62ea09457588b4b0f88ee8ac62ea5ab5db5</Sha>
+      <Sha>de4aff542dacdc8027c1b4c4580a385dc097341f</Sha>
       <SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1">
diff --git a/eng/Versions.props b/eng/Versions.props
index d83a97a85d7e..2ddd6e8b80e8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -116,8 +116,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.24303.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
-    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.24303.2</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.25074.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.25074.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->

From 8f4dcccbb20fbce041d0d94f0e394411e7395ee3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 25 Jan 2025 05:02:29 +0000
Subject: [PATCH 035/127] Update dependencies from
 https://github.com/dotnet/format build 20250124.1

dotnet-format
 From Version 8.3.546805 -> To Version 8.3.607401
---
 NuGet.config            | 23 ++++-------------------
 eng/Version.Details.xml |  6 +++---
 eng/Versions.props      |  2 +-
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 49fd094d2eae..af4ba179e3ed 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,16 +10,7 @@
     <add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-pub-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-86f5186d/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-9/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-6/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-10/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
@@ -38,6 +29,9 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
@@ -77,15 +71,6 @@
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-int-dotnet-format-86f5186-1" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-10" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-2" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-3" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-4" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-5" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-6" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-9" value="true" />
-    <add key="darc-int-dotnet-format-86f5186" value="true" />
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87da96b25065..4a23747628f8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -77,9 +77,9 @@
       <Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-format" Version="8.3.546805">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-format</Uri>
-      <Sha>86f5186deeea364bd8541d51657e52a54b2a96b2</Sha>
+    <Dependency Name="dotnet-format" Version="8.3.607401">
+      <Uri>https://github.com/dotnet/format</Uri>
+      <Sha>42ef1d04e544c2a0dca064f9fc982639ca516a84</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.25064.8">
diff --git a/eng/Versions.props b/eng/Versions.props
index a0beb2aa63e7..2b09006c8920 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -115,7 +115,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/format -->
-    <dotnetformatVersion>8.3.546805</dotnetformatVersion>
+    <dotnetformatVersion>8.3.607401</dotnetformatVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

From 193b4984384a637c8c471520416c8ed02fd095a8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 25 Jan 2025 05:02:32 +0000
Subject: [PATCH 036/127] Update dependencies from
 https://github.com/dotnet/format build 20250124.1

dotnet-format
 From Version 8.3.546805 -> To Version 8.3.607401
---
 NuGet.config            | 23 ++++-------------------
 eng/Version.Details.xml |  6 +++---
 eng/Versions.props      |  2 +-
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9a7c8ee1ea01..c1bca0e0ed9e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,16 +10,7 @@
     <add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-pub-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-86f5186d/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-9/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-6/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-10/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-86f5186-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
@@ -38,6 +29,9 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
@@ -75,15 +69,6 @@
     <add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
     <add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-int-dotnet-format-86f5186-1" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-10" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-2" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-3" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-4" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-5" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-6" value="true" />
-    <add key="darc-int-dotnet-format-86f5186-9" value="true" />
-    <add key="darc-int-dotnet-format-86f5186" value="true" />
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78823ee85fe2..8d5a9db737f7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -77,9 +77,9 @@
       <Sha>e11d7079bebc6f101c5313fe0d1de9e3d38a7c02</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-format" Version="8.3.546805">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-format</Uri>
-      <Sha>86f5186deeea364bd8541d51657e52a54b2a96b2</Sha>
+    <Dependency Name="dotnet-format" Version="8.3.607401">
+      <Uri>https://github.com/dotnet/format</Uri>
+      <Sha>42ef1d04e544c2a0dca064f9fc982639ca516a84</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24554.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index 679fa1eddb64..526d62fcd29f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -115,7 +115,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/format -->
-    <dotnetformatVersion>8.3.546805</dotnetformatVersion>
+    <dotnetformatVersion>8.3.607401</dotnetformatVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

From d0d2b5a8f2be97347ac9da6a3fd90d0a2b356382 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 26 Jan 2025 10:43:38 +0000
Subject: [PATCH 037/127] Update dependencies from
 https://github.com/dotnet/roslyn build 20250126.5

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.8.0-7.25056.18 -> To Version 4.8.0-7.25076.5
---
 NuGet.config            |  3 +++
 eng/Version.Details.xml | 14 +++++++-------
 eng/Versions.props      | 14 +++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e9ee8ac05b38..6a3356b86601 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,6 +37,9 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 11985a332408..1da6cde4011e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -82,32 +82,32 @@
       <Sha>27f18656aab37d71839f562c0653afce07a2d2fd</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.25071.8">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.25076.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.25071.8">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.25076.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.25071.8">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.25076.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.25071.8">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.25076.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.25071.8">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.25076.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.25071.8">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.25076.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.25071.8">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.25076.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>0b9f6c99764f3c38694b3be6e61a95f52350f60f</Sha>
     </Dependency>
diff --git a/eng/Versions.props b/eng/Versions.props
index d93331aed6e6..334d42cb7ab2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -154,13 +154,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.25071.8</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.25071.8</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.25076.5</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>4.8.0-7.25076.5</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.25076.5</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.25076.5</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.25076.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.25076.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.25076.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <PropertyGroup>

From 81bcbf3a23c7cc576659d900486de23e13b22de2 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Tue, 28 Jan 2025 20:46:40 +0100
Subject: [PATCH 038/127] fix e2e test after checking option 'Use containerd
 for pulling and storing images'

---
 .../EndToEndTests.cs                                          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 3b0015a10f0a..1cef040a5e34 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -1033,6 +1033,8 @@ public void EndToEndMultiArch_RemoteRegistry()
         CommandResult processResultX64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/amd64",
             "--name",
             $"test-container-{imageName}-x64",
             imageX64Tagged)
@@ -1056,6 +1058,8 @@ public void EndToEndMultiArch_RemoteRegistry()
         CommandResult processResultArm64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/arm64",
             "--name",
             $"test-container-{imageName}-arm64",
             imageArm64Tagged)

From 9491115c353d780f6d3fd18cb730d7d73d6e2547 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 05:01:54 +0000
Subject: [PATCH 039/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250128.5

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25078.5
---
 NuGet.config            | 4 ++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e9ee8ac05b38..fdecc2953882 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,6 +37,10 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7b66829361c9..34b8c4651c2d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25067.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25078.5">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>f896ca2ca61f482526e25ea092b11eadaa682c68</Sha>
+      <Sha>1dd9567ef4d740f9f2488e7e3579d68906f791c6</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From 2d63237f333ea7334e870987169eb68c101a35d0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 05:02:00 +0000
Subject: [PATCH 040/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250128.5

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25078.5
---
 NuGet.config            | 4 ++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 49fd094d2eae..32d5c4822c85 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,10 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4d050fe27a39..7d0546b1ea08 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25067.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25078.5">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>f896ca2ca61f482526e25ea092b11eadaa682c68</Sha>
+      <Sha>1dd9567ef4d740f9f2488e7e3579d68906f791c6</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From cbb113573f0a5759bed972336c787177407f7612 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 05:02:13 +0000
Subject: [PATCH 041/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250128.5

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25078.5
---
 NuGet.config            | 4 ++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9a7c8ee1ea01..f882bd100ca9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,10 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1f8afa8ed8e5..61fa00f3edd4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25067.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25078.5">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>f896ca2ca61f482526e25ea092b11eadaa682c68</Sha>
+      <Sha>1dd9567ef4d740f9f2488e7e3579d68906f791c6</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From 01a9c07e64901baf22a85ab43ff99c76cdecc992 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 29 Jan 2025 13:24:00 +0100
Subject: [PATCH 042/127] refactor BuiltImage

---
 .../Microsoft.NET.Build.Containers/BuiltImage.cs  | 15 ++++++++++-----
 .../ImageBuilder.cs                               |  8 +++++---
 .../LocalDaemons/DockerCli.cs                     | 13 +++++--------
 .../Registry/Registry.cs                          |  8 +++-----
 .../Tasks/CreateNewImage.cs                       |  4 ++--
 .../EndToEndTests.cs                              |  3 ++-
 6 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
index 64d4e9a528ef..c4572b878340 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
@@ -24,20 +24,25 @@ internal readonly struct BuiltImage
     internal required string ImageSha { get; init; }
 
     /// <summary>
-    /// Gets image size.
+    /// Gets image manifest.
     /// </summary>
-    internal required long ImageSize { get; init; }
+    internal required string Manifest { get; init; } 
 
     /// <summary>
-    /// Gets image manifest.
+    /// Gets manifest digest.
     /// </summary>
-    internal required ManifestV2 Manifest { get; init; }
+    internal required string ManifestDigest { get; init; }
 
     /// <summary>
     /// Gets manifest mediaType.
     /// </summary>
     internal required string ManifestMediaType { get; init; }
 
+    /// <summary>
+    /// Gets image layers.
+    /// </summary>
+    internal required List<ManifestLayer> Layers { get; init; }
+
     /// <summary>
     /// Gets layers descriptors.
     /// </summary>
@@ -45,7 +50,7 @@ internal IEnumerable<Descriptor> LayerDescriptors
     {
         get
         {
-            List<ManifestLayer> layersNode = Manifest.Layers ?? throw new NotImplementedException("Tried to get layer information but there is no layer node?");
+            List<ManifestLayer> layersNode = Layers ?? throw new NotImplementedException("Tried to get layer information but there is no layer node?");
             foreach (ManifestLayer layer in layersNode)
             {
                 yield return new(layer.mediaType, layer.digest, layer.size);
diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs
index bf0876344f28..633ca8e98860 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs
@@ -5,6 +5,7 @@
 using Microsoft.NET.Build.Containers.Resources;
 using Microsoft.Extensions.Logging;
 using System.Text.RegularExpressions;
+using System.Text.Json;
 
 namespace Microsoft.NET.Build.Containers;
 
@@ -86,9 +87,10 @@ internal BuiltImage Build()
             Config = imageJsonStr,
             ImageDigest = imageDigest,
             ImageSha = imageSha,
-            ImageSize = imageSize,
-            Manifest = newManifest,
-            ManifestMediaType = ManifestMediaType
+            Manifest = JsonSerializer.SerializeToNode(newManifest)?.ToJsonString() ?? "",
+            ManifestDigest = newManifest.GetDigest(),
+            ManifestMediaType = ManifestMediaType,
+            Layers = _manifest.Layers
         };
     }
 
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 7e779e9ec3c0..dc151bd7836f 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -279,7 +279,7 @@ public static async Task WriteImageToStreamAsync(BuiltImage image, SourceImageRe
         }
         else
         {
-            throw new ArgumentException(Resource.FormatString(nameof(Strings.UnsupportedMediaTypeForTarball), image.Manifest.MediaType));
+            throw new ArgumentException(Resource.FormatString(nameof(Strings.UnsupportedMediaTypeForTarball), image.ManifestMediaType));
         }
     }
 
@@ -441,12 +441,9 @@ private static async Task WriteManifestForOciImage(
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        string manifestContent = JsonSerializer.SerializeToNode(image.Manifest)!.ToJsonString();
-        string manifestDigest = image.Manifest.GetDigest();
-
         // 1. add manifest to blobs
-        string manifestPath = $"{_blobsPath}/{manifestDigest.Substring("sha256:".Length)}";
-        using (MemoryStream manifestStream = new MemoryStream(Encoding.UTF8.GetBytes(manifestContent)))
+        string manifestPath = $"{_blobsPath}/{image.ManifestDigest.Substring("sha256:".Length)}";
+        using (MemoryStream manifestStream = new MemoryStream(Encoding.UTF8.GetBytes(image.Manifest)))
         {
             PaxTarEntry manifestEntry = new(TarEntryType.RegularFile, manifestPath)
             {
@@ -467,8 +464,8 @@ private static async Task WriteManifestForOciImage(
                 new PlatformSpecificOciManifest
                 {
                     mediaType = SchemaTypes.OciManifestV1,
-                    size = manifestContent.Length,
-                    digest = manifestDigest,
+                    size = image.Manifest.Length,
+                    digest = image.ManifestDigest,
                     annotations = new Dictionary<string, string> { { "org.opencontainers.image.ref.name", $"{destinationReference.Repository}:{destinationReference.Tags[0]}" } }
                 }
             ]
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
index f09cfd6fd4a3..5ab07dc9713e 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
@@ -602,22 +602,20 @@ private async Task PushAsync(BuiltImage builtImage, SourceImageReference source,
         // Tags can refer to an image manifest or an image manifest list.
         // In the first case, we push tags to the registry.
         // In the second case, we push the manifest digest so the manifest list can refer to it.
-        string manifestJson = JsonSerializer.SerializeToNode(builtImage.Manifest)?.ToJsonString() ?? "";
         if (pushTags)
         {
             Debug.Assert(destination.Tags.Length > 0);
             foreach (string tag in destination.Tags)
             {
                 _logger.LogInformation(Strings.Registry_TagUploadStarted, tag, RegistryName);
-                await _registryAPI.Manifest.PutAsync(destination.Repository, tag, manifestJson, builtImage.ManifestMediaType, cancellationToken).ConfigureAwait(false);
+                await _registryAPI.Manifest.PutAsync(destination.Repository, tag, builtImage.Manifest, builtImage.ManifestMediaType, cancellationToken).ConfigureAwait(false);
                 _logger.LogInformation(Strings.Registry_TagUploaded, tag, RegistryName);
             }
         }
         else
         {
-            string manifestDigest = builtImage.Manifest.GetDigest();
-            _logger.LogInformation(Strings.Registry_ManifestUploadStarted, RegistryName, manifestDigest);
-            await _registryAPI.Manifest.PutAsync(destination.Repository, manifestDigest, manifestJson, builtImage.ManifestMediaType, cancellationToken).ConfigureAwait(false);
+            _logger.LogInformation(Strings.Registry_ManifestUploadStarted, RegistryName, builtImage.ManifestDigest);
+            await _registryAPI.Manifest.PutAsync(destination.Repository, builtImage.ManifestDigest, builtImage.Manifest, builtImage.ManifestMediaType, cancellationToken).ConfigureAwait(false);
             _logger.LogInformation(Strings.Registry_ManifestUploaded, RegistryName);
         }
     }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index 25ba26080af9..7368fd337596 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -170,9 +170,9 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
         cancellationToken.ThrowIfCancellationRequested();
 
         // at this point we're done with modifications and are just pushing the data other places
-        GeneratedContainerManifest = JsonSerializer.Serialize(builtImage.Manifest);
+        GeneratedContainerManifest = builtImage.Manifest;
         GeneratedContainerConfiguration = builtImage.Config;
-        GeneratedContainerDigest = builtImage.Manifest.GetDigest();
+        GeneratedContainerDigest = builtImage.ManifestDigest;
         GeneratedArchiveOutputPath = ArchiveOutputPath;
         GeneratedContainerMediaType = builtImage.ManifestMediaType;
         GeneratedContainerNames = destinationImageReference.FullyQualifiedImageNames().Select(name => new Microsoft.Build.Utilities.TaskItem(name)).ToArray();
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 1cef040a5e34..2d562b4feaa7 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -235,9 +235,10 @@ private BuiltImage ConvertToOciImage(BuiltImage builtImage)
             Config = builtImage.Config,
             ImageDigest = builtImage.ImageDigest,
             ImageSha = builtImage.ImageSha,
-            ImageSize = builtImage.ImageSize,
             Manifest = builtImage.Manifest,
+            ManifestDigest = builtImage.ManifestDigest,
             ManifestMediaType = SchemaTypes.OciManifestV1,
+            Layers = builtImage.Layers
         };
 
         return ociImage;

From 93fb13415c52f9ae0c5b23b64281ac4af29ac77b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2025 05:01:33 +0000
Subject: [PATCH 043/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250131.5

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25081.5
---
 NuGet.config            | 4 ++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index fdecc2953882..6d4d8a6b53a9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,6 +37,10 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-5/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-335a66e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-4/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 34b8c4651c2d..4d1f4e276ca4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25078.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>1dd9567ef4d740f9f2488e7e3579d68906f791c6</Sha>
+      <Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From 6e9238aa3016439a87122d56b9d0d6561a4658db Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2025 05:01:37 +0000
Subject: [PATCH 044/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250131.5

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25081.5
---
 NuGet.config            | 4 ++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 32d5c4822c85..e5b1c2c05c3f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,10 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-5/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7d0546b1ea08..0debd85ae86e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25078.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>1dd9567ef4d740f9f2488e7e3579d68906f791c6</Sha>
+      <Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From 8af5ca0c1904a9cb57a4872d989a51b301d6c214 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2025 05:01:41 +0000
Subject: [PATCH 045/127] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250131.5

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25081.5
---
 NuGet.config            | 4 ++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f882bd100ca9..a96abe370a50 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,10 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 61fa00f3edd4..75fe06e2fbc3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25078.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>1dd9567ef4d740f9f2488e7e3579d68906f791c6</Sha>
+      <Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From d973c0e7d210d71d922f6b33e43c92a968519f8a Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 29 Jan 2025 18:43:37 +0100
Subject: [PATCH 046/127] refactor single-arch oci tarball publishing

---
 .../LocalDaemons/DockerCli.cs                 | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index dc151bd7836f..68e06d044c3c 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -7,6 +7,7 @@
 #endif
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.Extensions.Logging;
 using Microsoft.NET.Build.Containers.Resources;
@@ -396,12 +397,13 @@ private static async Task WriteOciImageToStreamAsync(
         Stream imageStream,
         CancellationToken cancellationToken)
     {
+        cancellationToken.ThrowIfCancellationRequested();
+
         if (destinationReference.Tags.Length > 1)
         {
             throw new ArgumentException(Resource.FormatString(nameof(Strings.OciImageMultipleTagsNotSupported)));
         }
 
-        cancellationToken.ThrowIfCancellationRequested();
         using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true);
 
         await WriteOciLayout(writer, cancellationToken)
@@ -413,7 +415,10 @@ await WriteImageLayers(writer, image, sourceReference, d => $"{_blobsPath}/{d.Su
         await WriteImageConfig(writer, image, $"{_blobsPath}/{image.ImageSha}", cancellationToken)
             .ConfigureAwait(false);
 
-        await WriteManifestForOciImage(writer, image, destinationReference, cancellationToken)
+        await WriteManifestForOciImage(writer, image, cancellationToken)
+            .ConfigureAwait(false);
+
+        await WriteIndexJsonForOciImage(writer, image, destinationReference, cancellationToken)
             .ConfigureAwait(false);
     }
 
@@ -436,12 +441,10 @@ private static async Task WriteOciLayout(TarWriter writer, CancellationToken can
     private static async Task WriteManifestForOciImage(
         TarWriter writer,
         BuiltImage image,
-        DestinationImageReference destinationReference,
         CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        // 1. add manifest to blobs
         string manifestPath = $"{_blobsPath}/{image.ManifestDigest.Substring("sha256:".Length)}";
         using (MemoryStream manifestStream = new MemoryStream(Encoding.UTF8.GetBytes(image.Manifest)))
         {
@@ -451,10 +454,18 @@ private static async Task WriteManifestForOciImage(
             };
             await writer.WriteEntryAsync(manifestEntry, cancellationToken).ConfigureAwait(false);
         }
+    }
 
+    private static async Task WriteIndexJsonForOciImage(
+        TarWriter writer,
+        BuiltImage image,
+        DestinationImageReference destinationReference,
+        CancellationToken cancellationToken)
+    {
         cancellationToken.ThrowIfCancellationRequested();
 
-        // 2. add index.json
+        string tag = destinationReference.Tags[0];
+
         var index = new ImageIndexV1
         {
             schemaVersion = 2,
@@ -466,11 +477,20 @@ private static async Task WriteManifestForOciImage(
                     mediaType = SchemaTypes.OciManifestV1,
                     size = image.Manifest.Length,
                     digest = image.ManifestDigest,
-                    annotations = new Dictionary<string, string> { { "org.opencontainers.image.ref.name", $"{destinationReference.Repository}:{destinationReference.Tags[0]}" } }
+                    annotations = new Dictionary<string, string> 
+                    {
+                        { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
+                        { "org.opencontainers.image.ref.name", tag } 
+                    }
                 }
             ]
         };
-        using (MemoryStream indexStream = new MemoryStream(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index)!.ToJsonString())))
+
+        var options = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        };
+        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index, options)!.ToJsonString())))
         {
             PaxTarEntry indexEntry = new(TarEntryType.RegularFile, "index.json")
             {

From 2363f9449ef36156c88ab30a450a80a91b74e08f Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Fri, 31 Jan 2025 13:00:23 +0100
Subject: [PATCH 047/127] implement loading multi-arch image as a tarball and
 to a local registry

---
 .../BuiltImage.cs                             |  10 ++
 .../DigestUtils.cs                            |  10 ++
 .../LocalDaemons/ArchiveFileRegistry.cs       |  29 ++--
 .../LocalDaemons/DockerCli.cs                 | 152 ++++++++++++++++--
 .../LocalDaemons/ILocalRegistry.cs            |   5 +
 5 files changed, 183 insertions(+), 23 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
index c4572b878340..84d3b11c42c9 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
@@ -43,6 +43,16 @@ internal readonly struct BuiltImage
     /// </summary>
     internal required List<ManifestLayer> Layers { get; init; }
 
+    /// <summary>
+    /// Gets image OS.
+    /// </summary>
+    internal string OS { get; init; }
+
+    /// <summary>
+    /// Gets image architecture.
+    /// </summary>
+    internal string Architecture { get; init; }
+
     /// <summary>
     /// Gets layers descriptors.
     /// </summary>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/DigestUtils.cs b/src/Containers/Microsoft.NET.Build.Containers/DigestUtils.cs
index e549defd4635..4171589c025d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/DigestUtils.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/DigestUtils.cs
@@ -17,6 +17,16 @@ internal sealed class DigestUtils
     /// </summary>
     internal static string GetDigestFromSha(string sha) => $"sha256:{sha}";
 
+    internal static string GetShaFromDigest(string digest)
+    {
+        if (!digest.StartsWith("sha256:", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new ArgumentException("Invalid digest format. Digest must start with 'sha256:'.");
+        }
+
+        return digest.Substring("sha256:".Length);
+    }
+
     /// <summary>
     /// Gets the SHA of <paramref name="str"/>.
     /// </summary>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
index a12d15790d38..5af3edd5a546 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.Extensions.Logging;
 using Microsoft.NET.Build.Containers.Resources;
 
 namespace Microsoft.NET.Build.Containers.LocalDaemons;
@@ -15,9 +14,9 @@ public ArchiveFileRegistry(string archiveOutputPath)
         ArchiveOutputPath = archiveOutputPath;
     }
 
-    public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReference,
-        DestinationImageReference destinationReference,
-        CancellationToken cancellationToken)
+    private async Task LoadAsync<T>(T image, SourceImageReference sourceReference, 
+        DestinationImageReference destinationReference, CancellationToken cancellationToken,
+        Func<T, SourceImageReference, DestinationImageReference, Stream, CancellationToken, Task> writeStreamFunc)
     {
         var fullPath = Path.GetFullPath(ArchiveOutputPath);
 
@@ -36,19 +35,27 @@ public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReferen
 
         ArchiveOutputPath = fullPath;
         await using var fileStream = File.Create(fullPath);
-        await DockerCli.WriteImageToStreamAsync(
-            image,
-            sourceReference,
-            destinationReference,
-            fileStream,
-            cancellationToken).ConfigureAwait(false);
+
+        // Call the delegate to write the image to the stream
+        await writeStreamFunc(image, sourceReference, destinationReference, fileStream, cancellationToken).ConfigureAwait(false);
     }
 
+    public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReference,
+        DestinationImageReference destinationReference,
+        CancellationToken cancellationToken) 
+        => await LoadAsync(image, sourceReference, destinationReference, cancellationToken,
+            DockerCli.WriteImageToStreamAsync);
+
+    public async Task LoadAsync(BuiltImage[] images, SourceImageReference sourceReference,
+        DestinationImageReference destinationReference,
+        CancellationToken cancellationToken) 
+        => await LoadAsync(images, sourceReference, destinationReference, cancellationToken,
+            DockerCli.WriteMultiArchOciImageToStreamAsync);
+
     public Task<bool> IsAvailableAsync(CancellationToken cancellationToken) => Task.FromResult(true);
 
     public bool IsAvailable() => true;
 
-
     public override string ToString()
     {
         return string.Format(Strings.ArchiveRegistry_PushInfo, ArchiveOutputPath);
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 68e06d044c3c..112887aa5a6e 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -83,7 +83,12 @@ private async ValueTask<string> FindFullCommandPath(CancellationToken cancellati
         return _fullCommandPath;
     }
 
-    public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken)
+    private async Task LoadAsync<T>(
+        T image,
+        SourceImageReference sourceReference,
+        DestinationImageReference destinationReference,
+        Func<T, SourceImageReference, DestinationImageReference, Stream, CancellationToken, Task> writeStreamFunc,
+        CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -95,16 +100,12 @@ public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReferen
         loadInfo.RedirectStandardOutput = true;
         loadInfo.RedirectStandardError = true;
 
-        using Process? loadProcess = Process.Start(loadInfo);
-
-        if (loadProcess is null)
-        {
+        using Process? loadProcess = Process.Start(loadInfo) ??
             throw new NotImplementedException(Resource.FormatString(Strings.ContainerRuntimeProcessCreationFailed, commandPath));
-        }
 
-        // Create new stream tarball
-        // We want to be able to export to docker, even oci images.
-        await WriteDockerImageToStreamAsync(image, sourceReference, destinationReference, loadProcess.StandardInput.BaseStream, cancellationToken).ConfigureAwait(false);
+        // Call the delegate to write the image to the stream
+        await writeStreamFunc(image, sourceReference, destinationReference, loadProcess.StandardInput.BaseStream, cancellationToken)
+            .ConfigureAwait(false);
 
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -120,6 +121,12 @@ public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReferen
         }
     }
 
+    public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken) 
+        => await LoadAsync(image, sourceReference, destinationReference, WriteDockerImageToStreamAsync, cancellationToken);
+
+    public async Task LoadAsync(BuiltImage[] images, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken) 
+        => await LoadAsync(images, sourceReference, destinationReference, WriteMultiArchOciImageToStreamAsync, cancellationToken);
+    
     public async Task<bool> IsAvailableAsync(CancellationToken cancellationToken)
     {
         bool commandPathWasUnknown = this._command is null; // avoid running the version command twice.
@@ -390,6 +397,35 @@ private static async Task WriteManifestForDockerImage(
         }
     }
 
+    public static async Task WriteMultiArchOciImageToStreamAsync(
+        BuiltImage[] images,
+        SourceImageReference sourceReference,
+        DestinationImageReference destinationReference,
+        Stream imageStream,
+        CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (destinationReference.Tags.Length > 1)
+        {
+            throw new ArgumentException(Resource.FormatString(nameof(Strings.OciImageMultipleTagsNotSupported)));
+        }
+
+        using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true);
+
+        foreach (var image in images)
+        {
+            await WriteOciImageToBlobs(writer, image, sourceReference, cancellationToken)
+            .ConfigureAwait(false);
+        }
+
+        await WriteIndexJsonForMultiArchOciImage(writer, images, destinationReference, cancellationToken)
+            .ConfigureAwait(false);
+
+        await WriteOciLayout(writer, cancellationToken)
+            .ConfigureAwait(false);
+    }
+
     private static async Task WriteOciImageToStreamAsync(
         BuiltImage image,
         SourceImageReference sourceReference,
@@ -406,9 +442,22 @@ private static async Task WriteOciImageToStreamAsync(
 
         using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true);
 
+        await WriteOciImageToBlobs(writer, image, sourceReference, cancellationToken)
+            .ConfigureAwait(false);
+
+        await WriteIndexJsonForOciImage(writer, image, destinationReference, cancellationToken)
+            .ConfigureAwait(false);
+
         await WriteOciLayout(writer, cancellationToken)
             .ConfigureAwait(false);
+    }
 
+    private static async Task WriteOciImageToBlobs(
+        TarWriter writer,
+        BuiltImage image,
+        SourceImageReference sourceReference,
+        CancellationToken cancellationToken)
+    {
         await WriteImageLayers(writer, image, sourceReference, d => $"{_blobsPath}/{d.Substring("sha256:".Length)}", cancellationToken)
             .ConfigureAwait(false);
 
@@ -417,9 +466,6 @@ await WriteImageConfig(writer, image, $"{_blobsPath}/{image.ImageSha}", cancella
 
         await WriteManifestForOciImage(writer, image, cancellationToken)
             .ConfigureAwait(false);
-
-        await WriteIndexJsonForOciImage(writer, image, destinationReference, cancellationToken)
-            .ConfigureAwait(false);
     }
 
     private static async Task WriteOciLayout(TarWriter writer, CancellationToken cancellationToken)
@@ -456,6 +502,88 @@ private static async Task WriteManifestForOciImage(
         }
     }
 
+    private static async Task WriteIndexJsonForMultiArchOciImage(
+        TarWriter writer,
+        BuiltImage[] images,
+        DestinationImageReference destinationReference,
+        CancellationToken cancellationToken)
+    {
+        // 1. create manifest list for the blobs
+        cancellationToken.ThrowIfCancellationRequested();
+
+        string tag = destinationReference.Tags[0];
+
+        var manifests = new PlatformSpecificOciManifest[images.Length];
+        for (int i = 0; i < images.Length; i++)
+        {
+            var manifest = new PlatformSpecificOciManifest
+            {
+                mediaType = SchemaTypes.OciManifestV1,
+                size = images[i].Manifest.Length,
+                digest = images[i].ManifestDigest,
+                platform = new PlatformInformation { architecture = images[i].Architecture, os = images[i].OS }
+            };
+            manifests[i] = manifest;
+        }
+
+        var manifestList = new ImageIndexV1
+        {
+            schemaVersion = 2,
+            mediaType = SchemaTypes.OciImageIndexV1,
+            manifests = manifests
+        };
+
+        var options = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        };
+        var manifestListJson = JsonSerializer.SerializeToNode(manifestList, options)!.ToJsonString();
+        var manifestListDigest = DigestUtils.GetDigest(manifestListJson);
+        var manifestListSha = DigestUtils.GetShaFromDigest(manifestListDigest);
+        var manifestListPath = $"{_blobsPath}/{manifestListSha}";
+        
+        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(manifestListJson)))
+        {
+            PaxTarEntry indexEntry = new(TarEntryType.RegularFile, manifestListPath)
+            {
+                DataStream = indexStream
+            };
+            await writer.WriteEntryAsync(indexEntry, cancellationToken).ConfigureAwait(false);
+        }
+
+        // 2. create index json that points to manifest list in the blobs
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var index = new ImageIndexV1
+        {
+            schemaVersion = 2,
+            mediaType = SchemaTypes.OciImageIndexV1,
+            manifests = 
+            [
+                new PlatformSpecificOciManifest
+                {
+                    mediaType = SchemaTypes.OciImageIndexV1,
+                    size = manifestListJson.Length,
+                    digest = manifestListDigest,
+                    annotations = new Dictionary<string, string> 
+                    {
+                        { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
+                        { "org.opencontainers.image.ref.name", tag } 
+                    },
+                }
+            ]
+        };
+
+        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index, options)!.ToJsonString())))
+        {
+            PaxTarEntry indexEntry = new(TarEntryType.RegularFile, "index.json")
+            {
+                DataStream = indexStream
+            };
+            await writer.WriteEntryAsync(indexEntry, cancellationToken).ConfigureAwait(false);
+        }
+    }
+
     private static async Task WriteIndexJsonForOciImage(
         TarWriter writer,
         BuiltImage image,
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ILocalRegistry.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ILocalRegistry.cs
index c06150fe2425..34ccb13d093d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ILocalRegistry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ILocalRegistry.cs
@@ -13,6 +13,11 @@ internal interface ILocalRegistry {
     /// </summary>
     public Task LoadAsync(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken);
 
+    /// <summary>
+    /// Loads a multi-arch image (presumably from a tarball) into the local registry.
+    /// </summary>
+    public Task LoadAsync(BuiltImage[] images, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken);
+
     /// <summary>
     /// Checks to see if the local registry is available. This is used to give nice errors to the user.
     /// </summary>

From 068d0738769c1a62b27014b484df9817f952abfc Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Fri, 31 Jan 2025 17:55:09 +0100
Subject: [PATCH 048/127] implement publishing to tarball/local daemon/remote
 registry in CreateImageIndex

---
 .../BuiltImage.cs                             |   2 +-
 .../ImageIndexGenerator.cs                    |  42 +--
 .../PublicAPI/net8.0/PublicAPI.Unshipped.txt  |  12 +
 .../Registry/Registry.cs                      |   2 -
 .../Tasks/CreateImageIndex.cs                 | 322 ++++++++++++++++--
 .../Microsoft.NET.Build.Containers.targets    |  15 +-
 .../EndToEndTests.cs                          |   6 +-
 .../ImageIndexGeneratorTests.cs               | 150 ++++----
 8 files changed, 394 insertions(+), 157 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
index 84d3b11c42c9..0a76191db727 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
@@ -41,7 +41,7 @@ internal readonly struct BuiltImage
     /// <summary>
     /// Gets image layers.
     /// </summary>
-    internal required List<ManifestLayer> Layers { get; init; }
+    internal List<ManifestLayer>? Layers { get; init; }
 
     /// <summary>
     /// Gets image OS.
diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index bc23073080ea..b0cedc4a60af 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -23,31 +23,31 @@ internal static class ImageIndexGenerator
     /// <summary>
     /// Generates an image index from the given images.
     /// </summary>
-    /// <param name="imageInfos"></param>
+    /// <param name="images"></param>
     /// <returns>Returns json string of image index and image index mediaType.</returns>
     /// <exception cref="ArgumentException"></exception>
     /// <exception cref="NotSupportedException"></exception>
-    internal static (string, string) GenerateImageIndex(ImageInfo[] imageInfos)
+    internal static (string, string) GenerateImageIndex(BuiltImage[] images)
     {
-        if (imageInfos.Length == 0)
+        if (images.Length == 0)
         {
             throw new ArgumentException(string.Format(Strings.ImagesEmpty));
         }
 
-        string manifestMediaType = imageInfos[0].ManifestMediaType;
+        string manifestMediaType = images[0].ManifestMediaType;
 
-        if (!imageInfos.All(image => string.Equals(image.ManifestMediaType, manifestMediaType, StringComparison.OrdinalIgnoreCase)))
+        if (!images.All(image => string.Equals(image.ManifestMediaType, manifestMediaType, StringComparison.OrdinalIgnoreCase)))
         {
             throw new ArgumentException(Strings.MixedMediaTypes);
         }
 
         if (manifestMediaType == SchemaTypes.DockerManifestV2)
         {
-            return GenerateImageIndex(imageInfos, SchemaTypes.DockerManifestV2, SchemaTypes.DockerManifestListV2);
+            return GenerateImageIndex(images, SchemaTypes.DockerManifestV2, SchemaTypes.DockerManifestListV2);
         }
         else if (manifestMediaType == SchemaTypes.OciManifestV1)
         {
-            return GenerateImageIndex(imageInfos, SchemaTypes.OciManifestV1, SchemaTypes.OciImageIndexV1);
+            return GenerateImageIndex(images, SchemaTypes.OciManifestV1, SchemaTypes.OciImageIndexV1);
         }
         else
         {
@@ -55,10 +55,10 @@ internal static (string, string) GenerateImageIndex(ImageInfo[] imageInfos)
         }
     }
 
-    private static (string, string) GenerateImageIndex(ImageInfo[] images, string manifestMediaType, string imageIndexMediaType)
+    private static (string, string) GenerateImageIndex(BuiltImage[] images, string manifestMediaType, string imageIndexMediaType)
     {
         // Here we are using ManifestListV2 struct, but we could use ImageIndexV1 struct as well.
-        // We are filling the same fiels, so we can use the same struct.
+        // We are filling the same fields, so we can use the same struct.
         var manifests = new PlatformSpecificManifest[images.Length];
         for (int i = 0; i < images.Length; i++)
         {
@@ -69,32 +69,22 @@ private static (string, string) GenerateImageIndex(ImageInfo[] images, string ma
                 mediaType = manifestMediaType,
                 size = image.Manifest.Length,
                 digest = image.ManifestDigest,
-                platform = GetArchitectureAndOsFromConfig(image)
+                platform = new PlatformInformation
+                {
+                    architecture = image.Architecture,
+                    os = image.OS
+                }
             };
             manifests[i] = manifest;
         }
 
-        var dockerManifestList = new ManifestListV2
+        var manifestList = new ManifestListV2
         {
             schemaVersion = 2,
             mediaType = imageIndexMediaType,
             manifests = manifests
         };
 
-        return (JsonSerializer.SerializeToNode(dockerManifestList)?.ToJsonString() ?? "", dockerManifestList.mediaType);
-    }
-
-    private static PlatformInformation GetArchitectureAndOsFromConfig(ImageInfo image)
-    {
-        var configJson = JsonNode.Parse(image.Config) as JsonObject ??
-            throw new ArgumentException($"{nameof(image.Config)} should be a JSON object.", nameof(image.Config));
-
-        var architecture = configJson["architecture"]?.ToString() ??
-            throw new ArgumentException($"{nameof(image.Config)} should contain 'architecture'.", nameof(image.Config));
-
-        var os = configJson["os"]?.ToString() ??
-            throw new ArgumentException($"{nameof(image.Config)} should contain 'os'.", nameof(image.Config));
-
-        return new PlatformInformation { architecture = architecture, os = os };
+        return (JsonSerializer.SerializeToNode(manifestList)?.ToJsonString() ?? "", manifestList.mediaType);
     }
 }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
index b19e4fa81718..f7e2955bd01f 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
+++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -19,6 +19,18 @@ Microsoft.NET.Build.Containers.Tasks.ComputeDotnetBaseImageAndTag.UserBaseImage.
 Microsoft.NET.Build.Containers.Tasks.ComputeDotnetBaseImageAndTag.UsesInvariantGlobalization.get -> bool
 Microsoft.NET.Build.Containers.Tasks.ComputeDotnetBaseImageAndTag.UsesInvariantGlobalization.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseRegistry.get -> string!
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseRegistry.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageName.get -> string!
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageName.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageTag.get -> string!
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.BaseImageTag.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.ArchiveOutputPath.get -> string!
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.ArchiveOutputPath.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.LocalRegistry.get -> string!
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.LocalRegistry.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedArchiveOutputPath.get -> string!
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedArchiveOutputPath.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.Cancel() -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.CreateImageIndex() -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.Dispose() -> void
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
index 5ab07dc9713e..2e754986334a 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
@@ -3,11 +3,9 @@
 
 using Microsoft.Extensions.Logging;
 using Microsoft.NET.Build.Containers.Resources;
-using NuGet.Packaging;
 using NuGet.RuntimeModel;
 using System.Diagnostics;
 using System.Net.Http.Json;
-using System.Text.Json;
 using System.Text.Json.Nodes;
 
 namespace Microsoft.NET.Build.Containers;
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 0894686603d2..09128838f212 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using Microsoft.Build.Framework;
 using Microsoft.Extensions.Logging;
+using Microsoft.NET.Build.Containers.LocalDaemons;
 using Microsoft.NET.Build.Containers.Logging;
 using Microsoft.NET.Build.Containers.Resources;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -14,6 +17,27 @@ namespace Microsoft.NET.Build.Containers.Tasks;
 public sealed class CreateImageIndex : Microsoft.Build.Utilities.Task, ICancelableTask, IDisposable
 {
     #region Parameters
+    /// <summary>
+    /// The base registry to pull from.
+    /// Ex: mcr.microsoft.com
+    /// </summary>
+    [Required]
+    public string BaseRegistry { get; set; }
+
+    /// <summary>
+    /// The base image to pull.
+    /// Ex: dotnet/runtime
+    /// </summary>
+    [Required]
+    public string BaseImageName { get; set; }
+
+    /// <summary>
+    /// The base image tag.
+    /// Ex: 6.0
+    /// </summary>
+    [Required]
+    public string BaseImageTag { get; set; }
+
     /// <summary>
     /// Manifests to include in the image index.
     /// </summary>
@@ -23,9 +47,18 @@ public sealed class CreateImageIndex : Microsoft.Build.Utilities.Task, ICancelab
     /// <summary>
     /// The registry to push the image index to.
     /// </summary>
-    [Required]
     public string OutputRegistry { get; set; }
 
+    /// <summary>
+    /// The file path to which to write a tar.gz archive of the container image.
+    /// </summary>
+    public string ArchiveOutputPath { get; set; }
+
+    /// <summary>
+    /// The kind of local registry to use, if any.
+    /// </summary>
+    public string LocalRegistry { get; set; }
+
     /// <summary>
     /// The name of the output image index (manifest list) that will be pushed to the registry.
     /// </summary>
@@ -38,6 +71,9 @@ public sealed class CreateImageIndex : Microsoft.Build.Utilities.Task, ICancelab
     [Required]
     public string[] ImageTags { get; set; }
 
+    [Output]
+    public string GeneratedArchiveOutputPath { get; set; }
+
     /// <summary>
     /// The generated image index (manifest list) in JSON format.
     /// </summary>
@@ -46,10 +82,16 @@ public sealed class CreateImageIndex : Microsoft.Build.Utilities.Task, ICancelab
 
     public CreateImageIndex()
     {
+        BaseRegistry = string.Empty;
+        BaseImageName = string.Empty;
+        BaseImageTag = string.Empty;
         GeneratedContainers = Array.Empty<ITaskItem>();
         OutputRegistry = string.Empty;
+        ArchiveOutputPath = string.Empty;
+        LocalRegistry = string.Empty;
         Repository = string.Empty;
         ImageTags = Array.Empty<string>();
+        GeneratedArchiveOutputPath = string.Empty;
         GeneratedImageIndex = string.Empty;
     }
     #endregion
@@ -63,6 +105,8 @@ public void Dispose()
         _cancellationTokenSource.Dispose();
     }
 
+    private bool IsLocalPull => string.IsNullOrEmpty(BaseRegistry);
+
     public override bool Execute()
     {
         try
@@ -84,25 +128,120 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        var images = ParseImages();
+        using MSBuildLoggerProvider loggerProvider = new(Log);
+        ILoggerFactory msbuildLoggerFactory = new LoggerFactory(new[] { loggerProvider });
+        ILogger logger = msbuildLoggerFactory.CreateLogger<CreateImageIndex>();
+
+        // Look up in CreateNewImage how the image is published to registry/local daemon/tarball
+
+        RegistryMode sourceRegistryMode = BaseRegistry.Equals(OutputRegistry, StringComparison.InvariantCultureIgnoreCase) ? RegistryMode.PullFromOutput : RegistryMode.Pull;
+        Registry? sourceRegistry = IsLocalPull ? null : new Registry(BaseRegistry, logger, sourceRegistryMode);
+        SourceImageReference sourceImageReference = new(sourceRegistry, BaseImageName, BaseImageTag);
+
+        DestinationImageReference destinationImageReference = DestinationImageReference.CreateFromSettings(
+            Repository,
+            ImageTags,
+            msbuildLoggerFactory,
+            ArchiveOutputPath,
+            OutputRegistry,
+            LocalRegistry);
+
+        var images = ParseImages(destinationImageReference.Kind);
+
         if (Log.HasLoggedErrors)
         {
             return false;
         }
 
-        using MSBuildLoggerProvider loggerProvider = new(Log);
-        ILoggerFactory msbuildLoggerFactory = new LoggerFactory(new[] { loggerProvider });
-        ILogger logger = msbuildLoggerFactory.CreateLogger<CreateImageIndex>();
+        var telemetry = CreateTelemetryContext(sourceImageReference, destinationImageReference);
+
+        switch (destinationImageReference.Kind)
+        {
+            case DestinationImageReferenceKind.LocalRegistry:
+                await PushToLocalRegistryAsync(images,
+                    sourceImageReference,
+                    destinationImageReference,
+                    telemetry,
+                    cancellationToken).ConfigureAwait(false);
+                break;
+            case DestinationImageReferenceKind.RemoteRegistry:
+                await PushToRemoteRegistryAsync(images,
+                    sourceImageReference,
+                    destinationImageReference,
+                    telemetry,
+                    cancellationToken).ConfigureAwait(false);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
 
-        logger.LogInformation(Strings.BuildingImageIndex, GetRepositoryAndTagsString(), string.Join(", ", images.Select(i => i.ManifestDigest)));
+        telemetry.LogPublishSuccess();
 
+        return !Log.HasLoggedErrors;
+    }
+
+    private async Task PushToLocalRegistryAsync(BuiltImage[] images, SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        Telemetry telemetry,
+        CancellationToken cancellationToken)
+    {
+        ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
+        if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
+        {
+            telemetry.LogMissingLocalBinary();
+            Log.LogErrorWithCodeFromResources(nameof(Strings.LocalRegistryNotAvailable));
+            return;
+        }
         try
         {
-            (string imageIndex, string mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
+            await localRegistry.LoadAsync(images, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
+            SafeLog(Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
 
-            GeneratedImageIndex = imageIndex;
+            if (localRegistry is ArchiveFileRegistry archive)
+            {
+                GeneratedArchiveOutputPath = archive.ArchiveOutputPath;
+            }
+        }
+        catch (ContainerHttpException e)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorFromException(e, true);
+            }
+        }
+        catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
+        {
+            telemetry.LogLocalLoadError();
+            Log.LogErrorFromException(dle, showStackTrace: false);
+        }
+        catch (ArgumentException argEx)
+        {
+            Log.LogErrorFromException(argEx, showStackTrace: false);
+        }
+    }
 
-            await PushToRemoteRegistry(GeneratedImageIndex, mediaType, logger, cancellationToken);
+    private async Task PushToRemoteRegistryAsync(BuiltImage[] images, SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        Telemetry telemetry,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            (string imageIndex, string mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
+            await destinationImageReference.RemoteRegistry!.PushManifestListAsync(
+                destinationImageReference.Repository,
+                destinationImageReference.Tags,
+                imageIndex,
+                mediaType,
+                cancellationToken).ConfigureAwait(false);
+            SafeLog(Strings.ImageIndexUploadedToRegistry, destinationImageReference, OutputRegistry);
+        }
+        catch (UnableToAccessRepositoryException)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
+            }
         }
         catch (ContainerHttpException e)
         {
@@ -111,17 +250,24 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
                 Log.LogErrorFromException(e, true);
             }
         }
-        catch (ArgumentException ex)
+        catch (Exception e)
         {
-            Log.LogErrorFromException(ex);
+            if (BuildEngine != null)
+            {
+                Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
+                Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
+            }
         }
+    }
 
-        return !Log.HasLoggedErrors;
+    private void SafeLog(string message, params object[] formatParams)
+    {
+        if (BuildEngine != null) Log.LogMessage(MessageImportance.High, message, formatParams);
     }
 
-    private ImageInfo[] ParseImages()
+    private BuiltImage[] ParseImages(DestinationImageReferenceKind destinationKind)
     {
-        var images = new ImageInfo[GeneratedContainers.Length];
+        var images = new BuiltImage[GeneratedContainers.Length];
 
         for (int i = 0; i < GeneratedContainers.Length; i++)
         {
@@ -132,38 +278,160 @@ private ImageInfo[] ParseImages()
             string manifest = unparsedImage.GetMetadata("Manifest");
             string manifestMediaType = unparsedImage.GetMetadata("ManifestMediaType");
 
+            //TODO: add manifestmedia type to the error message
             if (string.IsNullOrEmpty(config) || string.IsNullOrEmpty(manifestDigest) || string.IsNullOrEmpty(manifest))
             {
                 Log.LogError(Strings.InvalidImageMetadata, unparsedImage.ItemSpec);
                 break;
             }
 
-            images[i] = new ImageInfo
+            var manifestV2 = JsonSerializer.Deserialize<ManifestV2>(manifest);
+            if (manifestV2 == null)
+            {
+                //TODO: log new error about manifest not deserealized
+                Log.LogError(Strings.InvalidImageMetadata, unparsedImage.ItemSpec);
+                break;
+            }
+
+            string imageDigest = manifestV2.Config.digest;
+            string imageSha = DigestUtils.GetShaFromDigest(imageDigest);
+            // We don't need layers for remote registry, as the individual images should be pushed already
+            var layers = destinationKind == DestinationImageReferenceKind.RemoteRegistry ? null : manifestV2.Layers;
+            (string architecture, string os) = GetArchitectureAndOsFromConfig(config);
+
+            images[i] = new BuiltImage()
             {
                 Config = config,
-                ManifestDigest = manifestDigest,
+                ImageDigest = imageDigest,
+                ImageSha = imageSha,
                 Manifest = manifest,
-                ManifestMediaType = manifestMediaType
+                ManifestDigest = manifestDigest,
+                ManifestMediaType = manifestMediaType,
+                Layers = layers,
+                OS = os,
+                Architecture = architecture
             };
         }
 
         return images;
     }
 
-    private async Task PushToRemoteRegistry(string manifestList, string mediaType, ILogger logger, CancellationToken cancellationToken)
+    private static (string, string) GetArchitectureAndOsFromConfig(string config)
     {
-        cancellationToken.ThrowIfCancellationRequested();
-        Debug.Assert(ImageTags.Length > 0);
-        var registry = new Registry(OutputRegistry, logger, RegistryMode.Push);
-        await registry.PushManifestListAsync(Repository, ImageTags, manifestList, mediaType, cancellationToken).ConfigureAwait(false);
-        logger.LogInformation(Strings.ImageIndexUploadedToRegistry, GetRepositoryAndTagsString(), OutputRegistry);
+        var configJson = JsonNode.Parse(config) as JsonObject ??
+            throw new ArgumentException("Image config should be a JSON object.");
+
+        var architecture = configJson["architecture"]?.ToString() ??
+            throw new ArgumentException("Image config should contain 'architecture'.");
+
+        var os = configJson["os"]?.ToString() ??
+            throw new ArgumentException("Image config should contain 'os'.");
+
+        return (architecture, os);
     }
 
-    private string? _repositoryAndTagsString = null;
+    private Telemetry CreateTelemetryContext(SourceImageReference source, DestinationImageReference destination)
+    {
+        var context = new PublishTelemetryContext(
+            source.Registry is not null ? GetRegistryType(source.Registry) : null,
+            null, // we don't support local pull yet, but we may in the future
+            destination.RemoteRegistry is not null ? GetRegistryType(destination.RemoteRegistry) : null,
+            destination.LocalRegistry is not null ? GetLocalStorageType(destination.LocalRegistry) : null);
+        return new Telemetry(Log, context);
+    }
+
+    private RegistryType GetRegistryType(Registry r)
+    {
+        if (r.IsMcr) return RegistryType.MCR;
+        if (r.IsGithubPackageRegistry) return RegistryType.GitHub;
+        if (r.IsAmazonECRRegistry) return RegistryType.AWS;
+        if (r.IsAzureContainerRegistry) return RegistryType.Azure;
+        if (r.IsGoogleArtifactRegistry) return RegistryType.Google;
+        if (r.IsDockerHub) return RegistryType.DockerHub;
+        return RegistryType.Other;
+    }
 
-    private string GetRepositoryAndTagsString()
+    private LocalStorageType GetLocalStorageType(ILocalRegistry r)
     {
-        _repositoryAndTagsString ??= $"{Repository}:{string.Join(", ", ImageTags)}";
-        return _repositoryAndTagsString;
+        if (r is ArchiveFileRegistry) return LocalStorageType.Tarball;
+        var d = r as DockerCli;
+        System.Diagnostics.Debug.Assert(d != null, "Unknown local registry type");
+        if (d.GetCommand() == DockerCli.DockerCommand) return LocalStorageType.Docker;
+        else return LocalStorageType.Podman;
+    }
+
+    /// <summary>
+    /// Interesting data about the container publish - used to track the usage rates of various sources/targets of the process
+    /// and to help diagnose issues with the container publish overall.
+    /// </summary>
+    /// <param name="RemotePullType">If the base image came from a remote registry, what kind of registry was it?</param>
+    /// <param name="LocalPullType">If the base image came from a local store of some kind, what kind of store was it?</param>
+    /// <param name="RemotePushType">If the new image is being pushed to a remote registry, what kind of registry is it?</param>
+    /// <param name="LocalPushType">If the new image is being stored in a local store of some kind, what kind of store is it?</param>
+    private record class PublishTelemetryContext(RegistryType? RemotePullType, LocalStorageType? LocalPullType, RegistryType? RemotePushType, LocalStorageType? LocalPushType);
+    private enum RegistryType { Azure, AWS, Google, GitHub, DockerHub, MCR, Other }
+    private enum LocalStorageType { Docker, Podman, Tarball }
+
+    private class Telemetry(Microsoft.Build.Utilities.TaskLoggingHelper Log, PublishTelemetryContext context)
+    {
+        private IDictionary<string, string?> ContextProperties() => new Dictionary<string, string?>
+            {
+                { nameof(context.RemotePullType), context.RemotePullType?.ToString() },
+                { nameof(context.LocalPullType), context.LocalPullType?.ToString() },
+                { nameof(context.RemotePushType), context.RemotePushType?.ToString() },
+                { nameof(context.LocalPushType), context.LocalPushType?.ToString() }
+            };
+
+        public void LogPublishSuccess()
+        {
+            Log.LogTelemetry("sdk/container/publish/success", ContextProperties());
+        }
+
+        public void LogUnknownRepository()
+        {
+            var props = ContextProperties();
+            props.Add("error", "unknown_repository");
+            Log.LogTelemetry("sdk/container/publish/error", props);
+        }
+
+        public void LogCredentialFailure(SourceImageReference _)
+        {
+            var props = ContextProperties();
+            props.Add("error", "credential_failure");
+            props.Add("direction", "pull");
+            Log.LogTelemetry("sdk/container/publish/error", props);
+        }
+
+        public void LogCredentialFailure(DestinationImageReference d)
+        {
+            var props = ContextProperties();
+            props.Add("error", "credential_failure");
+            props.Add("direction", "push");
+            Log.LogTelemetry("sdk/container/publish/error", props);
+        }
+
+        public void LogRidMismatch(string desiredRid, string[] availableRids)
+        {
+            var props = ContextProperties();
+            props.Add("error", "rid_mismatch");
+            props.Add("target_rid", desiredRid);
+            props.Add("available_rids", string.Join(",", availableRids));
+            Log.LogTelemetry("sdk/container/publish/error", props);
+        }
+
+        public void LogMissingLocalBinary()
+        {
+            var props = ContextProperties();
+            props.Add("error", "missing_binary");
+            Log.LogTelemetry("sdk/container/publish/error", props);
+        }
+
+        public void LogLocalLoadError()
+        {
+            var props = ContextProperties();
+            props.Add("error", "local_load");
+            Log.LogTelemetry("sdk/container/publish/error", props);
+        }
+
     }
 }
diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 2a006d665a6b..5309bdbeaf8b 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -340,16 +340,15 @@
         <Output TaskParameter="TargetOutputs" ItemName="GeneratedContainers" />
     </MSBuild>
 
-    <PropertyGroup>
-      <_SkipCreateImageIndex>false</_SkipCreateImageIndex>
-      <_SkipCreateImageIndex Condition="'$(ContainerRegistry)' == ''">true</_SkipCreateImageIndex>
-    </PropertyGroup>
-
-    <CreateImageIndex Condition="'$(_SkipCreateImageIndex)' == 'false' "
-                      GeneratedContainers="@(GeneratedContainers)"
+    <CreateImageIndex GeneratedContainers="@(GeneratedContainers)"
+                      LocalRegistry="$(LocalRegistry)"
                       OutputRegistry="$(ContainerRegistry)"
+                      ArchiveOutputPath="$(ContainerArchiveOutputPath)"
                       Repository="$(ContainerRepository)"
-                      ImageTags="@(ContainerImageTags)">
+                      ImageTags="@(ContainerImageTags)"
+                      BaseRegistry="$(ContainerBaseRegistry)"
+                      BaseImageName="$(ContainerBaseName)"
+                      BaseImageTag="$(ContainerBaseTag)">
       <Output TaskParameter="GeneratedImageIndex" PropertyName="GeneratedImageIndex" />
     </CreateImageIndex>
   </Target>
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 2d562b4feaa7..40083f8fc58e 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -1010,9 +1010,9 @@ public void EndToEndMultiArch_RemoteRegistry()
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
-            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to registry")
-            .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to registry")
-            .And.HaveStdOutContaining($"Pushed image index '{imageIndex}' to registry '{registry}'");
+            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to registry '{registry}'.")
+            .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to registry '{registry}'.")
+            .And.HaveStdOutContaining($"Pushed image index '{imageIndex}' to registry '{registry}'.");
 
 
         // Check that the containers can be run
diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
index ef6e5bb84b2a..9bc573b5b0e7 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
@@ -10,7 +10,7 @@ public class ImageIndexGeneratorTests
     [Fact]
     public void ImagesCannotBeEmpty()
     {
-        ImageInfo[] images = Array.Empty<ImageInfo>();
+        BuiltImage[] images = Array.Empty<BuiltImage>();
         var ex = Assert.Throws<ArgumentException>(() => ImageIndexGenerator.GenerateImageIndex(images));
         Assert.Equal(Strings.ImagesEmpty, ex.Message);
     }
@@ -18,95 +18,49 @@ public void ImagesCannotBeEmpty()
     [Fact]
     public void UnsupportedMediaTypeThrows()
     {
-        ImageInfo[] images = new ImageInfo[]
-        {
-            new ImageInfo
+        BuiltImage[] images = 
+        [
+            new BuiltImage
             {
+                Config = "",
+                ImageDigest = "",
+                ImageSha = "",
+                Manifest = "",
+                ManifestDigest = "",
                 ManifestMediaType = "unsupported"
             }
-        };
+        ];
 
         var ex = Assert.Throws<NotSupportedException>(() => ImageIndexGenerator.GenerateImageIndex(images));
         Assert.Equal(string.Format(Strings.UnsupportedMediaType, "unsupported"), ex.Message);
     }
 
-    [Theory]
-    [InlineData(SchemaTypes.DockerManifestV2)]
-    [InlineData(SchemaTypes.OciManifestV1)]
-    public void ConfigIsNotJsonObjectThrows(string supportedMediaType)
-    {
-        ImageInfo[] images = new ImageInfo[]
-        {
-            new ImageInfo
-            {
-                Config = "[]",
-                Manifest = "",
-                ManifestMediaType = supportedMediaType
-            }
-        };
-
-        var ex = Assert.Throws<ArgumentException>(() => ImageIndexGenerator.GenerateImageIndex(images));
-        Assert.Equal($"Config should be a JSON object. (Parameter 'Config')", ex.Message);
-    }
-
-    [Theory]
-    [InlineData(SchemaTypes.DockerManifestV2)]
-    [InlineData(SchemaTypes.OciManifestV1)]
-    public void ConfigDoesNotContainArchitectureThrows(string supportedMediaType)
-    {
-        ImageInfo[] images = new ImageInfo[]
-        {
-            new ImageInfo
-            {
-                Config = "{}",
-                Manifest = "",
-                ManifestMediaType = supportedMediaType
-            }
-        };
-
-        var ex = Assert.Throws<ArgumentException>(() => ImageIndexGenerator.GenerateImageIndex(images));
-        Assert.Equal($"Config should contain 'architecture'. (Parameter 'Config')", ex.Message);
-    }
-
-    [Theory]
-    [InlineData(SchemaTypes.DockerManifestV2)]
-    [InlineData(SchemaTypes.OciManifestV1)]
-    public void ConfigDoesNotContainOsThrows(string supportedMediaType)
-    {
-        ImageInfo[] images = new ImageInfo[]
-        {
-            new ImageInfo
-            {
-               Config = "{\"architecture\":\"arch1\"}",
-               Manifest = "",
-               ManifestMediaType = supportedMediaType
-            }
-        };
-
-        var ex = Assert.Throws<ArgumentException>(() => ImageIndexGenerator.GenerateImageIndex(images));
-        Assert.Equal($"Config should contain 'os'. (Parameter 'Config')", ex.Message);
-    }
-
     [Theory]
     [InlineData(SchemaTypes.DockerManifestV2)]
     [InlineData(SchemaTypes.OciManifestV1)]
     public void ImagesWithMixedMediaTypes(string supportedMediaType)
     {
-        ImageInfo[] images = new ImageInfo[]
-        {
-            new ImageInfo
+        BuiltImage[] images = 
+        [
+            new BuiltImage
             {
-                Config = "{\"architecture\":\"arch1\",\"os\":\"os1\"}",
-                Manifest =  "",
-                ManifestMediaType = supportedMediaType
+                Config = "",
+                ImageDigest = "",
+                ImageSha = "",
+                Manifest = "",
+                ManifestDigest = "",
+                ManifestMediaType = supportedMediaType,
             },
-            new ImageInfo
+            new BuiltImage
             {
                 Config = "",
+                ImageDigest = "",
+                ImageSha = "",
                 Manifest = "",
+                ManifestDigest = "",
                 ManifestMediaType = "anotherMediaType"
             }
-        };
+        ];
 
         var ex = Assert.Throws<ArgumentException>(() => ImageIndexGenerator.GenerateImageIndex(images));
         Assert.Equal(Strings.MixedMediaTypes, ex.Message);
@@ -115,21 +69,29 @@ public void ImagesWithMixedMediaTypes(string supportedMediaType)
     [Fact]
     public void GenerateDockerManifestList()
     {
-        ImageInfo[] images =
+        BuiltImage[] images =
         [
-            new ImageInfo
+            new BuiltImage
             {
-                Config = "{\"architecture\":\"arch1\",\"os\":\"os1\"}",
-                ManifestDigest = "sha256:digest1",
+                Config = "",
+                ImageDigest = "",
+                ImageSha = "",
                 Manifest = "123",
-                ManifestMediaType = SchemaTypes.DockerManifestV2
+                ManifestDigest = "sha256:digest1",
+                ManifestMediaType = SchemaTypes.DockerManifestV2,
+                Architecture = "arch1",
+                OS = "os1"
             },
-            new ImageInfo
+            new BuiltImage
             {
-                Config = "{\"architecture\":\"arch2\",\"os\":\"os2\"}",
-                ManifestDigest = "sha256:digest2",
+                Config = "",
+                ImageDigest = "",
+                ImageSha = "",
                 Manifest = "123",
-                ManifestMediaType = SchemaTypes.DockerManifestV2
+                ManifestDigest = "sha256:digest2",
+                ManifestMediaType = SchemaTypes.DockerManifestV2,
+                Architecture = "arch2",
+                OS = "os2"
             }
         ];
 
@@ -141,23 +103,31 @@ public void GenerateDockerManifestList()
     [Fact]
     public void GenerateOciImageIndex()
     {
-        ImageInfo[] images = new ImageInfo[]
-        {
-            new ImageInfo
+        BuiltImage[] images =
+        [
+            new BuiltImage
             {
-                Config = "{\"architecture\":\"arch1\",\"os\":\"os1\"}",
-                ManifestDigest = "sha256:digest1",
+                Config = "",
+                ImageDigest = "",
+                ImageSha = "",
                 Manifest = "123",
-                ManifestMediaType = SchemaTypes.OciManifestV1
+                ManifestDigest = "sha256:digest1",
+                ManifestMediaType = SchemaTypes.OciManifestV1,
+                Architecture = "arch1",
+                OS = "os1"
             },
-            new ImageInfo
+            new BuiltImage
             {
-                Config = "{\"architecture\":\"arch2\",\"os\":\"os2\"}",
-                ManifestDigest = "sha256:digest2",
+                Config = "",
+                ImageDigest = "",
+                ImageSha = "",
                 Manifest = "123",
-                ManifestMediaType = SchemaTypes.OciManifestV1
+                ManifestDigest = "sha256:digest2",
+                ManifestMediaType = SchemaTypes.OciManifestV1,
+                Architecture = "arch2",
+                OS = "os2"
             }
-        };
+        ];
 
         var (imageIndex, mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
         Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1\\u002Bjson\",\"manifests\":[{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\",\"variant\":null,\"features\":null,\"os.version\":null}},{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\",\"variant\":null,\"features\":null,\"os.version\":null}}]}", imageIndex);

From 8d5289972963cb275fba6786d3c2555b1002eedb Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Fri, 31 Jan 2025 19:01:46 +0100
Subject: [PATCH 049/127] move Telemetry into a seperate file

---
 .../ImagePublisher.cs                         | 121 ++++++++++++++++++
 .../Tasks/CreateImageIndex.cs                 | 114 +----------------
 .../Tasks/CreateNewImage.cs                   | 109 +---------------
 .../Tasks/Telemetry.cs                        | 116 +++++++++++++++++
 4 files changed, 240 insertions(+), 220 deletions(-)
 create mode 100644 src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
 create mode 100644 src/Containers/Microsoft.NET.Build.Containers/Tasks/Telemetry.cs

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
new file mode 100644
index 000000000000..c877d2c004ba
--- /dev/null
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -0,0 +1,121 @@
+// // Licensed to the .NET Foundation under one or more agreements.
+// // The .NET Foundation licenses this file to you under the MIT license.
+
+// using Microsoft.NET.Build.Containers.LocalDaemons;
+// using Microsoft.NET.Build.Containers.Resources;
+
+// namespace Microsoft.NET.Build.Containers;
+
+
+// internal static class ImagePublisher
+// {
+//     public static async Task PublishImage(BuiltImage builtImage, SourceImageReference sourceImageReference,
+//         DestinationImageReference destinationImageReference,
+//         Telemetry telemetry,
+//         CancellationToken cancellationToken)
+//     {
+//         cancellationToken.ThrowIfCancellationRequested();
+
+//         switch (destinationImageReference.Kind)
+//         {
+//             case DestinationImageReferenceKind.LocalRegistry:
+//                 await PushToLocalRegistryAsync(builtImage,
+//                     sourceImageReference,
+//                     destinationImageReference,
+//                     telemetry,
+//                     cancellationToken).ConfigureAwait(false);
+//                 break;
+//             case DestinationImageReferenceKind.RemoteRegistry:
+//                 await PushToRemoteRegistryAsync(builtImage,
+//                     sourceImageReference,
+//                     destinationImageReference,
+//                     cancellationToken).ConfigureAwait(false);
+//                 break;
+//             default:
+//                 throw new ArgumentOutOfRangeException();
+//         }
+
+//         telemetry.LogPublishSuccess();
+//     }
+
+//     private static async Task PushToLocalRegistryAsync(
+//         BuiltImage builtImage,
+//         SourceImageReference sourceImageReference,
+//         DestinationImageReference destinationImageReference,
+//         Telemetry telemetry,
+//         CancellationToken cancellationToken)
+//     {
+//         ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
+//         if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
+//         {
+//             telemetry.LogMissingLocalBinary();
+//             Log.LogErrorWithCodeFromResources(nameof(Strings.LocalRegistryNotAvailable));
+//             return;
+//         }
+//         try
+//         {
+//             await localRegistry.LoadAsync(builtImage, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
+//             SafeLog(Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
+
+//             if (localRegistry is ArchiveFileRegistry archive)
+//             {
+//                 GeneratedArchiveOutputPath = archive.ArchiveOutputPath;
+//             }
+//         }
+//         catch (ContainerHttpException e)
+//         {
+//             if (BuildEngine != null)
+//             {
+//                 Log.LogErrorFromException(e, true);
+//             }
+//         }
+//         catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
+//         {
+//             telemetry.LogLocalLoadError();
+//             Log.LogErrorFromException(dle, showStackTrace: false);
+//         }
+//         catch (ArgumentException argEx)
+//         {
+//             Log.LogErrorFromException(argEx, showStackTrace: false);
+//         }
+//     }
+
+//     private static async Task PushToRemoteRegistryAsync(
+//         BuiltImage builtImage,
+//         SourceImageReference sourceImageReference,
+//         DestinationImageReference destinationImageReference,
+//         CancellationToken cancellationToken)
+//     {
+//         try
+//         {
+//             await destinationImageReference.RemoteRegistry!.PushAsync(
+//                 builtImage,
+//                 sourceImageReference,
+//                 destinationImageReference,
+//                 cancellationToken).ConfigureAwait(false);
+//             SafeLog(Strings.ContainerBuilder_ImageUploadedToRegistry, destinationImageReference, OutputRegistry);
+//         }
+//         catch (UnableToAccessRepositoryException)
+//         {
+//             if (BuildEngine != null)
+//             {
+//                 Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
+//             }
+//         }
+//         catch (ContainerHttpException e)
+//         {
+//             if (BuildEngine != null)
+//             {
+//                 Log.LogErrorFromException(e, true);
+//             }
+//         }
+//         catch (Exception e)
+//         {
+//             if (BuildEngine != null)
+//             {
+//                 Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
+//                 Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
+//             }
+//         }
+//     }
+// }
\ No newline at end of file
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 09128838f212..e315adef8921 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -132,8 +132,6 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
         ILoggerFactory msbuildLoggerFactory = new LoggerFactory(new[] { loggerProvider });
         ILogger logger = msbuildLoggerFactory.CreateLogger<CreateImageIndex>();
 
-        // Look up in CreateNewImage how the image is published to registry/local daemon/tarball
-
         RegistryMode sourceRegistryMode = BaseRegistry.Equals(OutputRegistry, StringComparison.InvariantCultureIgnoreCase) ? RegistryMode.PullFromOutput : RegistryMode.Pull;
         Registry? sourceRegistry = IsLocalPull ? null : new Registry(BaseRegistry, logger, sourceRegistryMode);
         SourceImageReference sourceImageReference = new(sourceRegistry, BaseImageName, BaseImageTag);
@@ -153,7 +151,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             return false;
         }
 
-        var telemetry = CreateTelemetryContext(sourceImageReference, destinationImageReference);
+        var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
         switch (destinationImageReference.Kind)
         {
@@ -166,9 +164,7 @@ await PushToLocalRegistryAsync(images,
                 break;
             case DestinationImageReferenceKind.RemoteRegistry:
                 await PushToRemoteRegistryAsync(images,
-                    sourceImageReference,
                     destinationImageReference,
-                    telemetry,
                     cancellationToken).ConfigureAwait(false);
                 break;
             default:
@@ -220,9 +216,8 @@ private async Task PushToLocalRegistryAsync(BuiltImage[] images, SourceImageRefe
         }
     }
 
-    private async Task PushToRemoteRegistryAsync(BuiltImage[] images, SourceImageReference sourceImageReference,
+    private async Task PushToRemoteRegistryAsync(BuiltImage[] images,
         DestinationImageReference destinationImageReference,
-        Telemetry telemetry,
         CancellationToken cancellationToken)
     {
         try
@@ -329,109 +324,4 @@ private static (string, string) GetArchitectureAndOsFromConfig(string config)
 
         return (architecture, os);
     }
-
-    private Telemetry CreateTelemetryContext(SourceImageReference source, DestinationImageReference destination)
-    {
-        var context = new PublishTelemetryContext(
-            source.Registry is not null ? GetRegistryType(source.Registry) : null,
-            null, // we don't support local pull yet, but we may in the future
-            destination.RemoteRegistry is not null ? GetRegistryType(destination.RemoteRegistry) : null,
-            destination.LocalRegistry is not null ? GetLocalStorageType(destination.LocalRegistry) : null);
-        return new Telemetry(Log, context);
-    }
-
-    private RegistryType GetRegistryType(Registry r)
-    {
-        if (r.IsMcr) return RegistryType.MCR;
-        if (r.IsGithubPackageRegistry) return RegistryType.GitHub;
-        if (r.IsAmazonECRRegistry) return RegistryType.AWS;
-        if (r.IsAzureContainerRegistry) return RegistryType.Azure;
-        if (r.IsGoogleArtifactRegistry) return RegistryType.Google;
-        if (r.IsDockerHub) return RegistryType.DockerHub;
-        return RegistryType.Other;
-    }
-
-    private LocalStorageType GetLocalStorageType(ILocalRegistry r)
-    {
-        if (r is ArchiveFileRegistry) return LocalStorageType.Tarball;
-        var d = r as DockerCli;
-        System.Diagnostics.Debug.Assert(d != null, "Unknown local registry type");
-        if (d.GetCommand() == DockerCli.DockerCommand) return LocalStorageType.Docker;
-        else return LocalStorageType.Podman;
-    }
-
-    /// <summary>
-    /// Interesting data about the container publish - used to track the usage rates of various sources/targets of the process
-    /// and to help diagnose issues with the container publish overall.
-    /// </summary>
-    /// <param name="RemotePullType">If the base image came from a remote registry, what kind of registry was it?</param>
-    /// <param name="LocalPullType">If the base image came from a local store of some kind, what kind of store was it?</param>
-    /// <param name="RemotePushType">If the new image is being pushed to a remote registry, what kind of registry is it?</param>
-    /// <param name="LocalPushType">If the new image is being stored in a local store of some kind, what kind of store is it?</param>
-    private record class PublishTelemetryContext(RegistryType? RemotePullType, LocalStorageType? LocalPullType, RegistryType? RemotePushType, LocalStorageType? LocalPushType);
-    private enum RegistryType { Azure, AWS, Google, GitHub, DockerHub, MCR, Other }
-    private enum LocalStorageType { Docker, Podman, Tarball }
-
-    private class Telemetry(Microsoft.Build.Utilities.TaskLoggingHelper Log, PublishTelemetryContext context)
-    {
-        private IDictionary<string, string?> ContextProperties() => new Dictionary<string, string?>
-            {
-                { nameof(context.RemotePullType), context.RemotePullType?.ToString() },
-                { nameof(context.LocalPullType), context.LocalPullType?.ToString() },
-                { nameof(context.RemotePushType), context.RemotePushType?.ToString() },
-                { nameof(context.LocalPushType), context.LocalPushType?.ToString() }
-            };
-
-        public void LogPublishSuccess()
-        {
-            Log.LogTelemetry("sdk/container/publish/success", ContextProperties());
-        }
-
-        public void LogUnknownRepository()
-        {
-            var props = ContextProperties();
-            props.Add("error", "unknown_repository");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogCredentialFailure(SourceImageReference _)
-        {
-            var props = ContextProperties();
-            props.Add("error", "credential_failure");
-            props.Add("direction", "pull");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogCredentialFailure(DestinationImageReference d)
-        {
-            var props = ContextProperties();
-            props.Add("error", "credential_failure");
-            props.Add("direction", "push");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogRidMismatch(string desiredRid, string[] availableRids)
-        {
-            var props = ContextProperties();
-            props.Add("error", "rid_mismatch");
-            props.Add("target_rid", desiredRid);
-            props.Add("available_rids", string.Join(",", availableRids));
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogMissingLocalBinary()
-        {
-            var props = ContextProperties();
-            props.Add("error", "missing_binary");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogLocalLoadError()
-        {
-            var props = ContextProperties();
-            props.Add("error", "local_load");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-    }
 }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index 7368fd337596..89131d696e46 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -72,7 +72,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             OutputRegistry,
             LocalRegistry);
 
-        var telemetry = CreateTelemetryContext(sourceImageReference, destinationImageReference);
+        var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
         ImageBuilder? imageBuilder;
         if (sourceRegistry is { } registry)
@@ -190,7 +190,6 @@ await PushToLocalRegistryAsync(builtImage,
                 await PushToRemoteRegistryAsync(builtImage,
                     sourceImageReference,
                     destinationImageReference,
-                    telemetry,
                     cancellationToken).ConfigureAwait(false);
                 break;
             default:
@@ -244,7 +243,6 @@ private async Task PushToLocalRegistryAsync(BuiltImage builtImage, SourceImageRe
 
     private async Task PushToRemoteRegistryAsync(BuiltImage builtImage, SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
-        Telemetry telemetry,
         CancellationToken cancellationToken)
     {
         try
@@ -349,109 +347,4 @@ public void Dispose()
             logWarning: s => Log.LogWarningWithCodeFromResources(s),
             logError: (s, a) => { if (a is null) Log.LogErrorWithCodeFromResources(s); else Log.LogErrorWithCodeFromResources(s, a); });
     }
-
-    private Telemetry CreateTelemetryContext(SourceImageReference source, DestinationImageReference destination)
-    {
-        var context = new PublishTelemetryContext(
-            source.Registry is not null ? GetRegistryType(source.Registry) : null,
-            null, // we don't support local pull yet, but we may in the future
-            destination.RemoteRegistry is not null ? GetRegistryType(destination.RemoteRegistry) : null,
-            destination.LocalRegistry is not null ? GetLocalStorageType(destination.LocalRegistry) : null);
-        return new Telemetry(Log, context);
-    }
-
-    private RegistryType GetRegistryType(Registry r)
-    {
-        if (r.IsMcr) return RegistryType.MCR;
-        if (r.IsGithubPackageRegistry) return RegistryType.GitHub;
-        if (r.IsAmazonECRRegistry) return RegistryType.AWS;
-        if (r.IsAzureContainerRegistry) return RegistryType.Azure;
-        if (r.IsGoogleArtifactRegistry) return RegistryType.Google;
-        if (r.IsDockerHub) return RegistryType.DockerHub;
-        return RegistryType.Other;
-    }
-
-    private LocalStorageType GetLocalStorageType(ILocalRegistry r)
-    {
-        if (r is ArchiveFileRegistry) return LocalStorageType.Tarball;
-        var d = r as DockerCli;
-        System.Diagnostics.Debug.Assert(d != null, "Unknown local registry type");
-        if (d.GetCommand() == DockerCli.DockerCommand) return LocalStorageType.Docker;
-        else return LocalStorageType.Podman;
-    }
-
-    /// <summary>
-    /// Interesting data about the container publish - used to track the usage rates of various sources/targets of the process
-    /// and to help diagnose issues with the container publish overall.
-    /// </summary>
-    /// <param name="RemotePullType">If the base image came from a remote registry, what kind of registry was it?</param>
-    /// <param name="LocalPullType">If the base image came from a local store of some kind, what kind of store was it?</param>
-    /// <param name="RemotePushType">If the new image is being pushed to a remote registry, what kind of registry is it?</param>
-    /// <param name="LocalPushType">If the new image is being stored in a local store of some kind, what kind of store is it?</param>
-    private record class PublishTelemetryContext(RegistryType? RemotePullType, LocalStorageType? LocalPullType, RegistryType? RemotePushType, LocalStorageType? LocalPushType);
-    private enum RegistryType { Azure, AWS, Google, GitHub, DockerHub, MCR, Other }
-    private enum LocalStorageType { Docker, Podman, Tarball }
-
-    private class Telemetry(Microsoft.Build.Utilities.TaskLoggingHelper Log, PublishTelemetryContext context)
-    {
-        private IDictionary<string, string?> ContextProperties() => new Dictionary<string, string?>
-            {
-                { nameof(context.RemotePullType), context.RemotePullType?.ToString() },
-                { nameof(context.LocalPullType), context.LocalPullType?.ToString() },
-                { nameof(context.RemotePushType), context.RemotePushType?.ToString() },
-                { nameof(context.LocalPushType), context.LocalPushType?.ToString() }
-            };
-
-        public void LogPublishSuccess()
-        {
-            Log.LogTelemetry("sdk/container/publish/success", ContextProperties());
-        }
-
-        public void LogUnknownRepository()
-        {
-            var props = ContextProperties();
-            props.Add("error", "unknown_repository");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogCredentialFailure(SourceImageReference _)
-        {
-            var props = ContextProperties();
-            props.Add("error", "credential_failure");
-            props.Add("direction", "pull");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogCredentialFailure(DestinationImageReference d)
-        {
-            var props = ContextProperties();
-            props.Add("error", "credential_failure");
-            props.Add("direction", "push");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogRidMismatch(string desiredRid, string[] availableRids)
-        {
-            var props = ContextProperties();
-            props.Add("error", "rid_mismatch");
-            props.Add("target_rid", desiredRid);
-            props.Add("available_rids", string.Join(",", availableRids));
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogMissingLocalBinary()
-        {
-            var props = ContextProperties();
-            props.Add("error", "missing_binary");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-        public void LogLocalLoadError()
-        {
-            var props = ContextProperties();
-            props.Add("error", "local_load");
-            Log.LogTelemetry("sdk/container/publish/error", props);
-        }
-
-    }
 }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/Telemetry.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/Telemetry.cs
new file mode 100644
index 000000000000..df4ee99ba950
--- /dev/null
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/Telemetry.cs
@@ -0,0 +1,116 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.NET.Build.Containers.LocalDaemons;
+
+namespace Microsoft.NET.Build.Containers.Tasks;
+
+internal class Telemetry
+{
+    /// <summary>
+    /// Interesting data about the container publish - used to track the usage rates of various sources/targets of the process
+    /// and to help diagnose issues with the container publish overall.
+    /// </summary>
+    /// <param name="RemotePullType">If the base image came from a remote registry, what kind of registry was it?</param>
+    /// <param name="LocalPullType">If the base image came from a local store of some kind, what kind of store was it?</param>
+    /// <param name="RemotePushType">If the new image is being pushed to a remote registry, what kind of registry is it?</param>
+    /// <param name="LocalPushType">If the new image is being stored in a local store of some kind, what kind of store is it?</param>
+    private record class PublishTelemetryContext(RegistryType? RemotePullType, LocalStorageType? LocalPullType, RegistryType? RemotePushType, LocalStorageType? LocalPushType);
+    private enum RegistryType { Azure, AWS, Google, GitHub, DockerHub, MCR, Other }
+    private enum LocalStorageType { Docker, Podman, Tarball }
+
+    private readonly Microsoft.Build.Utilities.TaskLoggingHelper Log;
+    private readonly PublishTelemetryContext Context;
+
+    internal Telemetry(
+        SourceImageReference source,
+        DestinationImageReference destination,
+        Microsoft.Build.Utilities.TaskLoggingHelper Log)
+    {
+        this.Log = Log;
+        Context = new PublishTelemetryContext(
+            source.Registry is not null ? GetRegistryType(source.Registry) : null,
+            null, // we don't support local pull yet, but we may in the future
+            destination.RemoteRegistry is not null ? GetRegistryType(destination.RemoteRegistry) : null,
+            destination.LocalRegistry is not null ? GetLocalStorageType(destination.LocalRegistry) : null);
+    }
+
+    private RegistryType GetRegistryType(Registry r)
+    {
+        if (r.IsMcr) return RegistryType.MCR;
+        if (r.IsGithubPackageRegistry) return RegistryType.GitHub;
+        if (r.IsAmazonECRRegistry) return RegistryType.AWS;
+        if (r.IsAzureContainerRegistry) return RegistryType.Azure;
+        if (r.IsGoogleArtifactRegistry) return RegistryType.Google;
+        if (r.IsDockerHub) return RegistryType.DockerHub;
+        return RegistryType.Other;
+    }
+
+    private LocalStorageType GetLocalStorageType(ILocalRegistry r)
+    {
+        if (r is ArchiveFileRegistry) return LocalStorageType.Tarball;
+        var d = r as DockerCli;
+        System.Diagnostics.Debug.Assert(d != null, "Unknown local registry type");
+        if (d.GetCommand() == DockerCli.DockerCommand) return LocalStorageType.Docker;
+        else return LocalStorageType.Podman;
+    }
+
+    private IDictionary<string, string?> ContextProperties() => new Dictionary<string, string?>
+        {
+            { nameof(Context.RemotePullType), Context.RemotePullType?.ToString() },
+            { nameof(Context.LocalPullType), Context.LocalPullType?.ToString() },
+            { nameof(Context.RemotePushType), Context.RemotePushType?.ToString() },
+            { nameof(Context.LocalPushType), Context.LocalPushType?.ToString() }
+        };
+
+    public void LogPublishSuccess()
+    {
+        Log.LogTelemetry("sdk/container/publish/success", ContextProperties());
+    }
+
+    public void LogUnknownRepository()
+    {
+        var props = ContextProperties();
+        props.Add("error", "unknown_repository");
+        Log.LogTelemetry("sdk/container/publish/error", props);
+    }
+
+    public void LogCredentialFailure(SourceImageReference _)
+    {
+        var props = ContextProperties();
+        props.Add("error", "credential_failure");
+        props.Add("direction", "pull");
+        Log.LogTelemetry("sdk/container/publish/error", props);
+    }
+
+    public void LogCredentialFailure(DestinationImageReference d)
+    {
+        var props = ContextProperties();
+        props.Add("error", "credential_failure");
+        props.Add("direction", "push");
+        Log.LogTelemetry("sdk/container/publish/error", props);
+    }
+
+    public void LogRidMismatch(string desiredRid, string[] availableRids)
+    {
+        var props = ContextProperties();
+        props.Add("error", "rid_mismatch");
+        props.Add("target_rid", desiredRid);
+        props.Add("available_rids", string.Join(",", availableRids));
+        Log.LogTelemetry("sdk/container/publish/error", props);
+    }
+
+    public void LogMissingLocalBinary()
+    {
+        var props = ContextProperties();
+        props.Add("error", "missing_binary");
+        Log.LogTelemetry("sdk/container/publish/error", props);
+    }
+
+    public void LogLocalLoadError()
+    {
+        var props = ContextProperties();
+        props.Add("error", "local_load");
+        Log.LogTelemetry("sdk/container/publish/error", props);
+    }
+}
\ No newline at end of file

From 0399310797094f4e0a260625c398f89aaec62533 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Fri, 31 Jan 2025 19:11:53 +0100
Subject: [PATCH 050/127] move Telemetry class to another folder

---
 .../Microsoft.NET.Build.Containers/{Tasks => }/Telemetry.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/Containers/Microsoft.NET.Build.Containers/{Tasks => }/Telemetry.cs (99%)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/Telemetry.cs b/src/Containers/Microsoft.NET.Build.Containers/Telemetry.cs
similarity index 99%
rename from src/Containers/Microsoft.NET.Build.Containers/Tasks/Telemetry.cs
rename to src/Containers/Microsoft.NET.Build.Containers/Telemetry.cs
index df4ee99ba950..009b93d7717c 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/Telemetry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Telemetry.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.NET.Build.Containers.LocalDaemons;
 
-namespace Microsoft.NET.Build.Containers.Tasks;
+namespace Microsoft.NET.Build.Containers;
 
 internal class Telemetry
 {

From ec26765bdddf53f3796cf0e72321f40ffbc0001e Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Fri, 31 Jan 2025 21:40:40 +0100
Subject: [PATCH 051/127] extract publishing image logic into a seperate class

---
 .../ImagePublisher.cs                         | 365 ++++++++++++------
 .../Tasks/CreateImageIndex.cs                 | 107 +----
 .../Tasks/CreateNewImage.cs                   | 111 +-----
 3 files changed, 263 insertions(+), 320 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index c877d2c004ba..e2b76e461867 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -1,121 +1,262 @@
-// // Licensed to the .NET Foundation under one or more agreements.
-// // The .NET Foundation licenses this file to you under the MIT license.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
-// using Microsoft.NET.Build.Containers.LocalDaemons;
-// using Microsoft.NET.Build.Containers.Resources;
+using Microsoft.Build.Framework;
+using Microsoft.NET.Build.Containers.Resources;
 
-// namespace Microsoft.NET.Build.Containers;
+namespace Microsoft.NET.Build.Containers;
 
+internal static class ImagePublisher
+{
+    public static async Task PublishImage(
+        BuiltImage image,
+        SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        Microsoft.Build.Utilities.TaskLoggingHelper Log,
+        IBuildEngine? BuildEngine,
+        Telemetry telemetry,
+        CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-// internal static class ImagePublisher
-// {
-//     public static async Task PublishImage(BuiltImage builtImage, SourceImageReference sourceImageReference,
-//         DestinationImageReference destinationImageReference,
-//         Telemetry telemetry,
-//         CancellationToken cancellationToken)
-//     {
-//         cancellationToken.ThrowIfCancellationRequested();
+        switch (destinationImageReference.Kind)
+        {
+            case DestinationImageReferenceKind.LocalRegistry:
+                await PushToLocalRegistryAsync(
+                    image,
+                    sourceImageReference,
+                    destinationImageReference,
+                    Log,
+                    BuildEngine,
+                    telemetry,
+                    cancellationToken).ConfigureAwait(false);
+                break;
+            case DestinationImageReferenceKind.RemoteRegistry:
+                await PushToRemoteRegistryAsync(
+                    image,
+                    sourceImageReference,
+                    destinationImageReference,
+                    Log,
+                    BuildEngine,
+                    cancellationToken).ConfigureAwait(false);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
 
-//         switch (destinationImageReference.Kind)
-//         {
-//             case DestinationImageReferenceKind.LocalRegistry:
-//                 await PushToLocalRegistryAsync(builtImage,
-//                     sourceImageReference,
-//                     destinationImageReference,
-//                     telemetry,
-//                     cancellationToken).ConfigureAwait(false);
-//                 break;
-//             case DestinationImageReferenceKind.RemoteRegistry:
-//                 await PushToRemoteRegistryAsync(builtImage,
-//                     sourceImageReference,
-//                     destinationImageReference,
-//                     cancellationToken).ConfigureAwait(false);
-//                 break;
-//             default:
-//                 throw new ArgumentOutOfRangeException();
-//         }
+        telemetry.LogPublishSuccess();
+    }
 
-//         telemetry.LogPublishSuccess();
-//     }
+    public static async Task PublishImage(
+        BuiltImage[] images,
+        SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        Microsoft.Build.Utilities.TaskLoggingHelper Log,
+        IBuildEngine? BuildEngine,
+        Telemetry telemetry,
+        CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-//     private static async Task PushToLocalRegistryAsync(
-//         BuiltImage builtImage,
-//         SourceImageReference sourceImageReference,
-//         DestinationImageReference destinationImageReference,
-//         Telemetry telemetry,
-//         CancellationToken cancellationToken)
-//     {
-//         ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
-//         if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
-//         {
-//             telemetry.LogMissingLocalBinary();
-//             Log.LogErrorWithCodeFromResources(nameof(Strings.LocalRegistryNotAvailable));
-//             return;
-//         }
-//         try
-//         {
-//             await localRegistry.LoadAsync(builtImage, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
-//             SafeLog(Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
+        switch (destinationImageReference.Kind)
+        {
+            case DestinationImageReferenceKind.LocalRegistry:
+                await PushToLocalRegistryAsync(
+                    images,
+                    sourceImageReference,
+                    destinationImageReference,
+                    Log,
+                    BuildEngine,
+                    telemetry,
+                    cancellationToken).ConfigureAwait(false);
+                break;
+            case DestinationImageReferenceKind.RemoteRegistry:
+                await PushToRemoteRegistryAsync(
+                    images,
+                    sourceImageReference,
+                    destinationImageReference,
+                    Log,
+                    BuildEngine,
+                    cancellationToken).ConfigureAwait(false);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
 
-//             if (localRegistry is ArchiveFileRegistry archive)
-//             {
-//                 GeneratedArchiveOutputPath = archive.ArchiveOutputPath;
-//             }
-//         }
-//         catch (ContainerHttpException e)
-//         {
-//             if (BuildEngine != null)
-//             {
-//                 Log.LogErrorFromException(e, true);
-//             }
-//         }
-//         catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
-//         {
-//             telemetry.LogLocalLoadError();
-//             Log.LogErrorFromException(dle, showStackTrace: false);
-//         }
-//         catch (ArgumentException argEx)
-//         {
-//             Log.LogErrorFromException(argEx, showStackTrace: false);
-//         }
-//     }
+        telemetry.LogPublishSuccess();
+    }
 
-//     private static async Task PushToRemoteRegistryAsync(
-//         BuiltImage builtImage,
-//         SourceImageReference sourceImageReference,
-//         DestinationImageReference destinationImageReference,
-//         CancellationToken cancellationToken)
-//     {
-//         try
-//         {
-//             await destinationImageReference.RemoteRegistry!.PushAsync(
-//                 builtImage,
-//                 sourceImageReference,
-//                 destinationImageReference,
-//                 cancellationToken).ConfigureAwait(false);
-//             SafeLog(Strings.ContainerBuilder_ImageUploadedToRegistry, destinationImageReference, OutputRegistry);
-//         }
-//         catch (UnableToAccessRepositoryException)
-//         {
-//             if (BuildEngine != null)
-//             {
-//                 Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
-//             }
-//         }
-//         catch (ContainerHttpException e)
-//         {
-//             if (BuildEngine != null)
-//             {
-//                 Log.LogErrorFromException(e, true);
-//             }
-//         }
-//         catch (Exception e)
-//         {
-//             if (BuildEngine != null)
-//             {
-//                 Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
-//                 Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
-//             }
-//         }
-//     }
-// }
\ No newline at end of file
+    private static async Task PushToLocalRegistryAsync(
+        BuiltImage image,
+        SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        Microsoft.Build.Utilities.TaskLoggingHelper Log,
+        IBuildEngine? BuildEngine,
+        Telemetry telemetry,
+        CancellationToken cancellationToken)
+    {
+        ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
+        if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
+        {
+            telemetry.LogMissingLocalBinary();
+            Log.LogErrorWithCodeFromResources(nameof(Strings.LocalRegistryNotAvailable));
+            return;
+        }
+        try
+        {
+            await localRegistry.LoadAsync(image, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
+            if (BuildEngine != null) 
+            {
+                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
+            }
+        }
+        catch (ContainerHttpException e)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorFromException(e, true);
+            }
+        }
+        catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
+        {
+            telemetry.LogLocalLoadError();
+            Log.LogErrorFromException(dle, showStackTrace: false);
+        }
+        catch (ArgumentException argEx)
+        {
+            Log.LogErrorFromException(argEx, showStackTrace: false);
+        }
+    }
+
+    private static async Task PushToLocalRegistryAsync(
+        BuiltImage[] images,
+        SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        Microsoft.Build.Utilities.TaskLoggingHelper Log,
+        IBuildEngine? BuildEngine,
+        Telemetry telemetry,
+        CancellationToken cancellationToken)
+    {
+        ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
+        if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
+        {
+            telemetry.LogMissingLocalBinary();
+            Log.LogErrorWithCodeFromResources(nameof(Strings.LocalRegistryNotAvailable));
+            return;
+        }
+        try
+        {
+            await localRegistry.LoadAsync(images, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
+            if (BuildEngine != null) 
+            {
+                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
+            }
+        }
+        catch (ContainerHttpException e)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorFromException(e, true);
+            }
+        }
+        catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
+        {
+            telemetry.LogLocalLoadError();
+            Log.LogErrorFromException(dle, showStackTrace: false);
+        }
+        catch (ArgumentException argEx)
+        {
+            Log.LogErrorFromException(argEx, showStackTrace: false);
+        }
+    }
+
+    private static async Task PushToRemoteRegistryAsync(
+        BuiltImage image,
+        SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        Microsoft.Build.Utilities.TaskLoggingHelper Log,
+        IBuildEngine? BuildEngine,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            await destinationImageReference.RemoteRegistry!.PushAsync(
+                image,
+                sourceImageReference,
+                destinationImageReference,
+                cancellationToken).ConfigureAwait(false);
+            if (BuildEngine != null) 
+            {
+                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToRegistry, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
+            }
+        }
+        catch (UnableToAccessRepositoryException)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
+            }
+        }
+        catch (ContainerHttpException e)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorFromException(e, true);
+            }
+        }
+        catch (Exception e)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
+                Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
+            }
+        }
+    }
+
+    private static async Task PushToRemoteRegistryAsync(
+        BuiltImage[] images,
+        SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        Microsoft.Build.Utilities.TaskLoggingHelper Log,
+        IBuildEngine? BuildEngine,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            (string imageIndex, string mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
+            await destinationImageReference.RemoteRegistry!.PushManifestListAsync(
+                destinationImageReference.Repository,
+                destinationImageReference.Tags,
+                imageIndex,
+                mediaType,
+                cancellationToken).ConfigureAwait(false);
+            if (BuildEngine != null) 
+            {
+                Log.LogMessage(MessageImportance.High, Strings.ImageIndexUploadedToRegistry, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
+            }
+        }
+        catch (UnableToAccessRepositoryException)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
+            }
+        }
+        catch (ContainerHttpException e)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorFromException(e, true);
+            }
+        }
+        catch (Exception e)
+        {
+            if (BuildEngine != null)
+            {
+                Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
+                Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
+            }
+        }
+    }
+}
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index e315adef8921..49326cd20cf9 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -151,115 +151,16 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             return false;
         }
 
-        var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
+        GeneratedArchiveOutputPath = ArchiveOutputPath;
 
-        switch (destinationImageReference.Kind)
-        {
-            case DestinationImageReferenceKind.LocalRegistry:
-                await PushToLocalRegistryAsync(images,
-                    sourceImageReference,
-                    destinationImageReference,
-                    telemetry,
-                    cancellationToken).ConfigureAwait(false);
-                break;
-            case DestinationImageReferenceKind.RemoteRegistry:
-                await PushToRemoteRegistryAsync(images,
-                    destinationImageReference,
-                    cancellationToken).ConfigureAwait(false);
-                break;
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
+        var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
-        telemetry.LogPublishSuccess();
+        await ImagePublisher.PublishImage(images, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
+            .ConfigureAwait(false);
 
         return !Log.HasLoggedErrors;
     }
 
-    private async Task PushToLocalRegistryAsync(BuiltImage[] images, SourceImageReference sourceImageReference,
-        DestinationImageReference destinationImageReference,
-        Telemetry telemetry,
-        CancellationToken cancellationToken)
-    {
-        ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
-        if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
-        {
-            telemetry.LogMissingLocalBinary();
-            Log.LogErrorWithCodeFromResources(nameof(Strings.LocalRegistryNotAvailable));
-            return;
-        }
-        try
-        {
-            await localRegistry.LoadAsync(images, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
-            SafeLog(Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
-
-            if (localRegistry is ArchiveFileRegistry archive)
-            {
-                GeneratedArchiveOutputPath = archive.ArchiveOutputPath;
-            }
-        }
-        catch (ContainerHttpException e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorFromException(e, true);
-            }
-        }
-        catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
-        {
-            telemetry.LogLocalLoadError();
-            Log.LogErrorFromException(dle, showStackTrace: false);
-        }
-        catch (ArgumentException argEx)
-        {
-            Log.LogErrorFromException(argEx, showStackTrace: false);
-        }
-    }
-
-    private async Task PushToRemoteRegistryAsync(BuiltImage[] images,
-        DestinationImageReference destinationImageReference,
-        CancellationToken cancellationToken)
-    {
-        try
-        {
-            (string imageIndex, string mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
-            await destinationImageReference.RemoteRegistry!.PushManifestListAsync(
-                destinationImageReference.Repository,
-                destinationImageReference.Tags,
-                imageIndex,
-                mediaType,
-                cancellationToken).ConfigureAwait(false);
-            SafeLog(Strings.ImageIndexUploadedToRegistry, destinationImageReference, OutputRegistry);
-        }
-        catch (UnableToAccessRepositoryException)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
-            }
-        }
-        catch (ContainerHttpException e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorFromException(e, true);
-            }
-        }
-        catch (Exception e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
-                Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
-            }
-        }
-    }
-
-    private void SafeLog(string message, params object[] formatParams)
-    {
-        if (BuildEngine != null) Log.LogMessage(MessageImportance.High, message, formatParams);
-    }
-
     private BuiltImage[] ParseImages(DestinationImageReferenceKind destinationKind)
     {
         var images = new BuiltImage[GeneratedContainers.Length];
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index 89131d696e46..ba9eea570872 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -1,10 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text.Json;
 using Microsoft.Build.Framework;
 using Microsoft.Extensions.Logging;
-using Microsoft.NET.Build.Containers.LocalDaemons;
 using Microsoft.NET.Build.Containers.Logging;
 using Microsoft.NET.Build.Containers.Resources;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -122,7 +120,10 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             return !Log.HasLoggedErrors;
         }
 
-        SafeLog(Strings.ContainerBuilder_StartBuildingImage, Repository, String.Join(",", ImageTags), sourceImageReference);
+        if (BuildEngine != null) 
+        {
+            Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_StartBuildingImage, Repository, String.Join(",", ImageTags), sourceImageReference);
+        }
 
         Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
         imageBuilder.AddLayer(newLayer);
@@ -177,107 +178,12 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
         GeneratedContainerMediaType = builtImage.ManifestMediaType;
         GeneratedContainerNames = destinationImageReference.FullyQualifiedImageNames().Select(name => new Microsoft.Build.Utilities.TaskItem(name)).ToArray();
 
-        switch (destinationImageReference.Kind)
-        {
-            case DestinationImageReferenceKind.LocalRegistry:
-                await PushToLocalRegistryAsync(builtImage,
-                    sourceImageReference,
-                    destinationImageReference,
-                    telemetry,
-                    cancellationToken).ConfigureAwait(false);
-                break;
-            case DestinationImageReferenceKind.RemoteRegistry:
-                await PushToRemoteRegistryAsync(builtImage,
-                    sourceImageReference,
-                    destinationImageReference,
-                    cancellationToken).ConfigureAwait(false);
-                break;
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-
-        telemetry.LogPublishSuccess();
+        await ImagePublisher.PublishImage(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
+            .ConfigureAwait(false);
 
         return !Log.HasLoggedErrors;
     }
 
-    private async Task PushToLocalRegistryAsync(BuiltImage builtImage, SourceImageReference sourceImageReference,
-        DestinationImageReference destinationImageReference,
-        Telemetry telemetry,
-        CancellationToken cancellationToken)
-    {
-        ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
-        if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
-        {
-            telemetry.LogMissingLocalBinary();
-            Log.LogErrorWithCodeFromResources(nameof(Strings.LocalRegistryNotAvailable));
-            return;
-        }
-        try
-        {
-            await localRegistry.LoadAsync(builtImage, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
-            SafeLog(Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
-
-            if (localRegistry is ArchiveFileRegistry archive)
-            {
-                GeneratedArchiveOutputPath = archive.ArchiveOutputPath;
-            }
-        }
-        catch (ContainerHttpException e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorFromException(e, true);
-            }
-        }
-        catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
-        {
-            telemetry.LogLocalLoadError();
-            Log.LogErrorFromException(dle, showStackTrace: false);
-        }
-        catch (ArgumentException argEx)
-        {
-            Log.LogErrorFromException(argEx, showStackTrace: false);
-        }
-    }
-
-    private async Task PushToRemoteRegistryAsync(BuiltImage builtImage, SourceImageReference sourceImageReference,
-        DestinationImageReference destinationImageReference,
-        CancellationToken cancellationToken)
-    {
-        try
-        {
-            await destinationImageReference.RemoteRegistry!.PushAsync(
-                builtImage,
-                sourceImageReference,
-                destinationImageReference,
-                cancellationToken).ConfigureAwait(false);
-            SafeLog(Strings.ContainerBuilder_ImageUploadedToRegistry, destinationImageReference, OutputRegistry);
-        }
-        catch (UnableToAccessRepositoryException)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
-            }
-        }
-        catch (ContainerHttpException e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorFromException(e, true);
-            }
-        }
-        catch (Exception e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
-                Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
-            }
-        }
-    }
-
     private void SetPorts(ImageBuilder image, ITaskItem[] exposedPorts)
     {
         foreach (var port in exposedPorts)
@@ -324,11 +230,6 @@ private void SetEnvironmentVariables(ImageBuilder img, ITaskItem[] envVars)
         }
     }
 
-    private void SafeLog(string message, params object[] formatParams)
-    {
-        if (BuildEngine != null) Log.LogMessage(MessageImportance.High, message, formatParams);
-    }
-
     public void Dispose()
     {
         _cancellationTokenSource.Dispose();

From 7acc5e91ae0c98cd3b29b99f89a038d29c7dbe06 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Fri, 31 Jan 2025 23:43:21 +0100
Subject: [PATCH 052/127] refactor ImagePublisher

---
 .../ImagePublisher.cs                         | 153 +++++-------------
 .../Tasks/CreateImageIndex.cs                 |   2 +-
 .../Tasks/CreateNewImage.cs                   |   2 +-
 3 files changed, 45 insertions(+), 112 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index e2b76e461867..960a0b0c6027 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -8,8 +8,8 @@ namespace Microsoft.NET.Build.Containers;
 
 internal static class ImagePublisher
 {
-    public static async Task PublishImage(
-        BuiltImage image,
+    public static async Task PublishImageAsync(
+        BuiltImage singleArchImage,
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
@@ -23,22 +23,26 @@ public static async Task PublishImage(
         {
             case DestinationImageReferenceKind.LocalRegistry:
                 await PushToLocalRegistryAsync(
-                    image,
+                    singleArchImage,
                     sourceImageReference,
                     destinationImageReference,
                     Log,
                     BuildEngine,
                     telemetry,
-                    cancellationToken).ConfigureAwait(false);
+                    cancellationToken,
+                    destinationImageReference.LocalRegistry!.LoadAsync,
+                    Strings.ContainerBuilder_ImageUploadedToLocalDaemon).ConfigureAwait(false);
                 break;
             case DestinationImageReferenceKind.RemoteRegistry:
                 await PushToRemoteRegistryAsync(
-                    image,
+                    singleArchImage,
                     sourceImageReference,
                     destinationImageReference,
                     Log,
                     BuildEngine,
-                    cancellationToken).ConfigureAwait(false);
+                    cancellationToken,
+                    destinationImageReference.RemoteRegistry!.PushAsync,
+                    Strings.ContainerBuilder_ImageUploadedToRegistry).ConfigureAwait(false);
                 break;
             default:
                 throw new ArgumentOutOfRangeException();
@@ -47,8 +51,8 @@ await PushToRemoteRegistryAsync(
         telemetry.LogPublishSuccess();
     }
 
-    public static async Task PublishImage(
-        BuiltImage[] images,
+    public static async Task PublishImageAsync(
+        BuiltImage[] multiArchImage,
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
@@ -62,22 +66,35 @@ public static async Task PublishImage(
         {
             case DestinationImageReferenceKind.LocalRegistry:
                 await PushToLocalRegistryAsync(
-                    images,
+                    multiArchImage,
                     sourceImageReference,
                     destinationImageReference,
                     Log,
                     BuildEngine,
                     telemetry,
-                    cancellationToken).ConfigureAwait(false);
+                    cancellationToken,
+                    destinationImageReference.LocalRegistry!.LoadAsync,
+                    Strings.ContainerBuilder_ImageUploadedToLocalDaemon).ConfigureAwait(false);
                 break;
             case DestinationImageReferenceKind.RemoteRegistry:
                 await PushToRemoteRegistryAsync(
-                    images,
+                    multiArchImage,
                     sourceImageReference,
                     destinationImageReference,
                     Log,
                     BuildEngine,
-                    cancellationToken).ConfigureAwait(false);
+                    cancellationToken,
+                    async (images, source, destination, token) =>
+                    {
+                        (string imageIndex, string mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
+                        await destinationImageReference.RemoteRegistry!.PushManifestListAsync(
+                            destinationImageReference.Repository,
+                            destinationImageReference.Tags,
+                            imageIndex,
+                            mediaType,
+                            cancellationToken).ConfigureAwait(false);
+                    },
+                    Strings.ImageIndexUploadedToRegistry).ConfigureAwait(false);
                 break;
             default:
                 throw new ArgumentOutOfRangeException();
@@ -86,14 +103,16 @@ await PushToRemoteRegistryAsync(
         telemetry.LogPublishSuccess();
     }
 
-    private static async Task PushToLocalRegistryAsync(
-        BuiltImage image,
+    private static async Task PushToLocalRegistryAsync<T>(
+        T image,
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
         IBuildEngine? BuildEngine,
         Telemetry telemetry,
-        CancellationToken cancellationToken)
+        CancellationToken cancellationToken,
+        Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc,
+        string successMessage)
     {
         ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
         if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
@@ -104,10 +123,10 @@ private static async Task PushToLocalRegistryAsync(
         }
         try
         {
-            await localRegistry.LoadAsync(image, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
+            await loadFunc(image, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
             if (BuildEngine != null) 
             {
-                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
+                Log.LogMessage(MessageImportance.High, successMessage, destinationImageReference, localRegistry);
             }
         }
         catch (ContainerHttpException e)
@@ -128,112 +147,26 @@ private static async Task PushToLocalRegistryAsync(
         }
     }
 
-    private static async Task PushToLocalRegistryAsync(
-        BuiltImage[] images,
+    private static async Task PushToRemoteRegistryAsync<T>(
+        T image,
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
         IBuildEngine? BuildEngine,
-        Telemetry telemetry,
-        CancellationToken cancellationToken)
+        CancellationToken cancellationToken,
+        Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> pushFunc,
+        string successMessage)
     {
-        ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
-        if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
-        {
-            telemetry.LogMissingLocalBinary();
-            Log.LogErrorWithCodeFromResources(nameof(Strings.LocalRegistryNotAvailable));
-            return;
-        }
         try
         {
-            await localRegistry.LoadAsync(images, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
-            if (BuildEngine != null) 
-            {
-                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
-            }
-        }
-        catch (ContainerHttpException e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorFromException(e, true);
-            }
-        }
-        catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
-        {
-            telemetry.LogLocalLoadError();
-            Log.LogErrorFromException(dle, showStackTrace: false);
-        }
-        catch (ArgumentException argEx)
-        {
-            Log.LogErrorFromException(argEx, showStackTrace: false);
-        }
-    }
-
-    private static async Task PushToRemoteRegistryAsync(
-        BuiltImage image,
-        SourceImageReference sourceImageReference,
-        DestinationImageReference destinationImageReference,
-        Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        IBuildEngine? BuildEngine,
-        CancellationToken cancellationToken)
-    {
-        try
-        {
-            await destinationImageReference.RemoteRegistry!.PushAsync(
+            await pushFunc(
                 image,
                 sourceImageReference,
                 destinationImageReference,
                 cancellationToken).ConfigureAwait(false);
             if (BuildEngine != null) 
             {
-                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToRegistry, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
-            }
-        }
-        catch (UnableToAccessRepositoryException)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
-            }
-        }
-        catch (ContainerHttpException e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorFromException(e, true);
-            }
-        }
-        catch (Exception e)
-        {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
-                Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
-            }
-        }
-    }
-
-    private static async Task PushToRemoteRegistryAsync(
-        BuiltImage[] images,
-        SourceImageReference sourceImageReference,
-        DestinationImageReference destinationImageReference,
-        Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        IBuildEngine? BuildEngine,
-        CancellationToken cancellationToken)
-    {
-        try
-        {
-            (string imageIndex, string mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
-            await destinationImageReference.RemoteRegistry!.PushManifestListAsync(
-                destinationImageReference.Repository,
-                destinationImageReference.Tags,
-                imageIndex,
-                mediaType,
-                cancellationToken).ConfigureAwait(false);
-            if (BuildEngine != null) 
-            {
-                Log.LogMessage(MessageImportance.High, Strings.ImageIndexUploadedToRegistry, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
+                Log.LogMessage(MessageImportance.High, successMessage, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
             }
         }
         catch (UnableToAccessRepositoryException)
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 49326cd20cf9..69340f2642ac 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -155,7 +155,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
-        await ImagePublisher.PublishImage(images, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
+        await ImagePublisher.PublishImageAsync(images, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
             .ConfigureAwait(false);
 
         return !Log.HasLoggedErrors;
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index ba9eea570872..64a298b83e53 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -178,7 +178,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
         GeneratedContainerMediaType = builtImage.ManifestMediaType;
         GeneratedContainerNames = destinationImageReference.FullyQualifiedImageNames().Select(name => new Microsoft.Build.Utilities.TaskItem(name)).ToArray();
 
-        await ImagePublisher.PublishImage(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
+        await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
             .ConfigureAwait(false);
 
         return !Log.HasLoggedErrors;

From 181b6fa27377cc7d6132d8a9617f5c5cd9dd9080 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 1 Feb 2025 11:18:16 +0100
Subject: [PATCH 053/127] skip publishing individual images in case of tarball
 and local daemon docker publishing

---
 .../Tasks/CreateNewImage.Interface.cs             |  5 +++++
 .../Tasks/CreateNewImage.cs                       |  9 ++++++---
 .../build/Microsoft.NET.Build.Containers.targets  | 15 ++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
index 3da5135b9b07..5e9c01de4e45 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
@@ -161,6 +161,11 @@ partial class CreateNewImage
     [Required]
     public bool GenerateDigestLabel { get; set; }
 
+    /// <summary>
+    /// If true, the tooling will skip the publishing step.
+    /// </summary>
+    public bool SkipPublishing { get; set; }
+
     [Output]
     public string GeneratedContainerManifest { get; set; }
 
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index 64a298b83e53..bcc429acf343 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -178,9 +178,12 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
         GeneratedContainerMediaType = builtImage.ManifestMediaType;
         GeneratedContainerNames = destinationImageReference.FullyQualifiedImageNames().Select(name => new Microsoft.Build.Utilities.TaskItem(name)).ToArray();
 
-        await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
-            .ConfigureAwait(false);
-
+        if (!SkipPublishing)
+        {
+            await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
+                .ConfigureAwait(false);
+        }
+        
         return !Log.HasLoggedErrors;
     }
 
diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 5309bdbeaf8b..8817641c790a 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -274,6 +274,7 @@
                     ContainerRuntimeIdentifier="$(ContainerRuntimeIdentifier)"
                     ContainerUser="$(ContainerUser)"
                     RuntimeIdentifierGraphPath="$(RuntimeIdentifierGraphPath)"
+                    SkipPublishing="$(_SkipContainerPublishing)"
                     GenerateLabels="$(ContainerGenerateLabels)"
                     GenerateDigestLabel="$(ContainerGenerateLabelsImageBaseDigest)"> <!-- The RID graph path is provided as a property by the SDK. -->
 
@@ -302,6 +303,17 @@
                  !$(ContainerArchiveOutputPath.EndsWith('\\')) and
                  $(ContainerArchiveOutputPath.EndsWith('.tar.gz'))" />
 
+    <PropertyGroup>
+      <!--We want to skip publishing individual images in case of multi-arch tarball publishing or local daemon (only docker) publishing because all images are published in one tarball.-->
+      <!--We don't want to skip publishing individual images in case of remote registry because the individual images should be available in the registry before image index is pushed.-->
+      <!--We don't want to skip publishing individual images in case of local daemon podman because podman loads multi-arch tarball differently - only individual image for the current platform.-->
+      <_IsTarballPublishing Condition="'$(ContainerArchiveOutputPath)' != ''">true</_IsTarballPublishing>
+      <_IsLocalDockerPublishing Condition="$(ContainerRegistry) == '' and ($(LocalRegistry) == '' or $(LocalRegistry) == 'Docker')">true</_IsLocalDockerPublishing>
+     
+      <_SkipContainerPublishing>false</_SkipContainerPublishing>
+      <_SkipContainerPublishing Condition="'$(_IsTarballPublishing)' == 'true' or '$(_IsLocalDockerPublishing)' == 'true'">true</_SkipContainerPublishing>
+    </PropertyGroup>
+
     <ItemGroup>
       <_rids Include="$(ContainerRuntimeIdentifiers)" Condition="'$(ContainerRuntimeIdentifiers)' != ''" />
       <_rids Include="$(RuntimeIdentifiers)" Condition="'$(ContainerRuntimeIdentifiers)' == '' and '$(RuntimeIdentifiers)' != ''" />
@@ -328,7 +340,8 @@
           _ContainerEnvironmentVariables=@(ContainerEnvironmentVariable->'%(Identity):%(Value)');
           ContainerUser=$(ContainerUser);
           ContainerGenerateLabels=$(ContainerGenerateLabels);
-          ContainerGenerateLabelsImageBaseDigest=$(ContainerGenerateLabelsImageBaseDigest)
+          ContainerGenerateLabelsImageBaseDigest=$(ContainerGenerateLabelsImageBaseDigest);
+          _SkipContainerPublishing=$(_SkipContainerPublishing)
         "/>
       <_rids Remove ="$(_rids)" />
     </ItemGroup>

From ec09d0501edad23835ba7d62768ee52ccaf4a3d1 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 1 Feb 2025 11:19:04 +0100
Subject: [PATCH 054/127] update public api

---
 .../PublicAPI/net472/PublicAPI.Unshipped.txt                    | 2 ++
 .../PublicAPI/net8.0/PublicAPI.Unshipped.txt                    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt
index 43526e9c3ab4..9e6b0de71dc0 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt
+++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt
@@ -86,6 +86,8 @@ Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateLabels.get -> bool
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateLabels.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateDigestLabel.get -> bool
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateDigestLabel.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateNewImage.SkipPublishing.get -> bool
+Microsoft.NET.Build.Containers.Tasks.CreateNewImage.SkipPublishing.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GeneratedContainerNames.get -> Microsoft.Build.Framework.ITaskItem![]!
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GeneratedContainerNames.set -> void
 override Microsoft.NET.Build.Containers.Tasks.CreateNewImage.ToolName.get -> string!
diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
index f7e2955bd01f..5c07a3871ceb 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
+++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -251,6 +251,8 @@ Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateLabels.get -> bool
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateLabels.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateDigestLabel.get -> bool
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateDigestLabel.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateNewImage.SkipPublishing.get -> bool
+Microsoft.NET.Build.Containers.Tasks.CreateNewImage.SkipPublishing.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GeneratedContainerNames.get -> Microsoft.Build.Framework.ITaskItem![]!
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GeneratedContainerNames.set -> void
 Microsoft.NET.Build.Containers.Tasks.ParseContainerProperties

From 5e38e739a16069ebea234e47c509ba7a81536783 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 1 Feb 2025 13:37:57 +0100
Subject: [PATCH 055/127] skip CreateImageIndex task in case of local damon
 podman publishing as it is not supported

---
 .../Resources/Strings.Designer.cs                    |  9 +++++++++
 .../Resources/Strings.resx                           |  4 ++++
 .../Resources/xlf/Strings.cs.xlf                     |  5 +++++
 .../Resources/xlf/Strings.de.xlf                     |  5 +++++
 .../Resources/xlf/Strings.es.xlf                     |  5 +++++
 .../Resources/xlf/Strings.fr.xlf                     |  5 +++++
 .../Resources/xlf/Strings.it.xlf                     |  5 +++++
 .../Resources/xlf/Strings.ja.xlf                     |  5 +++++
 .../Resources/xlf/Strings.ko.xlf                     |  5 +++++
 .../Resources/xlf/Strings.pl.xlf                     |  5 +++++
 .../Resources/xlf/Strings.pt-BR.xlf                  |  5 +++++
 .../Resources/xlf/Strings.ru.xlf                     |  5 +++++
 .../Resources/xlf/Strings.tr.xlf                     |  5 +++++
 .../Resources/xlf/Strings.zh-Hans.xlf                |  5 +++++
 .../Resources/xlf/Strings.zh-Hant.xlf                |  5 +++++
 .../Tasks/CreateImageIndex.cs                        |  8 ++++++--
 .../build/Microsoft.NET.Build.Containers.targets     | 12 +++++++-----
 17 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
index aff92942f408..c2b9b565298b 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
@@ -402,6 +402,15 @@ internal static string InvalidImageMetadata {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Image index creation for Podman is not supported..
+        /// </summary>
+        internal static string ImageIndex_PodmanNotSupported {
+            get {
+                return ResourceManager.GetString("ImageIndex_PodmanNotSupported", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2005: The inferred image name &apos;{0}&apos; contains entirely invalid characters. The valid characters for an image name are alphanumeric characters, -, /, or _, and the image name must start with an alphanumeric character..
         /// </summary>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
index 6337f4861b8e..40e57e54665b 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
@@ -380,6 +380,10 @@
     <value>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</value>
     <comment/>
   </data>
+  <data name="ImageIndex_PodmanNotSupported" xml:space="preserve">
+    <value>Image index creation for Podman is not supported.</value>
+    <comment/>
+  </data>
   <data name="LocalDocker_FailedToGetConfig" xml:space="preserve">
     <value>Error while reading daemon config: {0}</value>
     <comment>{0} is the exception message that ends with period</comment>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
index f0d7173a9cea..8e8ff66ce2e9 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: Nepodařilo se načíst bitovou kopii z místního registru. stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
index ea8fc611e0a0..c7be81fff503 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: Fehler beim Laden des Images aus der lokalen Registrierung. stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
index b4921dcbdf47..cb3170c2954d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: no se pudo cargar la imagen desde el registro local. Stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
index b945393a8398..cab3d8d82aca 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: Échec du chargement de l'image à partir du registre local. sortie standard : {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
index b42327bbfb94..a5f41cf91d2e 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: non è stato possibile caricare l'immagine dal registro locale. stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
index 5d2cf22f0f8c..cd52c02f2459 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: ローカル レジストリからイメージを読み込めませんでした。stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
index 2ff624cec676..8f5d7f791e13 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: 로컬 레지스트리에서 이미지를 로드하지 못했습니다. stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
index 86288597ee7c..1cbda11cd891 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: Nie można załadować obrazu z rejestru lokalnego. stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
index 69fcf3548d8d..9467c4090ed2 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: falha ao carregar a imagem do registro local. stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
index 2989bc8e9687..295593dc4fa5 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: не удалось загрузить образ из локального реестра. stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
index 42fcb52485c7..49ce6f3ce305 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: Görüntü yerel kayıt defterinden yüklenemedi. stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
index 8eb6429f7db6..dd9faa355ab4 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: 未能从本地注册表加载映像。stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
index 892b174bbe97..d7e262e3310a 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
@@ -164,6 +164,11 @@
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageIndex_PodmanNotSupported">
+        <source>Image index creation for Podman is not supported.</source>
+        <target state="new">Image index creation for Podman is not supported.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageLoadFailed">
         <source>CONTAINER1009: Failed to load image from local registry. stdout: {0}</source>
         <target state="translated">CONTAINER1009: 無法從本機登錄載入映像。stdout: {0}</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 69340f2642ac..655b0e52a9d4 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -1,12 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using Microsoft.Build.Framework;
 using Microsoft.Extensions.Logging;
-using Microsoft.NET.Build.Containers.LocalDaemons;
 using Microsoft.NET.Build.Containers.Logging;
 using Microsoft.NET.Build.Containers.Resources;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -128,6 +126,12 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
+        if (LocalRegistry == "Podman")
+        {
+            Log.LogError(Strings.ImageIndex_PodmanNotSupported);
+            return false;
+        }
+
         using MSBuildLoggerProvider loggerProvider = new(Log);
         ILoggerFactory msbuildLoggerFactory = new LoggerFactory(new[] { loggerProvider });
         ILogger logger = msbuildLoggerFactory.CreateLogger<CreateImageIndex>();
diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 8817641c790a..d092e5951cd4 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -307,11 +307,12 @@
       <!--We want to skip publishing individual images in case of multi-arch tarball publishing or local daemon (only docker) publishing because all images are published in one tarball.-->
       <!--We don't want to skip publishing individual images in case of remote registry because the individual images should be available in the registry before image index is pushed.-->
       <!--We don't want to skip publishing individual images in case of local daemon podman because podman loads multi-arch tarball differently - only individual image for the current platform.-->
-      <_IsTarballPublishing Condition="'$(ContainerArchiveOutputPath)' != ''">true</_IsTarballPublishing>
-      <_IsLocalDockerPublishing Condition="$(ContainerRegistry) == '' and ($(LocalRegistry) == '' or $(LocalRegistry) == 'Docker')">true</_IsLocalDockerPublishing>
-     
       <_SkipContainerPublishing>false</_SkipContainerPublishing>
-      <_SkipContainerPublishing Condition="'$(_IsTarballPublishing)' == 'true' or '$(_IsLocalDockerPublishing)' == 'true'">true</_SkipContainerPublishing>
+      <_SkipContainerPublishing Condition="$(ContainerArchiveOutputPath) != '' or ( $(ContainerRegistry) == '' and ( $(LocalRegistry) == '' or $(LocalRegistry) == 'Docker' ) )">true</_SkipContainerPublishing>
+    
+      <!--We want to skip CreateImageIndex task in case of local daemon podman because it is not supported.-->
+      <_SkipCreateImageIndex>false</_SkipCreateImageIndex>
+      <_SkipCreateImageIndex Condition="$(ContainerArchiveOutputPath) == '' and $(ContainerRegistry) == '' and $(LocalRegistry) == 'Podman'">true</_SkipCreateImageIndex>
     </PropertyGroup>
 
     <ItemGroup>
@@ -353,7 +354,8 @@
         <Output TaskParameter="TargetOutputs" ItemName="GeneratedContainers" />
     </MSBuild>
 
-    <CreateImageIndex GeneratedContainers="@(GeneratedContainers)"
+    <CreateImageIndex Condition="'$(_SkipCreateImageIndex)' == 'false' "
+                      GeneratedContainers="@(GeneratedContainers)"
                       LocalRegistry="$(LocalRegistry)"
                       OutputRegistry="$(ContainerRegistry)"
                       ArchiveOutputPath="$(ContainerArchiveOutputPath)"

From 88c613a5b7454ac1409fa40613575f59a3ddb286 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 1 Feb 2025 16:46:10 +0100
Subject: [PATCH 056/127] refactor CreateImageIndex task; improve logging; log
 tip for enabling conrainerd

---
 .../ImagePublisher.cs                         | 15 +++-
 .../PublicAPI/net8.0/PublicAPI.Unshipped.txt  |  2 -
 .../Resources/Strings.Designer.cs             | 26 +++++-
 .../Resources/Strings.resx                    | 14 ++-
 .../Resources/xlf/Strings.cs.xlf              | 22 +++--
 .../Resources/xlf/Strings.de.xlf              | 22 +++--
 .../Resources/xlf/Strings.es.xlf              | 22 +++--
 .../Resources/xlf/Strings.fr.xlf              | 22 +++--
 .../Resources/xlf/Strings.it.xlf              | 22 +++--
 .../Resources/xlf/Strings.ja.xlf              | 22 +++--
 .../Resources/xlf/Strings.ko.xlf              | 22 +++--
 .../Resources/xlf/Strings.pl.xlf              | 22 +++--
 .../Resources/xlf/Strings.pt-BR.xlf           | 22 +++--
 .../Resources/xlf/Strings.ru.xlf              | 22 +++--
 .../Resources/xlf/Strings.tr.xlf              | 22 +++--
 .../Resources/xlf/Strings.zh-Hans.xlf         | 22 +++--
 .../Resources/xlf/Strings.zh-Hant.xlf         | 22 +++--
 .../Tasks/CreateImageIndex.Interface.cs       | 80 +++++++++++++++++
 .../Tasks/CreateImageIndex.cs                 | 90 +------------------
 .../Tasks/CreateNewImage.cs                   |  5 +-
 .../Microsoft.NET.Build.Containers.targets    |  4 +-
 .../CreateImageIndexTests.cs                  | 24 ++---
 22 files changed, 355 insertions(+), 191 deletions(-)
 create mode 100644 src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index 960a0b0c6027..fa890b82506a 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -74,7 +74,8 @@ await PushToLocalRegistryAsync(
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync,
-                    Strings.ContainerBuilder_ImageUploadedToLocalDaemon).ConfigureAwait(false);
+                    Strings.ContainerBuilder_ImageUploadedToLocalDaemon,
+                    logWarningForMultiArch : true).ConfigureAwait(false);
                 break;
             case DestinationImageReferenceKind.RemoteRegistry:
                 await PushToRemoteRegistryAsync(
@@ -112,7 +113,8 @@ private static async Task PushToLocalRegistryAsync<T>(
         Telemetry telemetry,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc,
-        string successMessage)
+        string successMessage,
+        bool logWarningForMultiArch = false)
     {
         ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
         if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
@@ -145,6 +147,15 @@ private static async Task PushToLocalRegistryAsync<T>(
         {
             Log.LogErrorFromException(argEx, showStackTrace: false);
         }
+        catch (DockerLoadException dle)
+        {
+            telemetry.LogLocalLoadError();
+            Log.LogErrorFromException(dle, showStackTrace: false);
+            if (logWarningForMultiArch && dle.Message.Contains("no such file or directory"))
+            {
+                Log.LogMessage(MessageImportance.High, "Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.");
+            }
+        }
     }
 
     private static async Task PushToRemoteRegistryAsync<T>(
diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
index 5c07a3871ceb..e5efa4bed6c1 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
+++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -34,8 +34,6 @@ Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedArchiveOutputPath
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.Cancel() -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.CreateImageIndex() -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.Dispose() -> void
-Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedImageIndex.get -> string!
-Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedImageIndex.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.ImageTags.get -> string![]!
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.ImageTags.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedContainers.get -> Microsoft.Build.Framework.ITaskItem![]!
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
index c2b9b565298b..5750e050ba0e 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
@@ -204,6 +204,15 @@ internal static string ContainerBuilder_StartBuildingImage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Building image &apos;{0}&apos; for runtime identifier &apos;{1}&apos; on top of base image &apos;{2}&apos;..
+        /// </summary>
+        internal static string ContainerBuilder_StartBuildingImageForRid {
+            get {
+                return ResourceManager.GetString("ContainerBuilder_StartBuildingImageForRid", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER3001: Failed creating {0} process..
         /// </summary>
@@ -376,7 +385,7 @@ internal static string ImagePullNotSupported {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create manifest list (image index) because no images were provided..
+        ///   Looks up a localized string similar to Cannot create image index because no images were provided..
         /// </summary>
         internal static string ImagesEmpty {
             get {
@@ -394,7 +403,7 @@ internal static string InvalidEnvVar {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create manifest list (image index) because provided images are invalid. Items must have &apos;Config&apos;, &apos;Manifest&apos;, &apos;ManifestMediaType&apos; and &apos;ManifestDigest&apos; metadata..
+        ///   Looks up a localized string similar to Cannot create image index because provided images are invalid. Items must have &apos;Config&apos;, &apos;Manifest&apos;, &apos;ManifestMediaType&apos; and &apos;ManifestDigest&apos; metadata..
         /// </summary>
         internal static string InvalidImageMetadata {
             get {
@@ -402,6 +411,15 @@ internal static string InvalidImageMetadata {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot create image index because at least one of the provided images manifest is invalid..
+        /// </summary>
+        internal static string InvalidImageManifest {
+            get {
+                return ResourceManager.GetString("InvalidImageManifest", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Image index creation for Podman is not supported..
         /// </summary>
@@ -565,7 +583,7 @@ internal static string MissingPortNumber {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;mediaType&apos; of manifests should be the same in manifest list (image index)..
+        ///   Looks up a localized string similar to &apos;mediaType&apos; of manifests should be the same in image index..
         /// </summary>
         internal static string MixedMediaTypes {
             get {
@@ -817,7 +835,7 @@ internal static string UnrecognizedMediaType {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create manifest list (image index) for the provided &apos;mediaType&apos; = &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Cannot create image index for the provided &apos;mediaType&apos; = &apos;{0}&apos;..
         /// </summary>
         internal static string UnsupportedMediaType {
             get {
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
index 40e57e54665b..a27e84824210 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
@@ -358,6 +358,10 @@
     <value>Building image '{0}' with tags '{1}' on top of base image '{2}'.</value>
     <comment/>
   </data>
+  <data name="ContainerBuilder_StartBuildingImageForRid" xml:space="preserve">
+    <value>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</value>
+    <comment/>
+  </data>
   <data name="BuildingImageIndex" xml:space="preserve">
     <value>Building image index '{0}' on top of manifests {1}.</value>
     <comment>
@@ -369,15 +373,19 @@
     <comment/>
   </data>
   <data name="UnsupportedMediaType" xml:space="preserve">
-    <value>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</value>
+    <value>Cannot create image index for the provided 'mediaType' = '{0}'.</value>
     <comment/>
   </data>
   <data name="ImagesEmpty" xml:space="preserve">
-    <value>Cannot create manifest list (image index) because no images were provided.</value>
+    <value>Cannot create image index because no images were provided.</value>
     <comment/>
   </data>
   <data name="InvalidImageMetadata" xml:space="preserve">
-    <value>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</value>
+    <value>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</value>
+    <comment/>
+  </data>
+  <data name="InvalidImageManifest" xml:space="preserve">
+    <value>Cannot create image index because at least one of the provided images manifest is invalid.</value>
     <comment/>
   </data>
   <data name="ImageIndex_PodmanNotSupported" xml:space="preserve">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
index 8e8ff66ce2e9..3d6e472adb12 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
@@ -79,6 +79,11 @@
         <target state="translated">Sestavení image {0} se značkami {1} nad základní imagí {2}</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: Nepovedlo se deserializovat token z JSON.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' není platná proměnná prostředí. Ignorování.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
index c7be81fff503..a9298e5a40de 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
@@ -79,6 +79,11 @@
         <target state="translated">Das Image „{0}“ mit den Tags „{1}“ wird auf dem Basisimage „{2}“ erstellt.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: Das Token konnte nicht aus JSON deserialisiert werden.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: „{1}“ war keine gültige Umgebungsvariable. Sie wird ignoriert.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
index cb3170c2954d..0e6827c5b8dd 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
@@ -79,6 +79,11 @@
         <target state="translated">Compilando imagen "{0}" con etiquetas "{1}" encima de la imagen base "{2}".</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: No se pudo deserializar el token de JSON.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: "{1}" no era una variable de entorno válida. Ignorando.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
index cab3d8d82aca..d9fd1c30d615 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
@@ -79,6 +79,11 @@
         <target state="translated">Génération de l’image «{0}» avec des balises «{1}» au-dessus de l’image de base «{2}».</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: impossible de désérialiser le jeton à partir de JSON.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0} : '{1}' n’était pas une variable d’environnement valide. Ignorant.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
index a5f41cf91d2e..8fb75366363b 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
@@ -79,6 +79,11 @@
         <target state="translated">Compilazione dell'immagine '{0}' con i tag '{1}' sopra l'immagine di base '{2}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: non è stato possibile deserializzare il token da JSON.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' non è una variabile di ambiente valida. Il valore verrà ignorato.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
index cd52c02f2459..00aeda5edf91 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
@@ -79,6 +79,11 @@
         <target state="translated">基本イメージ '{0}' の上にタグ '{1}' 付きのイメージ '{2}' をビルドしています。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: JSON からトークンを逆シリアル化できませんでした。</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' は有効な環境変数ではありませんでした。無視しています。</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
index 8f5d7f791e13..0adadf299470 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
@@ -79,6 +79,11 @@
         <target state="translated">기본 이미지 '{2}' 위에 '{1}' 태그가 있는 '{0}' 이미지를 빌드하는 중입니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: JSON에서 토큰을 역직렬화할 수 없습니다.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}'은(는) 유효한 환경 변수가 아닙니다. 무시 중.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
index 1cbda11cd891..1fc1770a7181 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
@@ -79,6 +79,11 @@
         <target state="translated">Tworzenie obrazu „{0}” z tagami „{1}” nad obrazem podstawowym „{2}”.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: nie można zdeserializować tokenu z pliku JSON.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: „{1}” nie jest prawidłową zmienną środowiskową. Ignorowanie.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
index 9467c4090ed2..8e6ce774b100 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
@@ -79,6 +79,11 @@
         <target state="translated">Construindo imagem '{0}' com tags '{1}' em cima da imagem base '{2}'.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: não foi possível desserializar o token do JSON.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' não era uma variável de ambiente válida. Ignorando.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
index 295593dc4fa5..0d0d9417f2ca 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
@@ -79,6 +79,11 @@
         <target state="translated">Выполняется сборка образа "{0}" с тегами "{1}" поверх базового образа "{2}".</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: не удалось десериализовать токен из JSON.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: "{1}" не является допустимой переменной среды. Пропуск.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
index 49ce6f3ce305..9f65b5082fba 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
@@ -79,6 +79,11 @@
         <target state="translated">'{1}' etiketli '{0}' resmi, '{2}' temel görüntüsünün üzerinde oluşturuluyor.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: Belirteç, JSON'dan seri durumdan çıkarılamadı.</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' geçerli bir Ortam Değişkeni değildi. Görmezden geliniyor.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
index dd9faa355ab4..0f5ad6a2d7a4 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
@@ -79,6 +79,11 @@
         <target state="translated">在基本映像“{2}”顶部构建标记为“{1}”的映像“{0}”。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: 无法从 JSON 反序列化令牌。</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: "{1}" 不是有效的环境变量。忽略。</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
index d7e262e3310a..1287300e7b18 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
@@ -79,6 +79,11 @@
         <target state="translated">在基礎映像 '{2}' 上建立具有標記 '{1}' 的映像 '{0}'。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ContainerBuilder_StartBuildingImageForRid">
+        <source>Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</source>
+        <target state="new">Building image '{0}' for runtime identifier '{1}' on top of base image '{2}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="CouldntDeserializeJsonToken">
         <source>CONTAINER1007: Could not deserialize token from JSON.</source>
         <target state="translated">CONTAINER1007: 無法從 JSON 還原序列化權杖。</target>
@@ -180,8 +185,8 @@
         <note>{StrBegin="CONTAINER1010: "}</note>
       </trans-unit>
       <trans-unit id="ImagesEmpty">
-        <source>Cannot create manifest list (image index) because no images were provided.</source>
-        <target state="new">Cannot create manifest list (image index) because no images were provided.</target>
+        <source>Cannot create image index because no images were provided.</source>
+        <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidEnvVar">
@@ -189,9 +194,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' 不是有效的環境變數。正在忽略。</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageManifest">
+        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageMetadata">
-        <source>Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
-        <target state="new">Cannot create manifest list (image index) because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
+        <source>Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</source>
+        <target state="new">Cannot create image index because provided images are invalid. Items must have 'Config', 'Manifest', 'ManifestMediaType' and 'ManifestDigest' metadata.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageName_EntireNameIsInvalidCharacters">
@@ -420,8 +430,8 @@
         <note>{StrBegin="CONTAINER2001: "}</note>
       </trans-unit>
       <trans-unit id="UnsupportedMediaType">
-        <source>Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</source>
-        <target state="new">Cannot create manifest list (image index) for the provided 'mediaType' = '{0}'.</target>
+        <source>Cannot create image index for the provided 'mediaType' = '{0}'.</source>
+        <target state="new">Cannot create image index for the provided 'mediaType' = '{0}'.</target>
         <note />
       </trans-unit>
       <trans-unit id="UnsupportedMediaTypeForTarball">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
new file mode 100644
index 000000000000..128657b0a897
--- /dev/null
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
@@ -0,0 +1,80 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Build.Framework;
+
+namespace Microsoft.NET.Build.Containers.Tasks;
+
+partial class CreateImageIndex
+{
+    /// <summary>
+    /// The base registry to pull from.
+    /// Ex: mcr.microsoft.com
+    /// </summary>
+    [Required]
+    public string BaseRegistry { get; set; }
+
+    /// <summary>
+    /// The base image to pull.
+    /// Ex: dotnet/runtime
+    /// </summary>
+    [Required]
+    public string BaseImageName { get; set; }
+
+    /// <summary>
+    /// The base image tag.
+    /// Ex: 6.0
+    /// </summary>
+    [Required]
+    public string BaseImageTag { get; set; }
+
+    /// <summary>
+    /// Manifests to include in the image index.
+    /// </summary>
+    [Required]
+    public ITaskItem[] GeneratedContainers { get; set; }
+
+    /// <summary>
+    /// The registry to push the image index to.
+    /// </summary>
+    public string OutputRegistry { get; set; }
+
+    /// <summary>
+    /// The file path to which to write a tar.gz archive of the container image.
+    /// </summary>
+    public string ArchiveOutputPath { get; set; }
+
+    /// <summary>
+    /// The kind of local registry to use, if any.
+    /// </summary>
+    public string LocalRegistry { get; set; }
+
+    /// <summary>
+    /// The name of the output image index (manifest list) that will be pushed to the registry.
+    /// </summary>
+    [Required]
+    public string Repository { get; set; }
+
+    /// <summary>
+    /// The tag to associate with the new image index (manifest list).
+    /// </summary>
+    [Required]
+    public string[] ImageTags { get; set; }
+
+    [Output]
+    public string GeneratedArchiveOutputPath { get; set; }
+
+    public CreateImageIndex()
+    {
+        BaseRegistry = string.Empty;
+        BaseImageName = string.Empty;
+        BaseImageTag = string.Empty;
+        GeneratedContainers = Array.Empty<ITaskItem>();
+        OutputRegistry = string.Empty;
+        ArchiveOutputPath = string.Empty;
+        LocalRegistry = string.Empty;
+        Repository = string.Empty;
+        ImageTags = Array.Empty<string>();
+        GeneratedArchiveOutputPath = string.Empty;
+    }
+} 
\ No newline at end of file
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 655b0e52a9d4..eb5743d81846 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -12,88 +12,8 @@
 
 namespace Microsoft.NET.Build.Containers.Tasks;
 
-public sealed class CreateImageIndex : Microsoft.Build.Utilities.Task, ICancelableTask, IDisposable
+public sealed partial class CreateImageIndex : Microsoft.Build.Utilities.Task, ICancelableTask, IDisposable
 {
-    #region Parameters
-    /// <summary>
-    /// The base registry to pull from.
-    /// Ex: mcr.microsoft.com
-    /// </summary>
-    [Required]
-    public string BaseRegistry { get; set; }
-
-    /// <summary>
-    /// The base image to pull.
-    /// Ex: dotnet/runtime
-    /// </summary>
-    [Required]
-    public string BaseImageName { get; set; }
-
-    /// <summary>
-    /// The base image tag.
-    /// Ex: 6.0
-    /// </summary>
-    [Required]
-    public string BaseImageTag { get; set; }
-
-    /// <summary>
-    /// Manifests to include in the image index.
-    /// </summary>
-    [Required]
-    public ITaskItem[] GeneratedContainers { get; set; }
-
-    /// <summary>
-    /// The registry to push the image index to.
-    /// </summary>
-    public string OutputRegistry { get; set; }
-
-    /// <summary>
-    /// The file path to which to write a tar.gz archive of the container image.
-    /// </summary>
-    public string ArchiveOutputPath { get; set; }
-
-    /// <summary>
-    /// The kind of local registry to use, if any.
-    /// </summary>
-    public string LocalRegistry { get; set; }
-
-    /// <summary>
-    /// The name of the output image index (manifest list) that will be pushed to the registry.
-    /// </summary>
-    [Required]
-    public string Repository { get; set; }
-
-    /// <summary>
-    /// The tag to associate with the new image index (manifest list).
-    /// </summary>
-    [Required]
-    public string[] ImageTags { get; set; }
-
-    [Output]
-    public string GeneratedArchiveOutputPath { get; set; }
-
-    /// <summary>
-    /// The generated image index (manifest list) in JSON format.
-    /// </summary>
-    [Output]
-    public string GeneratedImageIndex { get; set; }
-
-    public CreateImageIndex()
-    {
-        BaseRegistry = string.Empty;
-        BaseImageName = string.Empty;
-        BaseImageTag = string.Empty;
-        GeneratedContainers = Array.Empty<ITaskItem>();
-        OutputRegistry = string.Empty;
-        ArchiveOutputPath = string.Empty;
-        LocalRegistry = string.Empty;
-        Repository = string.Empty;
-        ImageTags = Array.Empty<string>();
-        GeneratedArchiveOutputPath = string.Empty;
-        GeneratedImageIndex = string.Empty;
-    }
-    #endregion
-
     private readonly CancellationTokenSource _cancellationTokenSource = new();
 
     public void Cancel() => _cancellationTokenSource.Cancel();
@@ -178,18 +98,16 @@ private BuiltImage[] ParseImages(DestinationImageReferenceKind destinationKind)
             string manifest = unparsedImage.GetMetadata("Manifest");
             string manifestMediaType = unparsedImage.GetMetadata("ManifestMediaType");
 
-            //TODO: add manifestmedia type to the error message
-            if (string.IsNullOrEmpty(config) || string.IsNullOrEmpty(manifestDigest) || string.IsNullOrEmpty(manifest))
+            if (string.IsNullOrEmpty(config) || string.IsNullOrEmpty(manifestDigest) || string.IsNullOrEmpty(manifest) || string.IsNullOrEmpty(manifestMediaType))
             {
-                Log.LogError(Strings.InvalidImageMetadata, unparsedImage.ItemSpec);
+                Log.LogError(Strings.InvalidImageMetadata);
                 break;
             }
 
             var manifestV2 = JsonSerializer.Deserialize<ManifestV2>(manifest);
             if (manifestV2 == null)
             {
-                //TODO: log new error about manifest not deserealized
-                Log.LogError(Strings.InvalidImageMetadata, unparsedImage.ItemSpec);
+                Log.LogError(Strings.InvalidImageManifest);
                 break;
             }
 
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index bcc429acf343..997ca7b74973 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -122,7 +122,10 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         if (BuildEngine != null) 
         {
-            Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_StartBuildingImage, Repository, String.Join(",", ImageTags), sourceImageReference);
+            (string message, object[] parameters) = SkipPublishing ?
+                ( Strings.ContainerBuilder_StartBuildingImageForRid, new object[] { Repository, ContainerRuntimeIdentifier, sourceImageReference }) :
+                ( Strings.ContainerBuilder_StartBuildingImage, new object[] { Repository, String.Join(",", ImageTags), sourceImageReference });
+            Log.LogMessage(MessageImportance.High, message, parameters);
         }
 
         Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index d092e5951cd4..3854f88ef29f 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -363,9 +363,7 @@
                       ImageTags="@(ContainerImageTags)"
                       BaseRegistry="$(ContainerBaseRegistry)"
                       BaseImageName="$(ContainerBaseName)"
-                      BaseImageTag="$(ContainerBaseTag)">
-      <Output TaskParameter="GeneratedImageIndex" PropertyName="GeneratedImageIndex" />
-    </CreateImageIndex>
+                      BaseImageTag="$(ContainerBaseTag)" />
   </Target>
 
   <Target Name="_ParseItemsForPublishingSingleContainer">
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
index 2615b2e178ee..18f0580c6935 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
@@ -44,18 +44,18 @@ public async Task CreateImageIndex_Baseline()
         cii.GeneratedContainers = [image1, image2];
         Assert.True(cii.Execute(), FormatBuildMessages(errors));
 
-        // Assert that the image index is created correctly
-        cii.GeneratedImageIndex.Should().NotBeNullOrEmpty();
-        var imageIndex = cii.GeneratedImageIndex.FromJson<ManifestListV2>();
-        imageIndex.manifests.Should().HaveCount(2);
-
-        imageIndex.manifests[0].digest.Should().Be(image1.GetMetadata("ManifestDigest"));
-        imageIndex.manifests[0].platform.os.Should().Be("linux");
-        imageIndex.manifests[0].platform.architecture.Should().Be("amd64");
-
-        imageIndex.manifests[1].digest.Should().Be(image2.GetMetadata("ManifestDigest"));
-        imageIndex.manifests[1].platform.os.Should().Be("linux");
-        imageIndex.manifests[1].platform.architecture.Should().Be("arm64");
+        // // Assert that the image index is created correctly
+        // cii.GeneratedImageIndex.Should().NotBeNullOrEmpty();
+        // var imageIndex = cii.GeneratedImageIndex.FromJson<ManifestListV2>();
+        // imageIndex.manifests.Should().HaveCount(2);
+
+        // imageIndex.manifests[0].digest.Should().Be(image1.GetMetadata("ManifestDigest"));
+        // imageIndex.manifests[0].platform.os.Should().Be("linux");
+        // imageIndex.manifests[0].platform.architecture.Should().Be("amd64");
+
+        // imageIndex.manifests[1].digest.Should().Be(image2.GetMetadata("ManifestDigest"));
+        // imageIndex.manifests[1].platform.os.Should().Be("linux");
+        // imageIndex.manifests[1].platform.architecture.Should().Be("arm64");
 
         // Assert that the image index is pushed to the registry
         var loggerFactory = new TestLoggerFactory(_testOutput);

From 6b147e192ca5e17d5b35f0d58d29d1d84dab0113 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 1 Feb 2025 21:44:28 +0100
Subject: [PATCH 057/127] add support for multi tagoci tarball

---
 .../LocalDaemons/DockerCli.cs                 | 77 +++++++++----------
 .../Resources/Strings.Designer.cs             | 11 +--
 .../Resources/Strings.resx                    |  3 -
 .../Resources/xlf/Strings.cs.xlf              |  5 --
 .../Resources/xlf/Strings.de.xlf              |  5 --
 .../Resources/xlf/Strings.es.xlf              |  5 --
 .../Resources/xlf/Strings.fr.xlf              |  5 --
 .../Resources/xlf/Strings.it.xlf              |  5 --
 .../Resources/xlf/Strings.ja.xlf              |  5 --
 .../Resources/xlf/Strings.ko.xlf              |  5 --
 .../Resources/xlf/Strings.pl.xlf              |  5 --
 .../Resources/xlf/Strings.pt-BR.xlf           |  5 --
 .../Resources/xlf/Strings.ru.xlf              |  5 --
 .../Resources/xlf/Strings.tr.xlf              |  5 --
 .../Resources/xlf/Strings.zh-Hans.xlf         |  5 --
 .../Resources/xlf/Strings.zh-Hant.xlf         |  5 --
 16 files changed, 37 insertions(+), 119 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 112887aa5a6e..2e9d41ff9e74 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -122,6 +122,7 @@ await writeStreamFunc(image, sourceReference, destinationReference, loadProcess.
     }
 
     public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken) 
+        // For loading to the local registry, we use the Docker format. Two reasons: one - compatibility with previous behavior before oci formatted publishing was available, two - Podman cannot load multi tag oci image tarball.
         => await LoadAsync(image, sourceReference, destinationReference, WriteDockerImageToStreamAsync, cancellationToken);
 
     public async Task LoadAsync(BuiltImage[] images, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken) 
@@ -406,11 +407,6 @@ public static async Task WriteMultiArchOciImageToStreamAsync(
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        if (destinationReference.Tags.Length > 1)
-        {
-            throw new ArgumentException(Resource.FormatString(nameof(Strings.OciImageMultipleTagsNotSupported)));
-        }
-
         using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true);
 
         foreach (var image in images)
@@ -435,11 +431,6 @@ private static async Task WriteOciImageToStreamAsync(
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        if (destinationReference.Tags.Length > 1)
-        {
-            throw new ArgumentException(Resource.FormatString(nameof(Strings.OciImageMultipleTagsNotSupported)));
-        }
-
         using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true);
 
         await WriteOciImageToBlobs(writer, image, sourceReference, cancellationToken)
@@ -511,8 +502,6 @@ private static async Task WriteIndexJsonForMultiArchOciImage(
         // 1. create manifest list for the blobs
         cancellationToken.ThrowIfCancellationRequested();
 
-        string tag = destinationReference.Tags[0];
-
         var manifests = new PlatformSpecificOciManifest[images.Length];
         for (int i = 0; i < images.Length; i++)
         {
@@ -554,24 +543,28 @@ private static async Task WriteIndexJsonForMultiArchOciImage(
         // 2. create index json that points to manifest list in the blobs
         cancellationToken.ThrowIfCancellationRequested();
 
+        var manifestsIndexJson = new PlatformSpecificOciManifest[destinationReference.Tags.Length];
+        for (int i = 0; i < destinationReference.Tags.Length; i++)
+        {
+            var tag = destinationReference.Tags[i];
+            manifestsIndexJson[i] = new PlatformSpecificOciManifest
+            {
+                mediaType = SchemaTypes.OciImageIndexV1,
+                size = manifestListJson.Length,
+                digest = manifestListDigest,
+                annotations = new Dictionary<string, string> 
+                {
+                    { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
+                    { "org.opencontainers.image.ref.name", tag } 
+                }
+            };
+        }
+
         var index = new ImageIndexV1
         {
             schemaVersion = 2,
             mediaType = SchemaTypes.OciImageIndexV1,
-            manifests = 
-            [
-                new PlatformSpecificOciManifest
-                {
-                    mediaType = SchemaTypes.OciImageIndexV1,
-                    size = manifestListJson.Length,
-                    digest = manifestListDigest,
-                    annotations = new Dictionary<string, string> 
-                    {
-                        { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
-                        { "org.opencontainers.image.ref.name", tag } 
-                    },
-                }
-            ]
+            manifests = manifestsIndexJson
         };
 
         using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index, options)!.ToJsonString())))
@@ -592,26 +585,28 @@ private static async Task WriteIndexJsonForOciImage(
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        string tag = destinationReference.Tags[0];
+        var manifests = new PlatformSpecificOciManifest[destinationReference.Tags.Length];
+        for (int i = 0; i < destinationReference.Tags.Length; i++)
+        {
+            var tag = destinationReference.Tags[i];
+            manifests[i] = new PlatformSpecificOciManifest
+            {
+                mediaType = SchemaTypes.OciManifestV1,
+                size = image.Manifest.Length,
+                digest = image.ManifestDigest,
+                annotations = new Dictionary<string, string> 
+                {
+                    { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
+                    { "org.opencontainers.image.ref.name", tag } 
+                }
+            };
+        }
 
         var index = new ImageIndexV1
         {
             schemaVersion = 2,
             mediaType = SchemaTypes.OciImageIndexV1,
-            manifests =
-            [
-                new PlatformSpecificOciManifest
-                {
-                    mediaType = SchemaTypes.OciManifestV1,
-                    size = image.Manifest.Length,
-                    digest = image.ManifestDigest,
-                    annotations = new Dictionary<string, string> 
-                    {
-                        { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
-                        { "org.opencontainers.image.ref.name", tag } 
-                    }
-                }
-            ]
+            manifests = manifests
         };
 
         var options = new JsonSerializerOptions
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
index 5750e050ba0e..7ad9616ae2c1 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
@@ -608,16 +608,7 @@ internal static string NormalizedContainerName {
                 return ResourceManager.GetString("NormalizedContainerName", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to create tarball for oci image with multiple tags..
-        /// </summary>
-        internal static string OciImageMultipleTagsNotSupported {
-            get {
-                return ResourceManager.GetString("OciImageMultipleTagsNotSupported", resourceCulture);
-            }
-        }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2011: {0} &apos;{1}&apos; does not exist.
         /// </summary>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
index a27e84824210..15f377704a50 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
@@ -244,9 +244,6 @@
     <value>CONTAINER2004: Unable to download layer with descriptor '{0}' from registry '{1}' because it does not exist.</value>
     <comment>{StrBegin="CONTAINER2004: "}</comment>
   </data>
-  <data name="OciImageMultipleTagsNotSupported" xml:space="preserve">
-    <value>Unable to create tarball for oci image with multiple tags.</value>
-  </data>
   <data name="UnsupportedMediaTypeForTarball" xml:space="preserve">
     <value>Unable to create tarball for mediaType '{0}'.</value>
   </data>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
index 3d6e472adb12..bc89aedef99e 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
@@ -304,11 +304,6 @@
         <target state="translated">'{0}' nebyl platný název image kontejneru, byl normalizován na '{1}'</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} '{1}' neexistuje.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
index a9298e5a40de..23f4eeafe797 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
@@ -304,11 +304,6 @@
         <target state="translated">„{0}“ war kein gültiger Containerimagename, er wurde zu „{1}“ normalisiert.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} „{1}“ ist nicht vorhanden.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
index 0e6827c5b8dd..8533ff49f64d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
@@ -304,11 +304,6 @@
         <target state="translated">"{0}" no era un nombre de imagen de contenedor válido, se normalizó a "{1}"</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} "{1}" no existe</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
index d9fd1c30d615..127a97b70635 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
@@ -304,11 +304,6 @@
         <target state="translated">'{0}' n’était pas un nom d’image conteneur valide, il a été normalisé pour '{1}'</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} '{1}' n’existe pas</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
index 8fb75366363b..2c6f97c87e93 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
@@ -304,11 +304,6 @@
         <target state="translated">'{0}' non è un nome di immagine contenitore valido, è stato normalizzato in '{1}'</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} '{1}' non esiste</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
index 00aeda5edf91..feb83548f3c1 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
@@ -304,11 +304,6 @@
         <target state="translated">'{0}' は有効なコンテナー イメージ名ではありませんでした。'{1}' に正規化されました</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} '{1}' が存在しません</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
index 0adadf299470..c696a7cb649c 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
@@ -304,11 +304,6 @@
         <target state="translated">'{0}'은(는) 유효한 컨테이너 이미지 이름이 아닙니다. '{1}'(으)로 정규화되었습니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} '{1}'이(가) 존재하지 않습니다.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
index 1fc1770a7181..165f11851003 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
@@ -304,11 +304,6 @@
         <target state="translated">Nazwa „{0}” nie była prawidłową nazwą obrazu kontenera, została znormalizowana do „{1}”</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} „{1}” nie istnieje</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
index 8e6ce774b100..82b3f1b1a646 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
@@ -304,11 +304,6 @@
         <target state="translated">'{0}' não era um nome de imagem de contêiner válido, foi normalizado para '{1}'</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} '{1}' não existe</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
index 0d0d9417f2ca..8a4e2d1ba8f0 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
@@ -304,11 +304,6 @@
         <target state="translated">"{0}" не является допустимым именем образа контейнера, оно нормализовано до "{1}"</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} "{1}" не существует</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
index 9f65b5082fba..4b2b0147c029 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
@@ -304,11 +304,6 @@
         <target state="translated">'{0}', geçerli bir kapsayıcı görüntüsü adı değildi, '{1}' olarak normalleştirildi</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} '{1}' yok</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
index 0f5ad6a2d7a4..a02595dc1a7b 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
@@ -304,11 +304,6 @@
         <target state="translated">“{0}”不是有效的容器映像名称，已规范化为“{1}”</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} {1} 不存在</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
index 1287300e7b18..e1e859d58559 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
@@ -304,11 +304,6 @@
         <target state="translated">'{0}' 不是有效的容器映像名稱，已標準化為 '{1}'</target>
         <note />
       </trans-unit>
-      <trans-unit id="OciImageMultipleTagsNotSupported">
-        <source>Unable to create tarball for oci image with multiple tags.</source>
-        <target state="new">Unable to create tarball for oci image with multiple tags.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishDirectoryDoesntExist">
         <source>CONTAINER2011: {0} '{1}' does not exist</source>
         <target state="translated">CONTAINER2011: {0} '{1}' 不存在</target>

From 999368fd3332cedf47bfde4e018eb40ce0b3b095 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sun, 2 Feb 2025 16:17:42 +0100
Subject: [PATCH 058/127] fix test EndToEndMultiArch_LocalRegistry

---
 .../ContainerCli.cs                           |  3 ++
 .../EndToEndTests.cs                          | 37 ++++++++++++++-----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
index 82ccc3d4a2c9..a7de99fc1faf 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
@@ -37,6 +37,9 @@ public static RunExeCommand LoadCommand(ITestOutputHelper log, params string[] a
     public static RunExeCommand PortCommand(ITestOutputHelper log, string containerName, int port)
       => CreateCommand(log, "port", containerName, port.ToString());
 
+    public static RunExeCommand ImagesCommand(ITestOutputHelper log, params string[] args)
+      => CreateCommand(log, "images", args);
+
     private static RunExeCommand CreateCommand(ITestOutputHelper log, string command, params string[] args)
     {
         string commandPath = IsPodman ? "podman" : "docker";
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 40083f8fc58e..306b35858372 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -726,9 +726,8 @@ public void EndToEnd_SingleArch_NoRid()
     public void EndToEndMultiArch_LocalRegistry()
     {
         string imageName = NewImageName();
-        string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
-        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+        string tag = "1.0";
+        string image = $"{imageName}:{tag}";
 
         // Create a new console project
         DirectoryInfo newProjectDir = CreateNewProject("console");
@@ -741,7 +740,7 @@ public void EndToEndMultiArch_LocalRegistry()
             "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
             $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
             $"/p:ContainerRepository={imageName}",
-            $"/p:ContainerImageTag={imageTag}",
+            $"/p:ContainerImageTag={tag}",
             "/p:EnableSdkContainerSupport=true")
             .WithWorkingDirectory(newProjectDir.FullName)
             .Execute();
@@ -752,26 +751,33 @@ public void EndToEndMultiArch_LocalRegistry()
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
-            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to local registry")
-            .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to local registry")
-            .And.NotHaveStdOutContaining("Pushed image index");
+            .And.HaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-x64'")
+            .And.HaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-arm64'")
+            .And.HaveStdOutContaining($"Pushed image '{image}' to local registry");
+
+        //Multi-arch oci images that are loaded to docker can only be run by their image id
+        string imageId = GetImageId(image);
 
         // Check that the containers can be run
         CommandResult processResultX64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/amd64",
             "--name",
             $"test-container-{imageName}-x64",
-            imageX64)
+            imageId)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
 
         CommandResult processResultArm64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/arm64",
             "--name",
             $"test-container-{imageName}-arm64",
-            imageArm64)
+            imageId)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");
 
@@ -779,6 +785,19 @@ public void EndToEndMultiArch_LocalRegistry()
         newProjectDir.Delete(true);
     }
 
+    private string GetImageId(string image)
+    {
+        CommandResult commandResult = ContainerCli.ImagesCommand(_testOutput, "--format", "\"{{.ID}}\"", image)
+            .Execute();
+        commandResult.Should().Pass();
+
+        var output = commandResult.StdOut.Split("\n").Select(s => s.Trim('"')).ToList();
+
+        output.Should().NotBeNullOrEmpty().And.OnlyContain(s => s == output[0]);
+
+        return output[0];
+    }
+
     [DockerAvailableFact]
     public void MultiArchStillAllowsSingleRID()
     {

From 0c9bdd1eb0167f127317c1953230f4f8572e4b8e Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <shuseynzada@microsoft.com>
Date: Wed, 4 Dec 2024 14:32:25 +0100
Subject: [PATCH 059/127] check docker availability before arch support in
 tests

---
 .../ContainerCli.cs                              |  5 +++++
 .../DockerSupportsArchFact.cs                    | 16 ++++++++--------
 .../DockerSupportsArchInlineData.cs              |  2 ++
 .../EndToEndTests.cs                             | 10 +++++-----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
index a7de99fc1faf..1315d341f94f 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
@@ -7,6 +7,8 @@ static class ContainerCli
 {
     public static bool IsPodman => _isPodman.Value;
 
+    public static bool IsAvailable => _isAvailable.Value;
+
     public static RunExeCommand PullCommand(ITestOutputHelper log, params string[] args)
       => CreateCommand(log, "pull", args);
 
@@ -63,4 +65,7 @@ private static RunExeCommand CreateCommand(ITestOutputHelper log, string command
 
     private static readonly Lazy<bool> _isPodman =
       new(() => new DockerCli(loggerFactory: new TestLoggerFactory()).GetCommand() == DockerCli.PodmanCommand);
+
+    private static readonly Lazy<bool> _isAvailable =
+      new(() => new DockerCli(loggerFactory: new TestLoggerFactory()).IsAvailable());
 }
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
index 984bff2c0b37..36ad9fbc0c9a 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
@@ -3,17 +3,17 @@
 
 namespace Microsoft.NET.Build.Containers.IntegrationTests;
 
-public class DockerSupportsArchFactAttribute : FactAttribute
+public class DockerIsAvailableAndSupportsArchFactAttribute : FactAttribute
 {
-    private readonly string _arch;
-
-    public DockerSupportsArchFactAttribute(string arch)
+    public DockerIsAvailableAndSupportsArchFactAttribute(string arch)
     {
-        _arch = arch;
-
-        if (!DockerSupportsArchHelper.DaemonSupportsArch(_arch))
+        if (!DockerSupportsArchHelper.DaemonIsAvailable)
+        {
+            base.Skip = "Skipping test because Docker is not available on this host.";
+        }
+        else if (!DockerSupportsArchHelper.DaemonSupportsArch(arch))
         {
-            base.Skip = $"Skipping test because Docker daemon does not support {_arch}.";
+            base.Skip = $"Skipping test because Docker daemon does not support {arch}.";
         }
     }
 }
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs
index 022a8e90c16a..caafbaea4b45 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs
@@ -34,6 +34,8 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
 
 internal static class DockerSupportsArchHelper
 {
+    internal static bool DaemonIsAvailable => ContainerCli.IsAvailable;
+
     internal static bool DaemonSupportsArch(string arch)
     {
         // an optimization - this doesn't change over time so we can compute it once
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 306b35858372..a9d694adaddc 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -722,7 +722,7 @@ public void EndToEnd_SingleArch_NoRid()
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
     }
 
-    [DockerSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
     public void EndToEndMultiArch_LocalRegistry()
     {
         string imageName = NewImageName();
@@ -923,7 +923,7 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
     private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
         => Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
 
-    [DockerSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
     public void EndToEndMultiArch_ArchivePublishing()
     {
         string imageName = NewImageName();
@@ -996,7 +996,7 @@ public void EndToEndMultiArch_ArchivePublishing()
         newProjectDir.Delete(true);
     }
 
-    [DockerSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
     public void EndToEndMultiArch_RemoteRegistry()
     {
         string imageName = NewImageName();
@@ -1125,7 +1125,7 @@ public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentif
         newProjectDir.Delete(true);
     }
 
-    [DockerSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
     public void EndToEndMultiArch_EnvVariables()
     {
         string imageName = NewImageName();
@@ -1192,7 +1192,7 @@ public void EndToEndMultiArch_EnvVariables()
         newProjectDir.Delete(true);
     }
 
-    [DockerSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
     public void EndToEndMultiArch_Ports()
     {
         string imageName = NewImageName();

From 7b09eb9675ce92d6da17b5c8b7a373522816b55a Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sun, 2 Feb 2025 18:42:01 +0100
Subject: [PATCH 060/127] refactoring

---
 .../Microsoft.NET.Build.Containers/ImagePublisher.cs       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index fa890b82506a..163c5e5efb26 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -30,8 +30,7 @@ await PushToLocalRegistryAsync(
                     BuildEngine,
                     telemetry,
                     cancellationToken,
-                    destinationImageReference.LocalRegistry!.LoadAsync,
-                    Strings.ContainerBuilder_ImageUploadedToLocalDaemon).ConfigureAwait(false);
+                    destinationImageReference.LocalRegistry!.LoadAsync).ConfigureAwait(false);
                 break;
             case DestinationImageReferenceKind.RemoteRegistry:
                 await PushToRemoteRegistryAsync(
@@ -74,7 +73,6 @@ await PushToLocalRegistryAsync(
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync,
-                    Strings.ContainerBuilder_ImageUploadedToLocalDaemon,
                     logWarningForMultiArch : true).ConfigureAwait(false);
                 break;
             case DestinationImageReferenceKind.RemoteRegistry:
@@ -113,7 +111,6 @@ private static async Task PushToLocalRegistryAsync<T>(
         Telemetry telemetry,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc,
-        string successMessage,
         bool logWarningForMultiArch = false)
     {
         ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
@@ -128,7 +125,7 @@ private static async Task PushToLocalRegistryAsync<T>(
             await loadFunc(image, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
             if (BuildEngine != null) 
             {
-                Log.LogMessage(MessageImportance.High, successMessage, destinationImageReference, localRegistry);
+                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
             }
         }
         catch (ContainerHttpException e)

From 6e1035ba2621c7ad7e3c415dbdffa52015956c74 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sun, 2 Feb 2025 18:42:28 +0100
Subject: [PATCH 061/127] fixed multi-arch e2e tests

---
 .../EndToEndTests.cs                          | 101 ++++++++++--------
 1 file changed, 56 insertions(+), 45 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index a9d694adaddc..2881ae159aa6 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -746,8 +746,7 @@ public void EndToEndMultiArch_LocalRegistry()
             .Execute();
 
         // Check that the app was published for each RID,
-        // images were created locally for each RID
-        // and image index was NOT created
+        // one image was created locally
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
@@ -755,7 +754,7 @@ public void EndToEndMultiArch_LocalRegistry()
             .And.HaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-arm64'")
             .And.HaveStdOutContaining($"Pushed image '{image}' to local registry");
 
-        //Multi-arch oci images that are loaded to docker can only be run by their image id
+        //Multi-arch oci tarballs that are loaded to docker can only be run by their image id
         string imageId = GetImageId(image);
 
         // Check that the containers can be run
@@ -927,12 +926,10 @@ private string GetPublishArtifactsPath(string projectDir, string rid, string con
     public void EndToEndMultiArch_ArchivePublishing()
     {
         string imageName = NewImageName();
-        string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
-        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+        string tag = "1.0";
+        string image = $"{imageName}:{tag}";
         string archiveOutput = Path.Combine(TestSettings.TestArtifactsDirectory, "tarballs-output");
-        string imageX64Tarball = Path.Combine(archiveOutput, $"{imageName}-linux-x64.tar.gz");
-        string imageArm64Tarball = Path.Combine(archiveOutput, $"{imageName}-linux-arm64.tar.gz");
+        string imageTarball = Path.Combine(archiveOutput, $"{imageName}.tar.gz");
 
         // Create a new console project
         DirectoryInfo newProjectDir = CreateNewProject("console");
@@ -946,49 +943,51 @@ public void EndToEndMultiArch_ArchivePublishing()
             $"/p:ContainerArchiveOutputPath={archiveOutput}",
             $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
             $"/p:ContainerRepository={imageName}",
-            $"/p:ContainerImageTag={imageTag}",
+            $"/p:ContainerImageTag={tag}",
             "/p:EnableSdkContainerSupport=true")
             .WithWorkingDirectory(newProjectDir.FullName)
             .Execute();
 
         // Check that the app was published for each RID,
-        // images were created locally for each RID
-        // and image index was NOT created
+        // one image was created in local archive
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
-            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to local archive at '{imageX64Tarball}'")
-            .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to local archive at '{imageArm64Tarball}'")
-            .And.NotHaveStdOutContaining("Pushed image index");
+            .And.HaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-x64'")
+            .And.HaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-arm64'")
+            .And.HaveStdOutContaining($"Pushed image '{image}' to local archive at '{imageTarball}'");
 
         // Check that tarballs were created
-        File.Exists(imageX64Tarball).Should().BeTrue();
-        File.Exists(imageArm64Tarball).Should().BeTrue();
+        File.Exists(imageTarball).Should().BeTrue();
 
-        // Load the images from the tarballs
-        ContainerCli.LoadCommand(_testOutput, "--input", imageX64Tarball)
-           .Execute()
-           .Should().Pass();
-        ContainerCli.LoadCommand(_testOutput, "--input", imageArm64Tarball)
+        // Load the multi-arch image from the tarball
+        ContainerCli.LoadCommand(_testOutput, "--input", imageTarball)
            .Execute()
            .Should().Pass();
 
+        //Multi-arch oci tarballs that are loaded to docker can only be run by their image id
+        string imageId = GetImageId(image);
+
         // Check that the containers can be run
         CommandResult processResultX64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/amd64",
             "--name",
             $"test-container-{imageName}-x64",
-            imageX64)
+            imageId)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
 
         CommandResult processResultArm64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/arm64",
             "--name",
             $"test-container-{imageName}-arm64",
-            imageArm64)
+            imageId)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");
 
@@ -1118,8 +1117,8 @@ public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentif
         commandResult.Should().Pass()
             .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
-            .And.NotHaveStdOutContaining($"Pushed image '{imageName}:{imageTag}-linux-x64' to local registry")
-            .And.HaveStdOutContaining($"Pushed image '{imageName}:{imageTag}-linux-arm64' to local registry");
+            .And.NotHaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-x64'")
+            .And.HaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-arm64'");
 
         // Cleanup
         newProjectDir.Delete(true);
@@ -1129,9 +1128,8 @@ public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentif
     public void EndToEndMultiArch_EnvVariables()
     {
         string imageName = NewImageName();
-        string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
-        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+        string tag = "1.0";
+        string image = $"{imageName}:{tag}";
 
         // Create new console app, set ContainerEnvironmentVariables, and set to output env variable
         DirectoryInfo newProjectDir = CreateNewProject("console");
@@ -1160,31 +1158,37 @@ public void EndToEndMultiArch_EnvVariables()
             "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
             $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
             $"/p:ContainerRepository={imageName}",
-            $"/p:ContainerImageTag={imageTag}",
+            $"/p:ContainerImageTag={tag}",
             "/p:EnableSdkContainerSupport=true")
             .WithWorkingDirectory(newProjectDir.FullName)
             .Execute()
             .Should().Pass();
 
-        // Check that the env var is printed
+        string imageId = GetImageId(image);
+
+        // Check that the env var is printed for linux/amd64 platform
         string containerNameX64 = $"test-container-{imageName}-x64";
         CommandResult processResultX64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/amd64",
             "--name",
             containerNameX64,
-            imageX64)
+            imageId)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("FooBar");
 
-        // Check that the env var is printed
+        // Check that the env var is printed for linux/arm64 platform
         string containerNameArm64 = $"test-container-{imageName}-arm64";
         CommandResult processResultArm64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/arm64",
             "--name",
             containerNameArm64,
-            imageArm64)
+            imageId)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("FooBar");
 
@@ -1196,9 +1200,8 @@ public void EndToEndMultiArch_EnvVariables()
     public void EndToEndMultiArch_Ports()
     {
         string imageName = NewImageName();
-        string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
-        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+        string tag = "1.0";
+        string image = $"{imageName}:{tag}";
 
         // Create new web app, set ContainerPort
         DirectoryInfo newProjectDir = CreateNewProject("webapp");
@@ -1222,38 +1225,44 @@ public void EndToEndMultiArch_Ports()
             "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
             $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
             $"/p:ContainerRepository={imageName}",
-            $"/p:ContainerImageTag={imageTag}",
+            $"/p:ContainerImageTag={tag}",
             "/p:EnableSdkContainerSupport=true")
             .WithWorkingDirectory(newProjectDir.FullName)
             .Execute()
             .Should().Pass();
 
-        // Check that the ports are correct
+        string imageId = GetImageId(image);
+
+        // Check that the ports are correct for linux/amd64 platform
         var containerNameX64 = $"test-container-{imageName}-x64";
         CommandResult processResultX64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/amd64",
             "--name",
             containerNameX64,
             "-P",
             "--detach",
-            imageX64)
+            imageId)
         .Execute();
         processResultX64.Should().Pass();
 
         // 8080 is the default port
         CheckPorts(containerNameX64, [8080, 8082, 8083], [8081]);
 
-        // Check that the ports are correct
+        // Check that the ports are correct for linux/arm64 platform
         var containerNameArm64 = $"test-container-{imageName}-arm64";
         CommandResult processResultArm64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
+            "--platform",
+            "linux/arm64",
             "--name",
             containerNameArm64,
             "-P",
             "--detach",
-            imageArm64)
+            imageId)
         .Execute();
         processResultArm64.Should().Pass();
 
@@ -1291,8 +1300,8 @@ private void CheckPorts(string containerName, int[] correctPorts, int[] incorrec
     public void EndToEndMultiArch_Labels()
     {
         string imageName = NewImageName();
-        string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
+        string tag = "1.0";
+        string image = $"{imageName}:{tag}";
 
         // Create new console app
         DirectoryInfo newProjectDir = CreateNewProject("webapp");
@@ -1305,17 +1314,19 @@ public void EndToEndMultiArch_Labels()
             "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
             $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
             $"/p:ContainerRepository={imageName}",
-            $"/p:ContainerImageTag={imageTag}",
+            $"/p:ContainerImageTag={tag}",
             "/p:EnableSdkContainerSupport=true")
             .WithWorkingDirectory(newProjectDir.FullName)
             .Execute()
             .Should().Pass();
 
+        string imageId = GetImageId(image);
+
         // Check that labels are set
         CommandResult inspectResult = ContainerCli.InspectCommand(
             _testOutput,
             "--format={{json .Config.Labels}}",
-            imageX64)
+            imageId)
         .Execute();
         inspectResult.Should().Pass();
         var labels = JsonSerializer.Deserialize<Dictionary<string, string>>(inspectResult.StdOut);

From 9b3fd7e61177fd8e59531377b16e1c2ad25aca1e Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sun, 2 Feb 2025 19:19:42 +0100
Subject: [PATCH 062/127] cleanup

---
 .../CreateImageIndexTests.cs                        | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
index 18f0580c6935..24703040cda6 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
@@ -44,19 +44,6 @@ public async Task CreateImageIndex_Baseline()
         cii.GeneratedContainers = [image1, image2];
         Assert.True(cii.Execute(), FormatBuildMessages(errors));
 
-        // // Assert that the image index is created correctly
-        // cii.GeneratedImageIndex.Should().NotBeNullOrEmpty();
-        // var imageIndex = cii.GeneratedImageIndex.FromJson<ManifestListV2>();
-        // imageIndex.manifests.Should().HaveCount(2);
-
-        // imageIndex.manifests[0].digest.Should().Be(image1.GetMetadata("ManifestDigest"));
-        // imageIndex.manifests[0].platform.os.Should().Be("linux");
-        // imageIndex.manifests[0].platform.architecture.Should().Be("amd64");
-
-        // imageIndex.manifests[1].digest.Should().Be(image2.GetMetadata("ManifestDigest"));
-        // imageIndex.manifests[1].platform.os.Should().Be("linux");
-        // imageIndex.manifests[1].platform.architecture.Should().Be("arm64");
-
         // Assert that the image index is pushed to the registry
         var loggerFactory = new TestLoggerFactory(_testOutput);
         var logger = loggerFactory.CreateLogger(nameof(CreateImageIndex_Baseline));

From fb049829dd90854b59f6e1a455f80b86d7943fea Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sun, 2 Feb 2025 19:38:08 +0100
Subject: [PATCH 063/127] refactoring: make BuiltImage a class instead of a
 struct

---
 src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs | 6 +++---
 .../Microsoft.NET.Build.Containers/ImageIndexGenerator.cs   | 4 ++--
 .../LocalDaemons/DockerCli.cs                               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
index 0a76191db727..bd31ccc8cbf5 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
@@ -6,7 +6,7 @@ namespace Microsoft.NET.Build.Containers;
 /// <summary>
 /// Represents constructed image ready for further processing.
 /// </summary>
-internal readonly struct BuiltImage
+internal sealed class BuiltImage
 {
     /// <summary>
     /// Gets image configuration in JSON format.
@@ -46,12 +46,12 @@ internal readonly struct BuiltImage
     /// <summary>
     /// Gets image OS.
     /// </summary>
-    internal string OS { get; init; }
+    internal string? OS { get; init; }
 
     /// <summary>
     /// Gets image architecture.
     /// </summary>
-    internal string Architecture { get; init; }
+    internal string? Architecture { get; init; }
 
     /// <summary>
     /// Gets layers descriptors.
diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index b0cedc4a60af..413fa5e75591 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -71,8 +71,8 @@ private static (string, string) GenerateImageIndex(BuiltImage[] images, string m
                 digest = image.ManifestDigest,
                 platform = new PlatformInformation
                 {
-                    architecture = image.Architecture,
-                    os = image.OS
+                    architecture = image.Architecture!,
+                    os = image.OS!
                 }
             };
             manifests[i] = manifest;
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 2e9d41ff9e74..7f79aab2ddf2 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -510,7 +510,7 @@ private static async Task WriteIndexJsonForMultiArchOciImage(
                 mediaType = SchemaTypes.OciManifestV1,
                 size = images[i].Manifest.Length,
                 digest = images[i].ManifestDigest,
-                platform = new PlatformInformation { architecture = images[i].Architecture, os = images[i].OS }
+                platform = new PlatformInformation { architecture = images[i].Architecture!, os = images[i].OS! }
             };
             manifests[i] = manifest;
         }

From 73b120d080b6f25074cadd6583a594ce7df6b111 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sun, 2 Feb 2025 20:36:25 +0100
Subject: [PATCH 064/127] rearrange functions order in DockerCli for easier
 review

---
 .../LocalDaemons/DockerCli.cs                 | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 7f79aab2ddf2..820c129672e2 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -398,30 +398,6 @@ private static async Task WriteManifestForDockerImage(
         }
     }
 
-    public static async Task WriteMultiArchOciImageToStreamAsync(
-        BuiltImage[] images,
-        SourceImageReference sourceReference,
-        DestinationImageReference destinationReference,
-        Stream imageStream,
-        CancellationToken cancellationToken)
-    {
-        cancellationToken.ThrowIfCancellationRequested();
-
-        using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true);
-
-        foreach (var image in images)
-        {
-            await WriteOciImageToBlobs(writer, image, sourceReference, cancellationToken)
-            .ConfigureAwait(false);
-        }
-
-        await WriteIndexJsonForMultiArchOciImage(writer, images, destinationReference, cancellationToken)
-            .ConfigureAwait(false);
-
-        await WriteOciLayout(writer, cancellationToken)
-            .ConfigureAwait(false);
-    }
-
     private static async Task WriteOciImageToStreamAsync(
         BuiltImage image,
         SourceImageReference sourceReference,
@@ -443,22 +419,6 @@ await WriteOciLayout(writer, cancellationToken)
             .ConfigureAwait(false);
     }
 
-    private static async Task WriteOciImageToBlobs(
-        TarWriter writer,
-        BuiltImage image,
-        SourceImageReference sourceReference,
-        CancellationToken cancellationToken)
-    {
-        await WriteImageLayers(writer, image, sourceReference, d => $"{_blobsPath}/{d.Substring("sha256:".Length)}", cancellationToken)
-            .ConfigureAwait(false);
-
-        await WriteImageConfig(writer, image, $"{_blobsPath}/{image.ImageSha}", cancellationToken)
-            .ConfigureAwait(false);
-
-        await WriteManifestForOciImage(writer, image, cancellationToken)
-            .ConfigureAwait(false);
-    }
-
     private static async Task WriteOciLayout(TarWriter writer, CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
@@ -493,6 +453,46 @@ private static async Task WriteManifestForOciImage(
         }
     }
 
+    private static async Task WriteOciImageToBlobs(
+        TarWriter writer,
+        BuiltImage image,
+        SourceImageReference sourceReference,
+        CancellationToken cancellationToken)
+    {
+        await WriteImageLayers(writer, image, sourceReference, d => $"{_blobsPath}/{d.Substring("sha256:".Length)}", cancellationToken)
+            .ConfigureAwait(false);
+
+        await WriteImageConfig(writer, image, $"{_blobsPath}/{image.ImageSha}", cancellationToken)
+            .ConfigureAwait(false);
+
+        await WriteManifestForOciImage(writer, image, cancellationToken)
+            .ConfigureAwait(false);
+    }
+
+    public static async Task WriteMultiArchOciImageToStreamAsync(
+        BuiltImage[] images,
+        SourceImageReference sourceReference,
+        DestinationImageReference destinationReference,
+        Stream imageStream,
+        CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true);
+
+        foreach (var image in images)
+        {
+            await WriteOciImageToBlobs(writer, image, sourceReference, cancellationToken)
+            .ConfigureAwait(false);
+        }
+
+        await WriteIndexJsonForMultiArchOciImage(writer, images, destinationReference, cancellationToken)
+            .ConfigureAwait(false);
+
+        await WriteOciLayout(writer, cancellationToken)
+            .ConfigureAwait(false);
+    }
+
     private static async Task WriteIndexJsonForMultiArchOciImage(
         TarWriter writer,
         BuiltImage[] images,

From c8d4e091b88502ff287c5c93ce7c5384ce875e0e Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sun, 2 Feb 2025 20:39:43 +0100
Subject: [PATCH 065/127] rearrange functions again

---
 .../LocalDaemons/DockerCli.cs                 | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 820c129672e2..208a10c24725 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -453,6 +453,52 @@ private static async Task WriteManifestForOciImage(
         }
     }
 
+    private static async Task WriteIndexJsonForOciImage(
+        TarWriter writer,
+        BuiltImage image,
+        DestinationImageReference destinationReference,
+        CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var manifests = new PlatformSpecificOciManifest[destinationReference.Tags.Length];
+        for (int i = 0; i < destinationReference.Tags.Length; i++)
+        {
+            var tag = destinationReference.Tags[i];
+            manifests[i] = new PlatformSpecificOciManifest
+            {
+                mediaType = SchemaTypes.OciManifestV1,
+                size = image.Manifest.Length,
+                digest = image.ManifestDigest,
+                annotations = new Dictionary<string, string> 
+                {
+                    { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
+                    { "org.opencontainers.image.ref.name", tag } 
+                }
+            };
+        }
+
+        var index = new ImageIndexV1
+        {
+            schemaVersion = 2,
+            mediaType = SchemaTypes.OciImageIndexV1,
+            manifests = manifests
+        };
+
+        var options = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        };
+        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index, options)!.ToJsonString())))
+        {
+            PaxTarEntry indexEntry = new(TarEntryType.RegularFile, "index.json")
+            {
+                DataStream = indexStream
+            };
+            await writer.WriteEntryAsync(indexEntry, cancellationToken).ConfigureAwait(false);
+        }
+    }
+
     private static async Task WriteOciImageToBlobs(
         TarWriter writer,
         BuiltImage image,
@@ -577,52 +623,6 @@ private static async Task WriteIndexJsonForMultiArchOciImage(
         }
     }
 
-    private static async Task WriteIndexJsonForOciImage(
-        TarWriter writer,
-        BuiltImage image,
-        DestinationImageReference destinationReference,
-        CancellationToken cancellationToken)
-    {
-        cancellationToken.ThrowIfCancellationRequested();
-
-        var manifests = new PlatformSpecificOciManifest[destinationReference.Tags.Length];
-        for (int i = 0; i < destinationReference.Tags.Length; i++)
-        {
-            var tag = destinationReference.Tags[i];
-            manifests[i] = new PlatformSpecificOciManifest
-            {
-                mediaType = SchemaTypes.OciManifestV1,
-                size = image.Manifest.Length,
-                digest = image.ManifestDigest,
-                annotations = new Dictionary<string, string> 
-                {
-                    { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
-                    { "org.opencontainers.image.ref.name", tag } 
-                }
-            };
-        }
-
-        var index = new ImageIndexV1
-        {
-            schemaVersion = 2,
-            mediaType = SchemaTypes.OciImageIndexV1,
-            manifests = manifests
-        };
-
-        var options = new JsonSerializerOptions
-        {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-        };
-        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index, options)!.ToJsonString())))
-        {
-            PaxTarEntry indexEntry = new(TarEntryType.RegularFile, "index.json")
-            {
-                DataStream = indexStream
-            };
-            await writer.WriteEntryAsync(indexEntry, cancellationToken).ConfigureAwait(false);
-        }
-    }
-
     private async ValueTask<string?> GetCommandAsync(CancellationToken cancellationToken)
     {
         if (_command != null)

From f4f1754153b0a0496e9c270999498ff1478800b3 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sun, 2 Feb 2025 21:23:50 +0100
Subject: [PATCH 066/127] add back log message about building image index

---
 .../Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index eb5743d81846..60d868554100 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -69,19 +69,20 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             LocalRegistry);
 
         var images = ParseImages(destinationImageReference.Kind);
-
         if (Log.HasLoggedErrors)
         {
             return false;
         }
 
-        GeneratedArchiveOutputPath = ArchiveOutputPath;
+        logger.LogInformation(Strings.BuildingImageIndex, destinationImageReference, string.Join(", ", images.Select(i => i.ManifestDigest)));
 
         var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
         await ImagePublisher.PublishImageAsync(images, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
             .ConfigureAwait(false);
 
+        GeneratedArchiveOutputPath = ArchiveOutputPath;
+
         return !Log.HasLoggedErrors;
     }
 

From fc80348f5979836e47fbba1689dd3665faba61f2 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 3 Feb 2025 00:01:41 +0100
Subject: [PATCH 067/127] extract error messages into Strings

---
 .../ImagePublisher.cs                         |  8 ++---
 .../Resources/Strings.Designer.cs             | 36 +++++++++++++++++++
 .../Resources/Strings.resx                    | 20 +++++++++--
 .../Resources/xlf/Strings.cs.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.de.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.es.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.fr.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.it.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.ja.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.ko.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.pl.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.pt-BR.xlf           | 28 ++++++++++++---
 .../Resources/xlf/Strings.ru.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.tr.xlf              | 28 ++++++++++++---
 .../Resources/xlf/Strings.zh-Hans.xlf         | 28 ++++++++++++---
 .../Resources/xlf/Strings.zh-Hant.xlf         | 28 ++++++++++++---
 .../Tasks/CreateImageIndex.cs                 | 29 +++++++++------
 17 files changed, 389 insertions(+), 68 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index 163c5e5efb26..cd6a6a15ebd8 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -73,7 +73,7 @@ await PushToLocalRegistryAsync(
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync,
-                    logWarningForMultiArch : true).ConfigureAwait(false);
+                    logTipAboutContainerd : true).ConfigureAwait(false);
                 break;
             case DestinationImageReferenceKind.RemoteRegistry:
                 await PushToRemoteRegistryAsync(
@@ -111,7 +111,7 @@ private static async Task PushToLocalRegistryAsync<T>(
         Telemetry telemetry,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc,
-        bool logWarningForMultiArch = false)
+        bool logTipAboutContainerd = false)
     {
         ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
         if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
@@ -148,9 +148,9 @@ private static async Task PushToLocalRegistryAsync<T>(
         {
             telemetry.LogLocalLoadError();
             Log.LogErrorFromException(dle, showStackTrace: false);
-            if (logWarningForMultiArch && dle.Message.Contains("no such file or directory"))
+            if (logTipAboutContainerd && dle.Message.Contains("no such file or directory"))
             {
-                Log.LogMessage(MessageImportance.High, "Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.");
+                Log.LogMessage(MessageImportance.High, Strings.TipToEnableContainerdForMultiArch);
             }
         }
     }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
index 7ad9616ae2c1..07beb07321fd 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
@@ -420,6 +420,33 @@ internal static string InvalidImageManifest {
             }
         }
 
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot create image index because at least one of the provided images config is invalid..
+        /// </summary>
+        internal static string InvalidImageConfig {
+            get {
+                return ResourceManager.GetString("InvalidImageConfig", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot create image index because at least one of the provided images' config is missing 'architecture'..
+        /// </summary>
+        internal static string ImageConfigMissingArchitecture {
+            get {
+                return ResourceManager.GetString("ImageConfigMissingArchitecture", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot create image index because at least one of the provided images' config is missing 'os'..
+        /// </summary>
+        internal static string ImageConfigMissingOs {
+            get {
+                return ResourceManager.GetString("ImageConfigMissingOs", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Image index creation for Podman is not supported..
         /// </summary>
@@ -429,6 +456,15 @@ internal static string ImageIndex_PodmanNotSupported {
             }
         }
 
+        /// <summary>
+        ///   Looks up a localized string similar to Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings..
+        /// </summary>
+        internal static string TipToEnableContainerdForMultiArch {
+            get {
+                return ResourceManager.GetString("TipToEnableContainerdForMultiArch", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2005: The inferred image name &apos;{0}&apos; contains entirely invalid characters. The valid characters for an image name are alphanumeric characters, -, /, or _, and the image name must start with an alphanumeric character..
         /// </summary>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
index 15f377704a50..753d0ba091f4 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
@@ -366,7 +366,7 @@
     </comment>
   </data>
   <data name="MixedMediaTypes" xml:space="preserve">
-    <value>'mediaType' of manifests should be the same in manifest list (image index).</value>
+    <value>'mediaType' of manifests should be the same in image index.</value>
     <comment/>
   </data>
   <data name="UnsupportedMediaType" xml:space="preserve">
@@ -382,13 +382,29 @@
     <comment/>
   </data>
   <data name="InvalidImageManifest" xml:space="preserve">
-    <value>Cannot create image index because at least one of the provided images manifest is invalid.</value>
+    <value>Cannot create image index because at least one of the provided images' manifest is invalid.</value>
+    <comment/>
+  </data>
+  <data name="InvalidImageConfig" xml:space="preserve">
+    <value>Cannot create image index because at least one of the provided images' config is invalid.</value>
+    <comment/>
+  </data>
+  <data name="ImageConfigMissingArchitecture" xml:space="preserve">
+    <value>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</value>
+    <comment/>
+  </data>
+  <data name="ImageConfigMissingOs" xml:space="preserve">
+    <value>Cannot create image index because at least one of the provided images' config is missing 'os'.</value>
     <comment/>
   </data>
   <data name="ImageIndex_PodmanNotSupported" xml:space="preserve">
     <value>Image index creation for Podman is not supported.</value>
     <comment/>
   </data>
+  <data name="TipToEnableContainerdForMultiArch" xml:space="preserve">
+    <value>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</value>
+    <comment/>
+  </data>
   <data name="LocalDocker_FailedToGetConfig" xml:space="preserve">
     <value>Error while reading daemon config: {0}</value>
     <comment>{0} is the exception message that ends with period</comment>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
index bc89aedef99e..930f2cd9500f 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
@@ -164,6 +164,16 @@
         <target state="translated">Nebyl zjištěn žádný objekt hostitele.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' není platná proměnná prostředí. Ignorování.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: Požadovaná vlastnost '{0}' nebyla nastavena nebo je prázdná.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Příliš mnoho opakovaných pokusů, zastavuje se.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
index 23f4eeafe797..f851c41fbf92 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
@@ -164,6 +164,16 @@
         <target state="translated">Es wurde kein Hostobjekt erkannt.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: „{1}“ war keine gültige Umgebungsvariable. Sie wird ignoriert.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: Die erforderliche Eigenschaft „{0}“ wurde nicht festgelegt oder ist leer.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Zu viele Wiederholungsversuche, Vorgang wird beendet.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
index 8533ff49f64d..9f36072ccbe2 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
@@ -164,6 +164,16 @@
         <target state="translated">No se detectó ningún objeto host.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: "{1}" no era una variable de entorno válida. Ignorando.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: La propiedad necesaria "{0}" no se estableció o estaba vacía.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Demasiados reintentos, deteniendo.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
index 127a97b70635..50def6bb6b9d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
@@ -164,6 +164,16 @@
         <target state="translated">Aucun objet hôte détecté.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0} : '{1}' n’était pas une variable d’environnement valide. Ignorant.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: la propriété requise '{0}' n’a pas été définie ou vide.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: trop de tentatives, arrêt.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
index 2c6f97c87e93..c32f91206de4 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
@@ -164,6 +164,16 @@
         <target state="translated">Nessun oggetto host rilevato.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' non è una variabile di ambiente valida. Il valore verrà ignorato.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: la proprietà obbligatoria '{0}' non è stata impostata o è vuota.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: troppi tentativi, arresto.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
index feb83548f3c1..74b016f07d27 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
@@ -164,6 +164,16 @@
         <target state="translated">ホスト オブジェクトが検出されませんでした。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' は有効な環境変数ではありませんでした。無視しています。</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: 必要なプロパティ '{0}' が設定されていなかったか、空でした。</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: 再試行回数が多すぎます。停止しています。</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
index c696a7cb649c..0ab031e4eb14 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
@@ -164,6 +164,16 @@
         <target state="translated">호스트 개체가 검색되지 않았습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}'은(는) 유효한 환경 변수가 아닙니다. 무시 중.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: 필수 속성 '{0}'이(가) 설정되지 않았거나 비어 있습니다.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: 다시 시도가 너무 많아 중지 중입니다.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
index 165f11851003..6f7cadee6322 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
@@ -164,6 +164,16 @@
         <target state="translated">Nie wykryto obiektu hosta.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: „{1}” nie jest prawidłową zmienną środowiskową. Ignorowanie.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: wymagana właściwość „{0}” nie została ustawiona lub jest pusta.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: zbyt wiele ponownych prób, zatrzymywanie.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
index 82b3f1b1a646..bd00f8b3f7f3 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
@@ -164,6 +164,16 @@
         <target state="translated">Nenhum objeto de host detectado.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' não era uma variável de ambiente válida. Ignorando.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: A propriedade obrigatória '{0}' não foi definida ou está vazia.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Muitas tentativas, parando.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
index 8a4e2d1ba8f0..932f51f124fa 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
@@ -164,6 +164,16 @@
         <target state="translated">Объект узла не обнаружен.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: "{1}" не является допустимой переменной среды. Пропуск.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: обязательное свойство "{0}" не установлено или пусто.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: слишком много повторных попыток, остановка.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
index 4b2b0147c029..dab91d854f1d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
@@ -164,6 +164,16 @@
         <target state="translated">Ana bilgisayar nesnesi algılanmadı.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' geçerli bir Ortam Değişkeni değildi. Görmezden geliniyor.</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: Gerekli '{0}' özelliği ayarlanmadı veya boş değil.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Çok fazla yeniden deneme, durduruluyor.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
index a02595dc1a7b..ebf98c8f1540 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
@@ -164,6 +164,16 @@
         <target state="translated">未检测到主机对象。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: "{1}" 不是有效的环境变量。忽略。</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: 未设置必需属性 "{0}" 或为空。</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: 重试次数过多，正在停止。</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
index e1e859d58559..01de44e08b8b 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
@@ -164,6 +164,16 @@
         <target state="translated">未偵測到主機物件。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ImageConfigMissingArchitecture">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'architecture'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'architecture'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ImageConfigMissingOs">
+        <source>Cannot create image index because at least one of the provided images' config is missing 'os'.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is missing 'os'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ImageIndexUploadedToRegistry">
         <source>Pushed image index '{0}' to registry '{1}'.</source>
         <target state="new">Pushed image index '{0}' to registry '{1}'.</target>
@@ -194,9 +204,14 @@
         <target state="translated">CONTAINER2015: {0}: '{1}' 不是有效的環境變數。正在忽略。</target>
         <note>{StrBegin="CONTAINER2015: "}</note>
       </trans-unit>
+      <trans-unit id="InvalidImageConfig">
+        <source>Cannot create image index because at least one of the provided images' config is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' config is invalid.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="InvalidImageManifest">
-        <source>Cannot create image index because at least one of the provided images manifest is invalid.</source>
-        <target state="new">Cannot create image index because at least one of the provided images manifest is invalid.</target>
+        <source>Cannot create image index because at least one of the provided images' manifest is invalid.</source>
+        <target state="new">Cannot create image index because at least one of the provided images' manifest is invalid.</target>
         <note />
       </trans-unit>
       <trans-unit id="InvalidImageMetadata">
@@ -290,8 +305,8 @@
         <note>{StrBegin="CONTAINER2016: "}</note>
       </trans-unit>
       <trans-unit id="MixedMediaTypes">
-        <source>'mediaType' of manifests should be the same in manifest list (image index).</source>
-        <target state="new">'mediaType' of manifests should be the same in manifest list (image index).</target>
+        <source>'mediaType' of manifests should be the same in image index.</source>
+        <target state="new">'mediaType' of manifests should be the same in image index.</target>
         <note />
       </trans-unit>
       <trans-unit id="NoRequestUriSpecified">
@@ -394,6 +409,11 @@
         <target state="translated">CONTAINER4001: 必要的屬性 '{0}' 未設定或是空的。</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
+      <trans-unit id="TipToEnableContainerdForMultiArch">
+        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: 重試太多次，正在停止。</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 60d868554100..d56ae92d9b62 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -135,17 +135,26 @@ private BuiltImage[] ParseImages(DestinationImageReferenceKind destinationKind)
         return images;
     }
 
-    private static (string, string) GetArchitectureAndOsFromConfig(string config)
+    private (string, string) GetArchitectureAndOsFromConfig(string config)
     {
-        var configJson = JsonNode.Parse(config) as JsonObject ??
-            throw new ArgumentException("Image config should be a JSON object.");
-
-        var architecture = configJson["architecture"]?.ToString() ??
-            throw new ArgumentException("Image config should contain 'architecture'.");
-
-        var os = configJson["os"]?.ToString() ??
-            throw new ArgumentException("Image config should contain 'os'.");
-
+        var configJson = JsonNode.Parse(config) as JsonObject;
+        if (configJson is null)
+        {
+            Log.LogError(Strings.InvalidImageConfig);
+            return (string.Empty, string.Empty);
+        }
+        var architecture = configJson["architecture"]?.ToString();
+        if (architecture is null)
+        {
+            Log.LogError(Strings.ImageConfigMissingArchitecture);
+            return (string.Empty, string.Empty);
+        } 
+        var os = configJson["os"]?.ToString();
+        if (os is null)
+        {
+            Log.LogError(Strings.ImageConfigMissingOs);
+            return (string.Empty, string.Empty);
+        }
         return (architecture, os);
     }
 }

From f2909c14d9dcb11dd3e1f6613b7fad3eb64b2513 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 3 Feb 2025 09:59:10 +0100
Subject: [PATCH 068/127] fix typo in log message

---
 .../Resources/Strings.Designer.cs                             | 2 +-
 .../Microsoft.NET.Build.Containers/Resources/Strings.resx     | 2 +-
 .../Resources/xlf/Strings.cs.xlf                              | 4 ++--
 .../Resources/xlf/Strings.de.xlf                              | 4 ++--
 .../Resources/xlf/Strings.es.xlf                              | 4 ++--
 .../Resources/xlf/Strings.fr.xlf                              | 4 ++--
 .../Resources/xlf/Strings.it.xlf                              | 4 ++--
 .../Resources/xlf/Strings.ja.xlf                              | 4 ++--
 .../Resources/xlf/Strings.ko.xlf                              | 4 ++--
 .../Resources/xlf/Strings.pl.xlf                              | 4 ++--
 .../Resources/xlf/Strings.pt-BR.xlf                           | 4 ++--
 .../Resources/xlf/Strings.ru.xlf                              | 4 ++--
 .../Resources/xlf/Strings.tr.xlf                              | 4 ++--
 .../Resources/xlf/Strings.zh-Hans.xlf                         | 4 ++--
 .../Resources/xlf/Strings.zh-Hant.xlf                         | 4 ++--
 .../Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs  | 2 ++
 16 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
index 07beb07321fd..4f2dee24ba99 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
@@ -457,7 +457,7 @@ internal static string ImageIndex_PodmanNotSupported {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings..
+        ///   Looks up a localized string similar to Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings..
         /// </summary>
         internal static string TipToEnableContainerdForMultiArch {
             get {
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
index 753d0ba091f4..42d9dddffea2 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
@@ -402,7 +402,7 @@
     <comment/>
   </data>
   <data name="TipToEnableContainerdForMultiArch" xml:space="preserve">
-    <value>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</value>
+    <value>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</value>
     <comment/>
   </data>
   <data name="LocalDocker_FailedToGetConfig" xml:space="preserve">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
index 930f2cd9500f..20499b00e426 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
index f851c41fbf92..313ffe15f9a1 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
index 9f36072ccbe2..a1c4e1a7107f 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
index 50def6bb6b9d..705c8e48ae85 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
index c32f91206de4..22089bdb50c6 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
index 74b016f07d27..3efb830d3e14 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
index 0ab031e4eb14..75380d38355f 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
index 6f7cadee6322..f34e4c1e4b31 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
index bd00f8b3f7f3..6b5da780f9fb 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
index 932f51f124fa..e9d2290783c0 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
index dab91d854f1d..fac7e81d6444 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
index ebf98c8f1540..411f5221a963 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
index 01de44e08b8b..580bb931de64 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
@@ -410,8 +410,8 @@
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
       <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensude that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
+        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
+        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
         <note />
       </trans-unit>
       <trans-unit id="TooManyRetries">
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index d56ae92d9b62..217f2909fffe 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -52,6 +52,8 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             return false;
         }
 
+        
+
         using MSBuildLoggerProvider loggerProvider = new(Log);
         ILoggerFactory msbuildLoggerFactory = new LoggerFactory(new[] { loggerProvider });
         ILogger logger = msbuildLoggerFactory.CreateLogger<CreateImageIndex>();

From a61aad5637c4dbbedde843777ee827260ed1d4e7 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 3 Feb 2025 11:45:37 +0100
Subject: [PATCH 069/127] extract image index creation from DockerCli into
 ImageIndexGenerator

---
 .../ImageIndexGenerator.cs                    | 66 ++++++++++---
 .../LocalDaemons/DockerCli.cs                 | 95 ++++---------------
 .../ImageIndexGeneratorTests.cs               |  4 +-
 3 files changed, 70 insertions(+), 95 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index 413fa5e75591..e4d167a007df 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Text.Json;
-using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 using Microsoft.NET.Build.Containers.Resources;
-using Microsoft.NET.Build.Containers.Tasks;
 
 namespace Microsoft.NET.Build.Containers;
 
@@ -43,11 +42,11 @@ internal static (string, string) GenerateImageIndex(BuiltImage[] images)
 
         if (manifestMediaType == SchemaTypes.DockerManifestV2)
         {
-            return GenerateImageIndex(images, SchemaTypes.DockerManifestV2, SchemaTypes.DockerManifestListV2);
+            return (GenerateImageIndex(images, SchemaTypes.DockerManifestV2, SchemaTypes.DockerManifestListV2), SchemaTypes.DockerManifestListV2);
         }
         else if (manifestMediaType == SchemaTypes.OciManifestV1)
         {
-            return GenerateImageIndex(images, SchemaTypes.OciManifestV1, SchemaTypes.OciImageIndexV1);
+            return (GenerateImageIndex(images, SchemaTypes.OciManifestV1, SchemaTypes.OciImageIndexV1), SchemaTypes.OciImageIndexV1);
         }
         else
         {
@@ -55,36 +54,73 @@ internal static (string, string) GenerateImageIndex(BuiltImage[] images)
         }
     }
 
-    private static (string, string) GenerateImageIndex(BuiltImage[] images, string manifestMediaType, string imageIndexMediaType)
+    internal static string GenerateImageIndex(BuiltImage[] images, string manifestMediaType, string imageIndexMediaType)
     {
         // Here we are using ManifestListV2 struct, but we could use ImageIndexV1 struct as well.
         // We are filling the same fields, so we can use the same struct.
         var manifests = new PlatformSpecificManifest[images.Length];
+        
         for (int i = 0; i < images.Length; i++)
         {
-            var image = images[i];
-
-            var manifest = new PlatformSpecificManifest
+            manifests[i] = new PlatformSpecificManifest
             {
                 mediaType = manifestMediaType,
-                size = image.Manifest.Length,
-                digest = image.ManifestDigest,
+                size = images[i].Manifest.Length,
+                digest = images[i].ManifestDigest,
                 platform = new PlatformInformation
                 {
-                    architecture = image.Architecture!,
-                    os = image.OS!
+                    architecture = images[i].Architecture!,
+                    os = images[i].OS!
                 }
             };
-            manifests[i] = manifest;
         }
 
-        var manifestList = new ManifestListV2
+        var imageIndex = new ManifestListV2
         {
             schemaVersion = 2,
             mediaType = imageIndexMediaType,
             manifests = manifests
         };
 
-        return (JsonSerializer.SerializeToNode(manifestList)?.ToJsonString() ?? "", manifestList.mediaType);
+        var options = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        };
+        
+        return JsonSerializer.SerializeToNode(imageIndex, options)?.ToJsonString() ?? "";
+    }
+
+    internal static string GenerateImageIndexWithAnnotations(string manifestMediaType, string manifestDigest, long manifestSize, string repository, string[] tags)
+    {
+        var manifests = new PlatformSpecificOciManifest[tags.Length];
+        for (int i = 0; i < tags.Length; i++)
+        {
+            var tag = tags[i];
+            manifests[i] = new PlatformSpecificOciManifest
+            {
+                mediaType = manifestMediaType,
+                size = manifestSize,
+                digest = manifestDigest,
+                annotations = new Dictionary<string, string> 
+                {
+                    { "io.containerd.image.name", $"{repository}:{tag}" },
+                    { "org.opencontainers.image.ref.name", tag } 
+                }
+            };
+        }
+
+        var index = new ImageIndexV1
+        {
+            schemaVersion = 2,
+            mediaType = SchemaTypes.OciImageIndexV1,
+            manifests = manifests
+        };
+
+        var options = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        };
+
+        return JsonSerializer.SerializeToNode(index, options)?.ToJsonString() ?? "";
     }
 }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 208a10c24725..01bb7bb3bda4 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -7,7 +7,6 @@
 #endif
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.Extensions.Logging;
 using Microsoft.NET.Build.Containers.Resources;
@@ -461,35 +460,14 @@ private static async Task WriteIndexJsonForOciImage(
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        var manifests = new PlatformSpecificOciManifest[destinationReference.Tags.Length];
-        for (int i = 0; i < destinationReference.Tags.Length; i++)
-        {
-            var tag = destinationReference.Tags[i];
-            manifests[i] = new PlatformSpecificOciManifest
-            {
-                mediaType = SchemaTypes.OciManifestV1,
-                size = image.Manifest.Length,
-                digest = image.ManifestDigest,
-                annotations = new Dictionary<string, string> 
-                {
-                    { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
-                    { "org.opencontainers.image.ref.name", tag } 
-                }
-            };
-        }
+        string indexJson = ImageIndexGenerator.GenerateImageIndexWithAnnotations(
+            SchemaTypes.OciManifestV1,
+            image.ManifestDigest,
+            image.Manifest.Length,
+            destinationReference.Repository,
+            destinationReference.Tags);
 
-        var index = new ImageIndexV1
-        {
-            schemaVersion = 2,
-            mediaType = SchemaTypes.OciImageIndexV1,
-            manifests = manifests
-        };
-
-        var options = new JsonSerializerOptions
-        {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-        };
-        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index, options)!.ToJsonString())))
+        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(indexJson)))
         {
             PaxTarEntry indexEntry = new(TarEntryType.RegularFile, "index.json")
             {
@@ -548,31 +526,9 @@ private static async Task WriteIndexJsonForMultiArchOciImage(
         // 1. create manifest list for the blobs
         cancellationToken.ThrowIfCancellationRequested();
 
-        var manifests = new PlatformSpecificOciManifest[images.Length];
-        for (int i = 0; i < images.Length; i++)
-        {
-            var manifest = new PlatformSpecificOciManifest
-            {
-                mediaType = SchemaTypes.OciManifestV1,
-                size = images[i].Manifest.Length,
-                digest = images[i].ManifestDigest,
-                platform = new PlatformInformation { architecture = images[i].Architecture!, os = images[i].OS! }
-            };
-            manifests[i] = manifest;
-        }
+        // For multi-arch we publish only oci-formatted image tarballs.
+        string manifestListJson = ImageIndexGenerator.GenerateImageIndex(images, SchemaTypes.OciManifestV1, SchemaTypes.OciImageIndexV1);
 
-        var manifestList = new ImageIndexV1
-        {
-            schemaVersion = 2,
-            mediaType = SchemaTypes.OciImageIndexV1,
-            manifests = manifests
-        };
-
-        var options = new JsonSerializerOptions
-        {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-        };
-        var manifestListJson = JsonSerializer.SerializeToNode(manifestList, options)!.ToJsonString();
         var manifestListDigest = DigestUtils.GetDigest(manifestListJson);
         var manifestListSha = DigestUtils.GetShaFromDigest(manifestListDigest);
         var manifestListPath = $"{_blobsPath}/{manifestListSha}";
@@ -586,34 +542,17 @@ private static async Task WriteIndexJsonForMultiArchOciImage(
             await writer.WriteEntryAsync(indexEntry, cancellationToken).ConfigureAwait(false);
         }
 
-        // 2. create index json that points to manifest list in the blobs
+        // 2. create index.json that points to manifest list in the blobs
         cancellationToken.ThrowIfCancellationRequested();
 
-        var manifestsIndexJson = new PlatformSpecificOciManifest[destinationReference.Tags.Length];
-        for (int i = 0; i < destinationReference.Tags.Length; i++)
-        {
-            var tag = destinationReference.Tags[i];
-            manifestsIndexJson[i] = new PlatformSpecificOciManifest
-            {
-                mediaType = SchemaTypes.OciImageIndexV1,
-                size = manifestListJson.Length,
-                digest = manifestListDigest,
-                annotations = new Dictionary<string, string> 
-                {
-                    { "io.containerd.image.name", $"{destinationReference.Repository}:{tag}" },
-                    { "org.opencontainers.image.ref.name", tag } 
-                }
-            };
-        }
-
-        var index = new ImageIndexV1
-        {
-            schemaVersion = 2,
-            mediaType = SchemaTypes.OciImageIndexV1,
-            manifests = manifestsIndexJson
-        };
+        string indexJson = ImageIndexGenerator.GenerateImageIndexWithAnnotations(
+            SchemaTypes.OciImageIndexV1, 
+            manifestListDigest, 
+            manifestListJson.Length, 
+            destinationReference.Repository, 
+            destinationReference.Tags);
 
-        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(JsonSerializer.SerializeToNode(index, options)!.ToJsonString())))
+        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(indexJson)))
         {
             PaxTarEntry indexEntry = new(TarEntryType.RegularFile, "index.json")
             {
diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
index 9bc573b5b0e7..3d6e54969aeb 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
@@ -96,7 +96,7 @@ public void GenerateDockerManifestList()
         ];
 
         var (imageIndex, mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
-        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.docker.distribution.manifest.list.v2\\u002Bjson\",\"manifests\":[{\"mediaType\":\"application/vnd.docker.distribution.manifest.v2\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\",\"variant\":null,\"features\":null,\"os.version\":null}},{\"mediaType\":\"application/vnd.docker.distribution.manifest.v2\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\",\"variant\":null,\"features\":null,\"os.version\":null}}]}", imageIndex);
+        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.docker.distribution.manifest.list.v2\\u002Bjson\",\"manifests\":[{\"mediaType\":\"application/vnd.docker.distribution.manifest.v2\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\"}},{\"mediaType\":\"application/vnd.docker.distribution.manifest.v2\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\"}}]}", imageIndex);
         Assert.Equal(SchemaTypes.DockerManifestListV2, mediaType);
     }
 
@@ -130,7 +130,7 @@ public void GenerateOciImageIndex()
         ];
 
         var (imageIndex, mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
-        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1\\u002Bjson\",\"manifests\":[{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\",\"variant\":null,\"features\":null,\"os.version\":null}},{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\",\"variant\":null,\"features\":null,\"os.version\":null}}]}", imageIndex);
+        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1\\u002Bjson\",\"manifests\":[{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\"}},{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\"}}]}", imageIndex);
         Assert.Equal(SchemaTypes.OciImageIndexV1, mediaType);
     }
 }

From 51d9cc80aa044ab9f579c367eaff17daad4a550c Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 3 Feb 2025 12:03:30 +0100
Subject: [PATCH 070/127] cleanup

---
 .../ImageIndexGenerator.cs                             | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index e4d167a007df..27f7fbe9cd5f 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -7,16 +7,6 @@
 
 namespace Microsoft.NET.Build.Containers;
 
-internal readonly struct ImageInfo
-{
-    internal string Config { get; init; }
-    internal string ManifestDigest { get; init; }
-    internal string Manifest { get; init; }
-    internal string ManifestMediaType { get; init; }
-
-    public override string ToString() => ManifestDigest;
-}
-
 internal static class ImageIndexGenerator
 {
     /// <summary>

From a0c3a5673449c9a812a689dd1bb9af6594f457b3 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 3 Feb 2025 12:26:35 +0100
Subject: [PATCH 071/127] add more ImageIndexGenertorTests

---
 .../ImageIndexGenerator.cs                        |  5 +++++
 .../ImageIndexGeneratorTests.cs                   | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index 27f7fbe9cd5f..cc9b32ec4e9d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -46,6 +46,11 @@ internal static (string, string) GenerateImageIndex(BuiltImage[] images)
 
     internal static string GenerateImageIndex(BuiltImage[] images, string manifestMediaType, string imageIndexMediaType)
     {
+        if (images.Length == 0)
+        {
+            throw new ArgumentException(string.Format(Strings.ImagesEmpty));
+        }
+        
         // Here we are using ManifestListV2 struct, but we could use ImageIndexV1 struct as well.
         // We are filling the same fields, so we can use the same struct.
         var manifests = new PlatformSpecificManifest[images.Length];
diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
index 3d6e54969aeb..f89d2601b9b8 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
@@ -15,6 +15,14 @@ public void ImagesCannotBeEmpty()
         Assert.Equal(Strings.ImagesEmpty, ex.Message);
     }
 
+    [Fact]
+    public void ImagesCannotBeEmpty_SpecifiedMediaType()
+    {
+        BuiltImage[] images = Array.Empty<BuiltImage>();
+        var ex = Assert.Throws<ArgumentException>(() => ImageIndexGenerator.GenerateImageIndex(images, "manifestMediaType", "imageIndexMediaType"));
+        Assert.Equal(Strings.ImagesEmpty, ex.Message);
+    }
+
     [Fact]
     public void UnsupportedMediaTypeThrows()
     {
@@ -133,4 +141,11 @@ public void GenerateOciImageIndex()
         Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1\\u002Bjson\",\"manifests\":[{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\"}},{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\"}}]}", imageIndex);
         Assert.Equal(SchemaTypes.OciImageIndexV1, mediaType);
     }
+
+    [Fact]
+    public void GenerateImageIndexWithAnnotations()
+    {
+        string imageIndex = ImageIndexGenerator.GenerateImageIndexWithAnnotations("mediaType", "sha256:digest", 3, "repository", ["1.0", "2.0"]);
+        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1\\u002Bjson\",\"manifests\":[{\"mediaType\":\"mediaType\",\"size\":3,\"digest\":\"sha256:digest\",\"platform\":{},\"annotations\":{\"io.containerd.image.name\":\"repository:1.0\",\"org.opencontainers.image.ref.name\":\"1.0\"}},{\"mediaType\":\"mediaType\",\"size\":3,\"digest\":\"sha256:digest\",\"platform\":{},\"annotations\":{\"io.containerd.image.name\":\"repository:2.0\",\"org.opencontainers.image.ref.name\":\"2.0\"}}]}", imageIndex);
+    }
 }

From 3078ea8728d9035756c101cfbc73d0381e4a3098 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 3 Feb 2025 14:38:05 +0100
Subject: [PATCH 072/127] check if containerd store is enabled before loading

---
 .../ImagePublisher.cs                         | 10 +----
 .../LocalDaemons/DockerCli.cs                 | 41 ++++++++++++++++++-
 .../Resources/Strings.Designer.cs             |  6 +--
 .../Resources/Strings.resx                    |  8 ++--
 .../Resources/xlf/Strings.cs.xlf              | 10 ++---
 .../Resources/xlf/Strings.de.xlf              | 10 ++---
 .../Resources/xlf/Strings.es.xlf              | 10 ++---
 .../Resources/xlf/Strings.fr.xlf              | 10 ++---
 .../Resources/xlf/Strings.it.xlf              | 10 ++---
 .../Resources/xlf/Strings.ja.xlf              | 10 ++---
 .../Resources/xlf/Strings.ko.xlf              | 10 ++---
 .../Resources/xlf/Strings.pl.xlf              | 10 ++---
 .../Resources/xlf/Strings.pt-BR.xlf           | 10 ++---
 .../Resources/xlf/Strings.ru.xlf              | 10 ++---
 .../Resources/xlf/Strings.tr.xlf              | 10 ++---
 .../Resources/xlf/Strings.zh-Hans.xlf         | 10 ++---
 .../Resources/xlf/Strings.zh-Hant.xlf         | 10 ++---
 17 files changed, 113 insertions(+), 82 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index cd6a6a15ebd8..bc3e330441af 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -72,8 +72,7 @@ await PushToLocalRegistryAsync(
                     BuildEngine,
                     telemetry,
                     cancellationToken,
-                    destinationImageReference.LocalRegistry!.LoadAsync,
-                    logTipAboutContainerd : true).ConfigureAwait(false);
+                    destinationImageReference.LocalRegistry!.LoadAsync).ConfigureAwait(false);
                 break;
             case DestinationImageReferenceKind.RemoteRegistry:
                 await PushToRemoteRegistryAsync(
@@ -110,8 +109,7 @@ private static async Task PushToLocalRegistryAsync<T>(
         IBuildEngine? BuildEngine,
         Telemetry telemetry,
         CancellationToken cancellationToken,
-        Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc,
-        bool logTipAboutContainerd = false)
+        Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc)
     {
         ILocalRegistry localRegistry = destinationImageReference.LocalRegistry!;
         if (!(await localRegistry.IsAvailableAsync(cancellationToken).ConfigureAwait(false)))
@@ -148,10 +146,6 @@ private static async Task PushToLocalRegistryAsync<T>(
         {
             telemetry.LogLocalLoadError();
             Log.LogErrorFromException(dle, showStackTrace: false);
-            if (logTipAboutContainerd && dle.Message.Contains("no such file or directory"))
-            {
-                Log.LogMessage(MessageImportance.High, Strings.TipToEnableContainerdForMultiArch);
-            }
         }
     }
 
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 01bb7bb3bda4..6b7471cafb76 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -87,10 +87,16 @@ private async Task LoadAsync<T>(
         SourceImageReference sourceReference,
         DestinationImageReference destinationReference,
         Func<T, SourceImageReference, DestinationImageReference, Stream, CancellationToken, Task> writeStreamFunc,
-        CancellationToken cancellationToken)
+        CancellationToken cancellationToken,
+        bool checkContainerdStore = false)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
+        if (checkContainerdStore && !IsContainerdStoreEnabledForDocker())
+        {
+            throw new DockerLoadException(Strings.ImageLoadFailed_ContainerdStoreDisabled);
+        }
+
         string commandPath = await FindFullCommandPath(cancellationToken);
 
         // call `docker load` and get it ready to receive input
@@ -125,7 +131,7 @@ public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReferen
         => await LoadAsync(image, sourceReference, destinationReference, WriteDockerImageToStreamAsync, cancellationToken);
 
     public async Task LoadAsync(BuiltImage[] images, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken) 
-        => await LoadAsync(images, sourceReference, destinationReference, WriteMultiArchOciImageToStreamAsync, cancellationToken);
+        => await LoadAsync(images, sourceReference, destinationReference, WriteMultiArchOciImageToStreamAsync, cancellationToken, checkContainerdStore: true);
     
     public async Task<bool> IsAvailableAsync(CancellationToken cancellationToken)
     {
@@ -619,6 +625,37 @@ private static bool IsPodmanAlias()
         }
     }
 
+    private static bool IsContainerdStoreEnabledForDocker()
+    {
+        try
+        {
+            // We don't need to check if this is docker, because there is no "DriverStatus" for podman
+            if (!GetDockerConfig().RootElement.TryGetProperty("DriverStatus", out var driverStatus) || driverStatus.ValueKind != JsonValueKind.Array)
+            {
+                return false;
+            }
+
+            foreach (var item in driverStatus.EnumerateArray())
+            {
+                if (item.ValueKind != JsonValueKind.Array || item.GetArrayLength() != 2) continue;
+
+                var array = item.EnumerateArray().ToArray();
+                // The usual output is [driver-type io.containerd.snapshotter.v1]
+                if (array[0].GetString() == "driver-type" && array[1].GetString()!.StartsWith("io.containerd.snapshotter"))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+
 #if NET
     private async Task<bool> TryRunVersionCommandAsync(string command, CancellationToken cancellationToken)
     {
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
index 4f2dee24ba99..59a9f28b0b83 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
@@ -457,11 +457,11 @@ internal static string ImageIndex_PodmanNotSupported {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings..
+        ///   Looks up a localized string similar to CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings..
         /// </summary>
-        internal static string TipToEnableContainerdForMultiArch {
+        internal static string ImageLoadFailed_ContainerdStoreDisabled {
             get {
-                return ResourceManager.GetString("TipToEnableContainerdForMultiArch", resourceCulture);
+                return ResourceManager.GetString("ImageLoadFailed_ContainerdStoreDisabled", resourceCulture);
             }
         }
 
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
index 42d9dddffea2..bac283c4ac0c 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
@@ -189,6 +189,10 @@
     <value>CONTAINER1009: Failed to load image from local registry. stdout: {0}</value>
     <comment>{StrBegin="CONTAINER1009: "}</comment>
   </data>
+  <data name="ImageLoadFailed_ContainerdStoreDisabled" xml:space="preserve">
+    <value>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</value>
+    <comment>{StrBegin="CONTAINER1020: "}</comment>
+  </data>
   <data name="InvalidEnvVar" xml:space="preserve">
     <value>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</value>
     <comment>{StrBegin="CONTAINER2015: "}</comment>
@@ -401,10 +405,6 @@
     <value>Image index creation for Podman is not supported.</value>
     <comment/>
   </data>
-  <data name="TipToEnableContainerdForMultiArch" xml:space="preserve">
-    <value>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</value>
-    <comment/>
-  </data>
   <data name="LocalDocker_FailedToGetConfig" xml:space="preserve">
     <value>Error while reading daemon config: {0}</value>
     <comment>{0} is the exception message that ends with period</comment>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
index 20499b00e426..f916d5f3d916 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: Nepodařilo se načíst bitovou kopii z místního registru. stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: Načítání imagí z místního registru se nepodporuje.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: Požadovaná vlastnost '{0}' nebyla nastavena nebo je prázdná.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Příliš mnoho opakovaných pokusů, zastavuje se.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
index 313ffe15f9a1..d0ac67812ab7 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: Fehler beim Laden des Images aus der lokalen Registrierung. stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: Das Pullen von Images aus der lokalen Registrierung wird nicht unterstützt.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: Die erforderliche Eigenschaft „{0}“ wurde nicht festgelegt oder ist leer.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Zu viele Wiederholungsversuche, Vorgang wird beendet.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
index a1c4e1a7107f..b1febfedfbc6 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: no se pudo cargar la imagen desde el registro local. Stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: No se admite la extracción de imágenes del registro local.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: La propiedad necesaria "{0}" no se estableció o estaba vacía.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Demasiados reintentos, deteniendo.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
index 705c8e48ae85..2566778c2a07 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: Échec du chargement de l'image à partir du registre local. sortie standard : {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: L'extraction d'images à partir du registre local n'est pas prise en charge.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: la propriété requise '{0}' n’a pas été définie ou vide.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: trop de tentatives, arrêt.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
index 22089bdb50c6..e6b319944c11 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: non è stato possibile caricare l'immagine dal registro locale. stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: il pull di immagini dal registro locale non è supportato.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: la proprietà obbligatoria '{0}' non è stata impostata o è vuota.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: troppi tentativi, arresto.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
index 3efb830d3e14..16e01793da1d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: ローカル レジストリからイメージを読み込めませんでした。stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: ローカル レジストリからのイメージのプルはサポートされていません。</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: 必要なプロパティ '{0}' が設定されていなかったか、空でした。</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: 再試行回数が多すぎます。停止しています。</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
index 75380d38355f..370181275c81 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: 로컬 레지스트리에서 이미지를 로드하지 못했습니다. stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: 로컬 레지스트리에서 이미지 끌어오기가 지원되지 않습니다.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: 필수 속성 '{0}'이(가) 설정되지 않았거나 비어 있습니다.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: 다시 시도가 너무 많아 중지 중입니다.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
index f34e4c1e4b31..d92686d7d371 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: Nie można załadować obrazu z rejestru lokalnego. stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: Ściąganie obrazów z rejestru lokalnego nie jest obsługiwane.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: wymagana właściwość „{0}” nie została ustawiona lub jest pusta.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: zbyt wiele ponownych prób, zatrzymywanie.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
index 6b5da780f9fb..651ea8dd65b6 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: falha ao carregar a imagem do registro local. stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: A extração de imagens do registro local não é suportada.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: A propriedade obrigatória '{0}' não foi definida ou está vazia.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Muitas tentativas, parando.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
index e9d2290783c0..a52774d219e5 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: не удалось загрузить образ из локального реестра. stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: извлечение образов из локального реестра не поддерживается.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: обязательное свойство "{0}" не установлено или пусто.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: слишком много повторных попыток, остановка.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
index fac7e81d6444..f513dfc84940 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: Görüntü yerel kayıt defterinden yüklenemedi. stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: Yerel kayıt defterinden görüntü çekme desteklenmiyor.</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: Gerekli '{0}' özelliği ayarlanmadı veya boş değil.</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: Çok fazla yeniden deneme, durduruluyor.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
index 411f5221a963..82b415641aa9 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: 未能从本地注册表加载映像。stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: 不支持从本地注册表拉取映像。</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: 未设置必需属性 "{0}" 或为空。</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: 重试次数过多，正在停止。</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
index 580bb931de64..ef91ab2848e8 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
@@ -189,6 +189,11 @@
         <target state="translated">CONTAINER1009: 無法從本機登錄載入映像。stdout: {0}</target>
         <note>{StrBegin="CONTAINER1009: "}</note>
       </trans-unit>
+      <trans-unit id="ImageLoadFailed_ContainerdStoreDisabled">
+        <source>CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</source>
+        <target state="new">CONTAINER1020: Failed to load image because containerd image store is not enabled for Docker. Tip: You can enable it by checking 'Use containerd for pulling and storing images' in Docker Desktop settings.</target>
+        <note>{StrBegin="CONTAINER1020: "}</note>
+      </trans-unit>
       <trans-unit id="ImagePullNotSupported">
         <source>CONTAINER1010: Pulling images from local registry is not supported.</source>
         <target state="translated">CONTAINER1010: 不支援從本機登錄提取映像。</target>
@@ -409,11 +414,6 @@
         <target state="translated">CONTAINER4001: 必要的屬性 '{0}' 未設定或是空的。</target>
         <note>{StrBegin="CONTAINER4001: "}</note>
       </trans-unit>
-      <trans-unit id="TipToEnableContainerdForMultiArch">
-        <source>Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</source>
-        <target state="new">Tip: For multi-arch image publishing, ensure that 'Use containerd for pulling and storing images' is checked in Docker Desktop settings.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TooManyRetries">
         <source>CONTAINER1006: Too many retries, stopping.</source>
         <target state="translated">CONTAINER1006: 重試太多次，正在停止。</target>

From 9f32fbc693773667167dc5f426b22f40606a486e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:49:40 +0000
Subject: [PATCH 073/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250203.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25066.6 -> To Version 8.0.0-beta.25103.4
---
 NuGet.config            |  8 ++++++++
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e9ee8ac05b38..6d4d8a6b53a9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,6 +37,14 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67da9f6730ec..9ed322d4a6b0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d83a97a85d7e..2c25f7139f1c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25103.4</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25103.4</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 8b18dee78510..e48e07bb4359 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25103.4"
   }
 }

From 2f5687933a44c1eaa77e6446fa705eb41b15be29 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:49:43 +0000
Subject: [PATCH 074/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250203.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25066.6 -> To Version 8.0.0-beta.25103.4
---
 NuGet.config            |  8 ++++++++
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 49fd094d2eae..e5b1c2c05c3f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,14 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87da96b25065..a58b7d2cb52d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a0beb2aa63e7..aec7c750aa33 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25103.4</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25103.4</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 8b18dee78510..e48e07bb4359 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25103.4"
   }
 }

From c6d5c3de9775fe4895227f03f35bb109722374e8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:49:55 +0000
Subject: [PATCH 075/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250203.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25066.6 -> To Version 8.0.0-beta.25103.4
---
 NuGet.config            |  8 ++++++++
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9a7c8ee1ea01..a96abe370a50 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,14 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78823ee85fe2..e0e55f5d0ebc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25103.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
+      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 679fa1eddb64..18db9c541e94 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25103.4</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25103.4</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 8b18dee78510..e48e07bb4359 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25103.4"
   }
 }

From e064f660f3038fad68f92e5b862cdcfc9f619e94 Mon Sep 17 00:00:00 2001
From: Sean Reeser <v-seanreeser@microsoft.com>
Date: Tue, 4 Feb 2025 11:42:22 -0800
Subject: [PATCH 076/127] Update branding to 8.0.114

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d83a97a85d7e..6c1ab90c8375 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <VersionPrefix>8.0.113</VersionPrefix>
+    <VersionPrefix>8.0.114</VersionPrefix>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

From fc14d514815d48b77da5c1513dc28de0f53f9fd8 Mon Sep 17 00:00:00 2001
From: Sean Reeser <v-seanreeser@microsoft.com>
Date: Tue, 4 Feb 2025 11:42:29 -0800
Subject: [PATCH 077/127] Update branding to 8.0.310

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a0beb2aa63e7..35f1aa979323 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <VersionPrefix>8.0.309</VersionPrefix>
+    <VersionPrefix>8.0.310</VersionPrefix>
     <WorkloadsFeatureBand>8.0.300</WorkloadsFeatureBand>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>

From 6a569c2db1f7dd994afe5b6da92f531e8aae519e Mon Sep 17 00:00:00 2001
From: Sean Reeser <v-seanreeser@microsoft.com>
Date: Tue, 4 Feb 2025 11:42:35 -0800
Subject: [PATCH 078/127] Update branding to 8.0.407

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 679fa1eddb64..8f419e59beb7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <VersionPrefix>8.0.406</VersionPrefix>
+    <VersionPrefix>8.0.407</VersionPrefix>
     <WorkloadsFeatureBand>8.0.400</WorkloadsFeatureBand>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>

From 9a863db032cef39a5de9599b8bba88eb502367a0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2025 20:36:10 +0000
Subject: [PATCH 079/127] Update dependencies from
 https://github.com/dotnet/source-build-externals build 20250204.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25104.1
---
 NuGet.config            | 8 ++++++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e9ee8ac05b38..6d4d8a6b53a9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,6 +37,14 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67da9f6730ec..a4c86855a1f9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -349,9 +349,9 @@
       <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
+      <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">

From a82eca1af8ef88f510be6865b3533bfb87563e5c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2025 22:22:44 +0000
Subject: [PATCH 080/127] Update dependencies from
 https://github.com/dotnet/templating build 20250204.4

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25066.8 -> To Version 8.0.114-servicing.25104.4
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e9ee8ac05b38..4f36ef23b554 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -36,7 +36,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-5c495e8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5c495e85/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67da9f6730ec..f4817f5cc11b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.113">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.114">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
+      <Sha>5c495e8559f5ec96c10e6dbe817fd95c2c854eeb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.113-servicing.25066.8">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25104.4">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
+      <Sha>5c495e8559f5ec96c10e6dbe817fd95c2c854eeb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.113-servicing.25066.8">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25104.4">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>335a66efa4126495303c20598f1d9537d5d6897c</Sha>
+      <Sha>5c495e8559f5ec96c10e6dbe817fd95c2c854eeb</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index d83a97a85d7e..52bcdb4f5e64 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -137,13 +137,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/templating -->
-    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.113</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.114</MicrosoftTemplateEngineAbstractionsPackageVersion>
     <MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
     <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.113-servicing.25066.8</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25104.4</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From c466a5dca6a21a8631d5b2272f5de260b115e2c1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2025 23:37:17 +0000
Subject: [PATCH 081/127] Update dependencies from
 https://github.com/dotnet/templating build 20250204.10

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25066.8 -> To Version 8.0.114-servicing.25104.10
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 4f36ef23b554..69e06b197adb 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -36,7 +36,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-5c495e8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5c495e85/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-6c99f15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6c99f152/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f4817f5cc11b..77b296542783 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.114">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>5c495e8559f5ec96c10e6dbe817fd95c2c854eeb</Sha>
+      <Sha>6c99f152ee05775980664e38625bfd999455cf85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25104.4">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25104.10">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>5c495e8559f5ec96c10e6dbe817fd95c2c854eeb</Sha>
+      <Sha>6c99f152ee05775980664e38625bfd999455cf85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25104.4">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25104.10">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>5c495e8559f5ec96c10e6dbe817fd95c2c854eeb</Sha>
+      <Sha>6c99f152ee05775980664e38625bfd999455cf85</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index 52bcdb4f5e64..ea14c799d659 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25104.4</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25104.10</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From adadcc27c020db4838be80e487c9c82aa51f344b Mon Sep 17 00:00:00 2001
From: Forgind <12969783+Forgind@users.noreply.github.com>
Date: Tue, 4 Feb 2025 17:02:16 -0800
Subject: [PATCH 082/127] Delete spurious error

---
 src/Cli/dotnet/commands/InstallingWorkloadCommand.cs        | 2 +-
 .../SdkDirectoryWorkloadManifestProvider.cs                 | 6 +++++-
 .../Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs
index 8a0ae321c37f..9232b9a3790c 100644
--- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs
+++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs
@@ -254,7 +254,7 @@ private IEnumerable<ManifestVersionUpdate> InstallWorkloadSet(ITransactionContex
             PrintWorkloadSetTransition(workloadSetVersion);
             var workloadSet = _workloadInstaller.InstallWorkloadSet(context, workloadSetVersion);
 
-            return _workloadManifestUpdater.CalculateManifestUpdatesForWorkloadSet(workloadSet);
+            return workloadSet is null ? Enumerable.Empty<ManifestVersionUpdate>() : _workloadManifestUpdater.CalculateManifestUpdatesForWorkloadSet(workloadSet);
         }
 
         private void PrintWorkloadSetTransition(string newVersion)
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs
index 2aca0c68dbd5..e24daeb6c321 100644
--- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs
+++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs
@@ -539,7 +539,11 @@ static void AddWorkloadSetsForFeatureBand(Dictionary<string, WorkloadSet> availa
                     {
                         var workloadSetVersion = Path.GetFileName(workloadSetDirectory);
                         var workloadSet = WorkloadSet.FromWorkloadSetFolder(workloadSetDirectory, workloadSetVersion, featureBand);
-                        availableWorkloadSets[workloadSet.Version!] = workloadSet;
+
+                        if (workloadSet is not null)
+                        {
+                            availableWorkloadSets[workloadSet.Version!] = workloadSet;
+                        }
                     }
                 }
             }
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs
index eecb89c38f06..18adbfab7d13 100644
--- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs
+++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs
@@ -81,7 +81,7 @@ public static WorkloadSet FromJson(string json, SdkFeatureBand defaultFeatureBan
 #endif
         }
 
-        public static WorkloadSet FromWorkloadSetFolder(string path, string workloadSetVersion, SdkFeatureBand defaultFeatureBand)
+        public static WorkloadSet? FromWorkloadSetFolder(string path, string workloadSetVersion, SdkFeatureBand defaultFeatureBand)
         {
             WorkloadSet? workloadSet = null;
             foreach (var jsonFile in Directory.GetFiles(path, "*.workloadset.json"))
@@ -107,7 +107,7 @@ public static WorkloadSet FromWorkloadSetFolder(string path, string workloadSetV
 
             if (workloadSet == null)
             {
-                throw new InvalidOperationException("No workload set information found in: " + path);
+                return null;
             }
 
             if (File.Exists(Path.Combine(path, "baseline.workloadset.json")))

From e69f371d29164d1a04b0d91cc5feb66b734b8c91 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 01:41:58 +0000
Subject: [PATCH 083/127] Update dependencies from
 https://github.com/dotnet/templating build 20250204.15

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25066.8 -> To Version 8.0.114-servicing.25104.15
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 69e06b197adb..29b8de121007 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -36,7 +36,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-6c99f15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6c99f152/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-bc89b40" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bc89b40a/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 77b296542783..6cdabbf286f9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.114">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>6c99f152ee05775980664e38625bfd999455cf85</Sha>
+      <Sha>bc89b40a3045acb47a730533ee268ffed57cdb33</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25104.10">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25104.15">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>6c99f152ee05775980664e38625bfd999455cf85</Sha>
+      <Sha>bc89b40a3045acb47a730533ee268ffed57cdb33</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25104.10">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25104.15">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>6c99f152ee05775980664e38625bfd999455cf85</Sha>
+      <Sha>bc89b40a3045acb47a730533ee268ffed57cdb33</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index ea14c799d659..bc8786c61be0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25104.10</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25104.15</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 917209ed96677ba35f62f9eee3a3cf50a2be1966 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 03:23:57 +0000
Subject: [PATCH 084/127] Update dependencies from
 https://github.com/dotnet/razor build 20250204.6

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 7.0.0-preview.24629.6 -> To Version 7.0.0-preview.25104.6
---
 NuGet.config            |  8 ++++++++
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e9ee8ac05b38..6d4d8a6b53a9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,6 +37,14 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-335a66e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 67da9f6730ec..c6ab8b4f23da 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -293,18 +293,18 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24629.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25104.6">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</Sha>
+      <Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
       <SourceBuild RepoName="razor" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24629.6">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25104.6">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</Sha>
+      <Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24629.6">
+    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25104.6">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>90608b56d9ba975bd83dd7527071ffac6c1ac7d3</Sha>
+      <Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 6c1ab90c8375..cbe33b8fcadb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -175,9 +175,9 @@
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24629.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
-    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24629.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
-    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24629.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25104.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
+    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25104.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
+    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25104.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->

From 3101300005368113b58eee22f16c631abccf1603 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 03:49:36 +0000
Subject: [PATCH 085/127] Update dependencies from
 https://github.com/dotnet/templating build 20250204.16

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25066.8 -> To Version 8.0.114-servicing.25104.16
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 29b8de121007..e08d53ed9140 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -36,7 +36,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-bc89b40" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bc89b40a/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-67efdba" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-67efdba8/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6cdabbf286f9..701e3fba059e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.114">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>bc89b40a3045acb47a730533ee268ffed57cdb33</Sha>
+      <Sha>67efdba8442b2171476bf0b2225b95b5813c2efd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25104.15">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25104.16">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>bc89b40a3045acb47a730533ee268ffed57cdb33</Sha>
+      <Sha>67efdba8442b2171476bf0b2225b95b5813c2efd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25104.15">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25104.16">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>bc89b40a3045acb47a730533ee268ffed57cdb33</Sha>
+      <Sha>67efdba8442b2171476bf0b2225b95b5813c2efd</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index bc8786c61be0..e151180fd0f2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25104.15</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25104.16</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 0dd6c44b5e6ff6dbe96c69d968cac7b90e67a8cb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 05:02:24 +0000
Subject: [PATCH 086/127] Update dependencies from
 https://github.com/dotnet/razor build 20250204.5

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 7.0.0-preview.24629.2 -> To Version 7.0.0-preview.25104.5
---
 NuGet.config            |  8 ++++++++
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 49fd094d2eae..e5b1c2c05c3f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,14 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87da96b25065..3268de065c25 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -293,18 +293,18 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>31d685b2d9a86ca1243014d175a3da813f78e428</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.24629.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25104.5">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
+      <Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
       <SourceBuild RepoName="razor" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.24629.2">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25104.5">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
+      <Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.24629.2">
+    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25104.5">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>47a3872a73899ff683dc9593e587e539a1264233</Sha>
+      <Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 35f1aa979323..df7c493744cc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -179,9 +179,9 @@
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.24629.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
-    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.24629.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
-    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.24629.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25104.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
+    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25104.5</MicrosoftCodeAnalysisRazorToolingInternalVersion>
+    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25104.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->

From 897abd38c3853b9e8751ad4acdc64e1da33e5374 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 05:02:26 +0000
Subject: [PATCH 087/127] Update dependencies from
 https://github.com/dotnet/source-build-externals build 20250204.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25104.1
---
 NuGet.config            | 8 ++++++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 49fd094d2eae..e5b1c2c05c3f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,14 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 87da96b25065..18006955fad1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -349,9 +349,9 @@
       <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
+      <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">

From 25fe555e45cb000c3993ab62762080dcd9cbbc5f Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 05:02:43 +0000
Subject: [PATCH 088/127] Update dependencies from
 https://github.com/dotnet/source-build-externals build 20250204.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25104.1
---
 NuGet.config            | 8 ++++++++
 eng/Version.Details.xml | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9a7c8ee1ea01..a96abe370a50 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -38,6 +38,14 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78823ee85fe2..b4b042731713 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -349,9 +349,9 @@
       <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
+      <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">

From af3a5482eb2e11b585e8da28b394bc05861bacef Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 14:36:06 +0100
Subject: [PATCH 089/127] cleanup targets

---
 .../build/Microsoft.NET.Build.Containers.targets       | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 3854f88ef29f..51b28a1db5f6 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -297,12 +297,6 @@
   </Target>
 
   <Target Name="_PublishMultiArchContainers" DependsOnTargets="$(PublishContainerDependsOn)" >
-    <Error Text="ContainerArchiveOutputPath is invalid. It can only be a directory in multi-arch scenario because the runtime identifier is appended in the end of the filename."
-      Condition="'$(ContainerArchiveOutputPath)' != '' and
-                 !$(ContainerArchiveOutputPath.EndsWith('/')) and
-                 !$(ContainerArchiveOutputPath.EndsWith('\\')) and
-                 $(ContainerArchiveOutputPath.EndsWith('.tar.gz'))" />
-
     <PropertyGroup>
       <!--We want to skip publishing individual images in case of multi-arch tarball publishing or local daemon (only docker) publishing because all images are published in one tarball.-->
       <!--We don't want to skip publishing individual images in case of remote registry because the individual images should be available in the registry before image index is pushed.-->
@@ -400,10 +394,6 @@
         Include="$([System.String]::Copy('%(_ParsedContainerEnvironmentVariables.Identity)').Split(':')[0])"
         Value="$([System.String]::Copy('%(_ParsedContainerEnvironmentVariables.Identity)').Split(':')[1])" />
     </ItemGroup>
-    <PropertyGroup>
-      <!-- We've already validated that ContainerArchiveOutputPath is pointing to a directory. -->
-      <ContainerArchiveOutputPath Condition="'$(ContainerArchiveOutputPath)' != ''">$([System.IO.Path]::Combine($(ContainerArchiveOutputPath), $(ContainerRepository)-$(ContainerRuntimeIdentifier).tar.gz))</ContainerArchiveOutputPath>
-    </PropertyGroup>
   </Target>
 
   <Target Name="PublishContainer"

From 69026eacc1a451d7aa8a3f215104e0166ecb0634 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 14:39:06 +0100
Subject: [PATCH 090/127] add docker.io/library prefix to image name
 annotation; fix json serialization symbol escaping

---
 .../ImageIndexGenerator.cs                    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index cc9b32ec4e9d..8abbe315d0c8 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.NET.Build.Containers.Resources;
@@ -46,11 +47,6 @@ internal static (string, string) GenerateImageIndex(BuiltImage[] images)
 
     internal static string GenerateImageIndex(BuiltImage[] images, string manifestMediaType, string imageIndexMediaType)
     {
-        if (images.Length == 0)
-        {
-            throw new ArgumentException(string.Format(Strings.ImagesEmpty));
-        }
-        
         // Here we are using ManifestListV2 struct, but we could use ImageIndexV1 struct as well.
         // We are filling the same fields, so we can use the same struct.
         var manifests = new PlatformSpecificManifest[images.Length];
@@ -77,12 +73,7 @@ internal static string GenerateImageIndex(BuiltImage[] images, string manifestMe
             manifests = manifests
         };
 
-        var options = new JsonSerializerOptions
-        {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-        };
-        
-        return JsonSerializer.SerializeToNode(imageIndex, options)?.ToJsonString() ?? "";
+        return GetJsonStringFromImageIndex(imageIndex);
     }
 
     internal static string GenerateImageIndexWithAnnotations(string manifestMediaType, string manifestDigest, long manifestSize, string repository, string[] tags)
@@ -98,7 +89,7 @@ internal static string GenerateImageIndexWithAnnotations(string manifestMediaTyp
                 digest = manifestDigest,
                 annotations = new Dictionary<string, string> 
                 {
-                    { "io.containerd.image.name", $"{repository}:{tag}" },
+                    { "io.containerd.image.name", $"docker.io/library/{repository}:{tag}" },
                     { "org.opencontainers.image.ref.name", tag } 
                 }
             };
@@ -111,11 +102,20 @@ internal static string GenerateImageIndexWithAnnotations(string manifestMediaTyp
             manifests = manifests
         };
 
-        var options = new JsonSerializerOptions
+        return GetJsonStringFromImageIndex(index);
+    }
+
+    private static string GetJsonStringFromImageIndex<T>(T imageIndex)
+    {
+        var nullIgnoreOptions = new JsonSerializerOptions
         {
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
         };
+        var escapeOptions = new JsonSerializerOptions
+        {
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+        };
 
-        return JsonSerializer.SerializeToNode(index, options)?.ToJsonString() ?? "";
+        return JsonSerializer.SerializeToNode(imageIndex, nullIgnoreOptions)?.ToJsonString(escapeOptions) ?? "";
     }
 }

From a821ac2cc768396ea97c0d54bd329d030ec9e26e Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 14:39:42 +0100
Subject: [PATCH 091/127] delete empty lines

---
 .../Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 217f2909fffe..d56ae92d9b62 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -52,8 +52,6 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             return false;
         }
 
-        
-
         using MSBuildLoggerProvider loggerProvider = new(Log);
         ILoggerFactory msbuildLoggerFactory = new LoggerFactory(new[] { loggerProvider });
         ILogger logger = msbuildLoggerFactory.CreateLogger<CreateImageIndex>();

From 8bea2ec53b15a3a33b49b971916f27e532c7bd1e Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 15:39:14 +0100
Subject: [PATCH 092/127] fix EndToEndMultiArch_ArchivePublishing test

---
 .../EndToEndTests.cs                                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 2881ae159aa6..19e04dd0f132 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -928,7 +928,7 @@ public void EndToEndMultiArch_ArchivePublishing()
         string imageName = NewImageName();
         string tag = "1.0";
         string image = $"{imageName}:{tag}";
-        string archiveOutput = Path.Combine(TestSettings.TestArtifactsDirectory, "tarballs-output");
+        string archiveOutput = TestSettings.TestArtifactsDirectory;
         string imageTarball = Path.Combine(archiveOutput, $"{imageName}.tar.gz");
 
         // Create a new console project

From 2e6adabb97b8db0450bf9a67295607b6998027ac Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 15:54:15 +0100
Subject: [PATCH 093/127] update EndToEndMultiArch_RemoteRegistry test since
 containerd store is enabled

---
 .../ContainerCli.cs                           |  3 --
 .../EndToEndTests.cs                          | 48 +++++++------------
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
index 1315d341f94f..13aa9928633d 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
@@ -12,9 +12,6 @@ static class ContainerCli
     public static RunExeCommand PullCommand(ITestOutputHelper log, params string[] args)
       => CreateCommand(log, "pull", args);
 
-    public static RunExeCommand TagCommand(ITestOutputHelper log, params string[] args)
-      => CreateCommand(log, "tag", args);
-
     public static RunExeCommand PushCommand(ITestOutputHelper log, params string[] args)
       => CreateCommand(log, "push", args);
 
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 19e04dd0f132..ea6135c5bcbe 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -1004,6 +1004,7 @@ public void EndToEndMultiArch_RemoteRegistry()
         string imageX64 = $"{imageName}:{imageTag}-linux-x64";
         string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
         string imageIndex = $"{imageName}:{imageTag}";
+        string imageFromRegistry = $"{registry}/{imageIndex}";
 
         // Create a new console project
         DirectoryInfo newProjectDir = CreateNewProject("console");
@@ -1031,59 +1032,42 @@ public void EndToEndMultiArch_RemoteRegistry()
             .And.HaveStdOutContaining($"Pushed image '{imageX64}' to registry '{registry}'.")
             .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to registry '{registry}'.")
             .And.HaveStdOutContaining($"Pushed image index '{imageIndex}' to registry '{registry}'.");
-
-
-        // Check that the containers can be run
-        // First pull the image from the registry, then tag so the image won't be overwritten
-        string imageX64Tagged = $"{registry}/test-image-{imageName}-x64";
+        
+        // First pull the image from the registry for each platform
         ContainerCli.PullCommand(
             _testOutput,
             "--platform",
             "linux/amd64",
-            $"{registry}/{imageIndex}")
+            imageFromRegistry)
             .Execute()
             .Should().Pass();
-        ContainerCli.TagCommand(
+        ContainerCli.PullCommand(
             _testOutput,
-            $"{registry}/{imageIndex}",
-            imageX64Tagged)
+            "--platform",
+            "linux/arm64",
+            imageFromRegistry)
             .Execute()
             .Should().Pass();
-        CommandResult processResultX64 = ContainerCli.RunCommand(
+
+        // Check that the containers can be run
+        ContainerCli.RunCommand(
             _testOutput,
             "--rm",
             "--platform",
             "linux/amd64",
             "--name",
             $"test-container-{imageName}-x64",
-            imageX64Tagged)
-        .Execute();
-        processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
-
-        string imageArm64Tagged = $"{registry}/test-image-{imageName}-arm64";
-        ContainerCli.PullCommand(
-            _testOutput,
-            "--platform",
-            "linux/arm64",
-            $"{registry}/{imageIndex}")
-            .Execute()
-            .Should().Pass();
-        ContainerCli.TagCommand(
-            _testOutput,
-            $"{registry}/{imageIndex}",
-            imageArm64Tagged)
-            .Execute()
-            .Should().Pass();
-        CommandResult processResultArm64 = ContainerCli.RunCommand(
+            imageFromRegistry)
+        .Execute().Should().Pass().And.HaveStdOut("Hello, World!");
+        ContainerCli.RunCommand(
             _testOutput,
             "--rm",
             "--platform",
             "linux/arm64",
             "--name",
             $"test-container-{imageName}-arm64",
-            imageArm64Tagged)
-        .Execute();
-        processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");
+            imageFromRegistry)
+        .Execute().Should().Pass().And.HaveStdOut("Hello, World!");
 
         // Cleanup
         newProjectDir.Delete(true);

From 929c2b327de5ddacc50c36dccd3375d7b445acc4 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 16:51:17 +0100
Subject: [PATCH 094/127] go back to running containers by image and not
 imageId for multi-arch tests

---
 .../ContainerCli.cs                           |  3 -
 .../EndToEndTests.cs                          | 62 ++++++-------------
 2 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
index 13aa9928633d..b69f070da2e2 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
@@ -36,9 +36,6 @@ public static RunExeCommand LoadCommand(ITestOutputHelper log, params string[] a
     public static RunExeCommand PortCommand(ITestOutputHelper log, string containerName, int port)
       => CreateCommand(log, "port", containerName, port.ToString());
 
-    public static RunExeCommand ImagesCommand(ITestOutputHelper log, params string[] args)
-      => CreateCommand(log, "images", args);
-
     private static RunExeCommand CreateCommand(ITestOutputHelper log, string command, params string[] args)
     {
         string commandPath = IsPodman ? "podman" : "docker";
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index ea6135c5bcbe..888d8f48cfc1 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -745,8 +745,7 @@ public void EndToEndMultiArch_LocalRegistry()
             .WithWorkingDirectory(newProjectDir.FullName)
             .Execute();
 
-        // Check that the app was published for each RID,
-        // one image was created locally
+        // Check that the app was published for each RID, one image was created locally
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
@@ -754,9 +753,6 @@ public void EndToEndMultiArch_LocalRegistry()
             .And.HaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-arm64'")
             .And.HaveStdOutContaining($"Pushed image '{image}' to local registry");
 
-        //Multi-arch oci tarballs that are loaded to docker can only be run by their image id
-        string imageId = GetImageId(image);
-
         // Check that the containers can be run
         CommandResult processResultX64 = ContainerCli.RunCommand(
             _testOutput,
@@ -765,7 +761,7 @@ public void EndToEndMultiArch_LocalRegistry()
             "linux/amd64",
             "--name",
             $"test-container-{imageName}-x64",
-            imageId)
+            image)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
 
@@ -776,7 +772,7 @@ public void EndToEndMultiArch_LocalRegistry()
             "linux/arm64",
             "--name",
             $"test-container-{imageName}-arm64",
-            imageId)
+            image)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");
 
@@ -784,19 +780,6 @@ public void EndToEndMultiArch_LocalRegistry()
         newProjectDir.Delete(true);
     }
 
-    private string GetImageId(string image)
-    {
-        CommandResult commandResult = ContainerCli.ImagesCommand(_testOutput, "--format", "\"{{.ID}}\"", image)
-            .Execute();
-        commandResult.Should().Pass();
-
-        var output = commandResult.StdOut.Split("\n").Select(s => s.Trim('"')).ToList();
-
-        output.Should().NotBeNullOrEmpty().And.OnlyContain(s => s == output[0]);
-
-        return output[0];
-    }
-
     [DockerAvailableFact]
     public void MultiArchStillAllowsSingleRID()
     {
@@ -948,8 +931,7 @@ public void EndToEndMultiArch_ArchivePublishing()
             .WithWorkingDirectory(newProjectDir.FullName)
             .Execute();
 
-        // Check that the app was published for each RID,
-        // one image was created in local archive
+        // Check that the app was published for each RID, one image was created in local archive
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
@@ -957,7 +939,7 @@ public void EndToEndMultiArch_ArchivePublishing()
             .And.HaveStdOutContaining($"Building image '{imageName}' for runtime identifier 'linux-arm64'")
             .And.HaveStdOutContaining($"Pushed image '{image}' to local archive at '{imageTarball}'");
 
-        // Check that tarballs were created
+        // Check that tarball were created
         File.Exists(imageTarball).Should().BeTrue();
 
         // Load the multi-arch image from the tarball
@@ -965,9 +947,6 @@ public void EndToEndMultiArch_ArchivePublishing()
            .Execute()
            .Should().Pass();
 
-        //Multi-arch oci tarballs that are loaded to docker can only be run by their image id
-        string imageId = GetImageId(image);
-
         // Check that the containers can be run
         CommandResult processResultX64 = ContainerCli.RunCommand(
             _testOutput,
@@ -976,7 +955,7 @@ public void EndToEndMultiArch_ArchivePublishing()
             "linux/amd64",
             "--name",
             $"test-container-{imageName}-x64",
-            imageId)
+            image)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
 
@@ -987,7 +966,7 @@ public void EndToEndMultiArch_ArchivePublishing()
             "linux/arm64",
             "--name",
             $"test-container-{imageName}-arm64",
-            imageId)
+            image)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");
 
@@ -1024,8 +1003,8 @@ public void EndToEndMultiArch_RemoteRegistry()
             .Execute();
 
         // Check that the app was published for each RID,
-        // images were created locally for each RID
-        // and image index was created
+        // images for each RID were pushed to remote registry
+        // and image index was pushed to remote registry
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
@@ -1033,6 +1012,7 @@ public void EndToEndMultiArch_RemoteRegistry()
             .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to registry '{registry}'.")
             .And.HaveStdOutContaining($"Pushed image index '{imageIndex}' to registry '{registry}'.");
         
+        // Check that the containers can be run
         // First pull the image from the registry for each platform
         ContainerCli.PullCommand(
             _testOutput,
@@ -1048,8 +1028,8 @@ public void EndToEndMultiArch_RemoteRegistry()
             imageFromRegistry)
             .Execute()
             .Should().Pass();
-
-        // Check that the containers can be run
+        
+        // Run the containers
         ContainerCli.RunCommand(
             _testOutput,
             "--rm",
@@ -1097,7 +1077,7 @@ public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentif
             .Execute();
 
         // Check that the app was published only for RID from ContainerRuntimeIdentifiers
-        // images were created locally only for RID for from ContainerRuntimeIdentifiers
+        // images were built only for RID for from ContainerRuntimeIdentifiers
         commandResult.Should().Pass()
             .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
@@ -1148,8 +1128,6 @@ public void EndToEndMultiArch_EnvVariables()
             .Execute()
             .Should().Pass();
 
-        string imageId = GetImageId(image);
-
         // Check that the env var is printed for linux/amd64 platform
         string containerNameX64 = $"test-container-{imageName}-x64";
         CommandResult processResultX64 = ContainerCli.RunCommand(
@@ -1159,7 +1137,7 @@ public void EndToEndMultiArch_EnvVariables()
             "linux/amd64",
             "--name",
             containerNameX64,
-            imageId)
+            image)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("FooBar");
 
@@ -1172,7 +1150,7 @@ public void EndToEndMultiArch_EnvVariables()
             "linux/arm64",
             "--name",
             containerNameArm64,
-            imageId)
+            image)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("FooBar");
 
@@ -1215,8 +1193,6 @@ public void EndToEndMultiArch_Ports()
             .Execute()
             .Should().Pass();
 
-        string imageId = GetImageId(image);
-
         // Check that the ports are correct for linux/amd64 platform
         var containerNameX64 = $"test-container-{imageName}-x64";
         CommandResult processResultX64 = ContainerCli.RunCommand(
@@ -1228,7 +1204,7 @@ public void EndToEndMultiArch_Ports()
             containerNameX64,
             "-P",
             "--detach",
-            imageId)
+            image)
         .Execute();
         processResultX64.Should().Pass();
 
@@ -1246,7 +1222,7 @@ public void EndToEndMultiArch_Ports()
             containerNameArm64,
             "-P",
             "--detach",
-            imageId)
+            image)
         .Execute();
         processResultArm64.Should().Pass();
 
@@ -1304,13 +1280,11 @@ public void EndToEndMultiArch_Labels()
             .Execute()
             .Should().Pass();
 
-        string imageId = GetImageId(image);
-
         // Check that labels are set
         CommandResult inspectResult = ContainerCli.InspectCommand(
             _testOutput,
             "--format={{json .Config.Labels}}",
-            imageId)
+            image)
         .Execute();
         inspectResult.Should().Pass();
         var labels = JsonSerializer.Deserialize<Dictionary<string, string>>(inspectResult.StdOut);

From e46389b934c41a357ca7f82f7446786b0b1b295e Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 18:01:17 +0100
Subject: [PATCH 095/127] implement skipping tests if containerd image store is
 not enabled

---
 .../LocalDaemons/DockerCli.cs                      |  2 +-
 .../ContainerCli.cs                                |  2 ++
 .../DockerSupportsArchFact.cs                      |  6 +++++-
 .../DockerSupportsArchInlineData.cs                |  2 ++
 .../EndToEndTests.cs                               | 14 +++++++-------
 .../DockerAvailableUtils.cs                        | 11 +++++++----
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 6b7471cafb76..12ac89441ea7 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -625,7 +625,7 @@ private static bool IsPodmanAlias()
         }
     }
 
-    private static bool IsContainerdStoreEnabledForDocker()
+    internal static bool IsContainerdStoreEnabledForDocker()
     {
         try
         {
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
index b69f070da2e2..690cb28fe1e3 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs
@@ -9,6 +9,8 @@ static class ContainerCli
 
     public static bool IsAvailable => _isAvailable.Value;
 
+    public static bool IsContainerdStoreEnabledForDocker => DockerCli.IsContainerdStoreEnabledForDocker();
+
     public static RunExeCommand PullCommand(ITestOutputHelper log, params string[] args)
       => CreateCommand(log, "pull", args);
 
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
index 36ad9fbc0c9a..ae0e76f3c153 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
@@ -5,12 +5,16 @@ namespace Microsoft.NET.Build.Containers.IntegrationTests;
 
 public class DockerIsAvailableAndSupportsArchFactAttribute : FactAttribute
 {
-    public DockerIsAvailableAndSupportsArchFactAttribute(string arch)
+    public DockerIsAvailableAndSupportsArchFactAttribute(string arch, bool checkContainerdStoreAvailability = false)
     {
         if (!DockerSupportsArchHelper.DaemonIsAvailable)
         {
             base.Skip = "Skipping test because Docker is not available on this host.";
         }
+        else if (checkContainerdStoreAvailability && !DockerSupportsArchHelper.IsContainerdStoreEnabledForDocker)
+        {
+            base.Skip = "Skipping test because Docker daemon is not using containerd as the storage driver.";
+        }
         else if (!DockerSupportsArchHelper.DaemonSupportsArch(arch))
         {
             base.Skip = $"Skipping test because Docker daemon does not support {arch}.";
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs
index caafbaea4b45..7944436b39c9 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs
@@ -36,6 +36,8 @@ internal static class DockerSupportsArchHelper
 {
     internal static bool DaemonIsAvailable => ContainerCli.IsAvailable;
 
+    internal static bool IsContainerdStoreEnabledForDocker => ContainerCli.IsContainerdStoreEnabledForDocker;
+
     internal static bool DaemonSupportsArch(string arch)
     {
         // an optimization - this doesn't change over time so we can compute it once
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 888d8f48cfc1..49b8ffec61f6 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -722,7 +722,7 @@ public void EndToEnd_SingleArch_NoRid()
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_LocalRegistry()
     {
         string imageName = NewImageName();
@@ -905,7 +905,7 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
     private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
         => Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_ArchivePublishing()
     {
         string imageName = NewImageName();
@@ -974,7 +974,7 @@ public void EndToEndMultiArch_ArchivePublishing()
         newProjectDir.Delete(true);
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_RemoteRegistry()
     {
         string imageName = NewImageName();
@@ -1053,7 +1053,7 @@ public void EndToEndMultiArch_RemoteRegistry()
         newProjectDir.Delete(true);
     }
 
-    [DockerAvailableFact]
+    [DockerAvailableFact(checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentifiers()
     {
         // Create a new console project
@@ -1088,7 +1088,7 @@ public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentif
         newProjectDir.Delete(true);
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_EnvVariables()
     {
         string imageName = NewImageName();
@@ -1158,7 +1158,7 @@ public void EndToEndMultiArch_EnvVariables()
         newProjectDir.Delete(true);
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_Ports()
     {
         string imageName = NewImageName();
@@ -1256,7 +1256,7 @@ private void CheckPorts(string containerName, int[] correctPorts, int[] incorrec
         }
     }
 
-    [DockerAvailableFact]
+    [DockerAvailableFact(checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_Labels()
     {
         string imageName = NewImageName();
diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs
index 74184ec675b1..61c5f2dde3bf 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs
@@ -25,17 +25,20 @@ public class DockerAvailableFactAttribute : FactAttribute
 {
     public static string LocalRegistry => DockerCliStatus.LocalRegistry;
 
-    public DockerAvailableFactAttribute(bool skipPodman = false)
+    public DockerAvailableFactAttribute(bool skipPodman = false, bool checkContainerdStoreAvailability = false)
     {
         if (!DockerCliStatus.IsAvailable)
         {
             base.Skip = "Skipping test because Docker is not available on this host.";
         }
-
-        if (skipPodman && DockerCliStatus.Command == DockerCli.PodmanCommand)
+        else if (checkContainerdStoreAvailability && !DockerCli.IsContainerdStoreEnabledForDocker())
         {
-            base.Skip = $"Skipping test with {DockerCliStatus.Command} cli.";
+            base.Skip = "Skipping test because Docker daemon is not using containerd as the storage driver.";
         }
+        else if (skipPodman && DockerCliStatus.Command == DockerCli.PodmanCommand)
+        {
+            base.Skip = $"Skipping test with {DockerCliStatus.Command} cli.";
+        }      
     }
 }
 

From 299e6d107182a4b63761220de8d0dda4dc0a1541 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 18:19:27 +0100
Subject: [PATCH 096/127] remove using

---
 .../EndToEndTests.cs                                             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 49b8ffec61f6..ccef1a3b41c4 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -4,7 +4,6 @@
 using System.Formats.Tar;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
-using Microsoft.Build.Logging;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.NET.Build.Containers.LocalDaemons;
 using Microsoft.NET.Build.Containers.Resources;

From 674ee0ef816f9234760d03b60050abc3f041f909 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 21:34:46 +0100
Subject: [PATCH 097/127] refactor to bring back GeneratedImageIndex; fix
 ImageIndexGeneratorTests

---
 .../ImageIndexGenerator.cs                    |  5 +++
 .../ImagePublisher.cs                         | 13 ++-----
 .../LocalDaemons/ArchiveFileRegistry.cs       |  4 +--
 .../LocalDaemons/DockerCli.cs                 | 23 ++++++------
 .../LocalDaemons/ILocalRegistry.cs            |  2 +-
 .../MultiArchImage.cs                         | 16 +++++++++
 .../PublicAPI/net8.0/PublicAPI.Unshipped.txt  |  2 ++
 .../Registry/Registry.cs                      | 10 ++++--
 .../Tasks/CreateImageIndex.Interface.cs       | 10 ++++++
 .../Tasks/CreateImageIndex.cs                 | 36 ++++++++++++++++---
 .../Microsoft.NET.Build.Containers.targets    |  5 ++-
 .../CreateImageIndexTests.cs                  | 13 +++++++
 .../ImageIndexGeneratorTests.cs               |  6 ++--
 13 files changed, 107 insertions(+), 38 deletions(-)
 create mode 100644 src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index 8abbe315d0c8..d2bc53a5900d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -47,6 +47,11 @@ internal static (string, string) GenerateImageIndex(BuiltImage[] images)
 
     internal static string GenerateImageIndex(BuiltImage[] images, string manifestMediaType, string imageIndexMediaType)
     {
+        if (images.Length == 0)
+        {
+            throw new ArgumentException(string.Format(Strings.ImagesEmpty));
+        }
+        
         // Here we are using ManifestListV2 struct, but we could use ImageIndexV1 struct as well.
         // We are filling the same fields, so we can use the same struct.
         var manifests = new PlatformSpecificManifest[images.Length];
diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index bc3e330441af..8dc164f41f49 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -51,7 +51,7 @@ await PushToRemoteRegistryAsync(
     }
 
     public static async Task PublishImageAsync(
-        BuiltImage[] multiArchImage,
+        MultiArchImage multiArchImage,
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
@@ -82,16 +82,7 @@ await PushToRemoteRegistryAsync(
                     Log,
                     BuildEngine,
                     cancellationToken,
-                    async (images, source, destination, token) =>
-                    {
-                        (string imageIndex, string mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
-                        await destinationImageReference.RemoteRegistry!.PushManifestListAsync(
-                            destinationImageReference.Repository,
-                            destinationImageReference.Tags,
-                            imageIndex,
-                            mediaType,
-                            cancellationToken).ConfigureAwait(false);
-                    },
+                    destinationImageReference.RemoteRegistry!.PushManifestListAsync,
                     Strings.ImageIndexUploadedToRegistry).ConfigureAwait(false);
                 break;
             default:
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
index 5af3edd5a546..c23e22d8b9aa 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
@@ -46,10 +46,10 @@ public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReferen
         => await LoadAsync(image, sourceReference, destinationReference, cancellationToken,
             DockerCli.WriteImageToStreamAsync);
 
-    public async Task LoadAsync(BuiltImage[] images, SourceImageReference sourceReference,
+    public async Task LoadAsync(MultiArchImage multiArchImage, SourceImageReference sourceReference,
         DestinationImageReference destinationReference,
         CancellationToken cancellationToken) 
-        => await LoadAsync(images, sourceReference, destinationReference, cancellationToken,
+        => await LoadAsync(multiArchImage, sourceReference, destinationReference, cancellationToken,
             DockerCli.WriteMultiArchOciImageToStreamAsync);
 
     public Task<bool> IsAvailableAsync(CancellationToken cancellationToken) => Task.FromResult(true);
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index 12ac89441ea7..d5b8fb2b3c5f 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -130,8 +130,8 @@ public async Task LoadAsync(BuiltImage image, SourceImageReference sourceReferen
         // For loading to the local registry, we use the Docker format. Two reasons: one - compatibility with previous behavior before oci formatted publishing was available, two - Podman cannot load multi tag oci image tarball.
         => await LoadAsync(image, sourceReference, destinationReference, WriteDockerImageToStreamAsync, cancellationToken);
 
-    public async Task LoadAsync(BuiltImage[] images, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken) 
-        => await LoadAsync(images, sourceReference, destinationReference, WriteMultiArchOciImageToStreamAsync, cancellationToken, checkContainerdStore: true);
+    public async Task LoadAsync(MultiArchImage multiArchImage, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken) 
+        => await LoadAsync(multiArchImage, sourceReference, destinationReference, WriteMultiArchOciImageToStreamAsync, cancellationToken, checkContainerdStore: true);
     
     public async Task<bool> IsAvailableAsync(CancellationToken cancellationToken)
     {
@@ -500,7 +500,7 @@ await WriteManifestForOciImage(writer, image, cancellationToken)
     }
 
     public static async Task WriteMultiArchOciImageToStreamAsync(
-        BuiltImage[] images,
+        MultiArchImage multiArchImage,
         SourceImageReference sourceReference,
         DestinationImageReference destinationReference,
         Stream imageStream,
@@ -510,13 +510,13 @@ public static async Task WriteMultiArchOciImageToStreamAsync(
 
         using TarWriter writer = new(imageStream, TarEntryFormat.Pax, leaveOpen: true);
 
-        foreach (var image in images)
+        foreach (var image in multiArchImage.Images!)
         {
             await WriteOciImageToBlobs(writer, image, sourceReference, cancellationToken)
             .ConfigureAwait(false);
         }
 
-        await WriteIndexJsonForMultiArchOciImage(writer, images, destinationReference, cancellationToken)
+        await WriteIndexJsonForMultiArchOciImage(writer, multiArchImage, destinationReference, cancellationToken)
             .ConfigureAwait(false);
 
         await WriteOciLayout(writer, cancellationToken)
@@ -525,21 +525,18 @@ await WriteOciLayout(writer, cancellationToken)
 
     private static async Task WriteIndexJsonForMultiArchOciImage(
         TarWriter writer,
-        BuiltImage[] images,
+        MultiArchImage multiArchImage,
         DestinationImageReference destinationReference,
         CancellationToken cancellationToken)
     {
         // 1. create manifest list for the blobs
         cancellationToken.ThrowIfCancellationRequested();
 
-        // For multi-arch we publish only oci-formatted image tarballs.
-        string manifestListJson = ImageIndexGenerator.GenerateImageIndex(images, SchemaTypes.OciManifestV1, SchemaTypes.OciImageIndexV1);
-
-        var manifestListDigest = DigestUtils.GetDigest(manifestListJson);
+        var manifestListDigest = DigestUtils.GetDigest(multiArchImage.ImageIndex);
         var manifestListSha = DigestUtils.GetShaFromDigest(manifestListDigest);
         var manifestListPath = $"{_blobsPath}/{manifestListSha}";
         
-        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(manifestListJson)))
+        using (MemoryStream indexStream = new(Encoding.UTF8.GetBytes(multiArchImage.ImageIndex)))
         {
             PaxTarEntry indexEntry = new(TarEntryType.RegularFile, manifestListPath)
             {
@@ -552,9 +549,9 @@ private static async Task WriteIndexJsonForMultiArchOciImage(
         cancellationToken.ThrowIfCancellationRequested();
 
         string indexJson = ImageIndexGenerator.GenerateImageIndexWithAnnotations(
-            SchemaTypes.OciImageIndexV1, 
+            multiArchImage.ImageIndexMediaType, 
             manifestListDigest, 
-            manifestListJson.Length, 
+            multiArchImage.ImageIndex.Length, 
             destinationReference.Repository, 
             destinationReference.Tags);
 
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ILocalRegistry.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ILocalRegistry.cs
index 34ccb13d093d..c4ee04a7f5d6 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ILocalRegistry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ILocalRegistry.cs
@@ -16,7 +16,7 @@ internal interface ILocalRegistry {
     /// <summary>
     /// Loads a multi-arch image (presumably from a tarball) into the local registry.
     /// </summary>
-    public Task LoadAsync(BuiltImage[] images, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken);
+    public Task LoadAsync(MultiArchImage multiArchImage, SourceImageReference sourceReference, DestinationImageReference destinationReference, CancellationToken cancellationToken);
 
     /// <summary>
     /// Checks to see if the local registry is available. This is used to give nice errors to the user.
diff --git a/src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs b/src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs
new file mode 100644
index 000000000000..2e671b186d9e
--- /dev/null
+++ b/src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.NET.Build.Containers;
+
+/// <summary>
+/// Represents constructed image ready for further processing.
+/// </summary>
+internal sealed class MultiArchImage
+{
+    internal required string ImageIndex { get; init; }
+
+    internal required string ImageIndexMediaType { get; init; }
+
+    internal BuiltImage[]? Images { get; init; }
+}
\ No newline at end of file
diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
index e5efa4bed6c1..5c07a3871ceb 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
+++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -34,6 +34,8 @@ Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedArchiveOutputPath
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.Cancel() -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.CreateImageIndex() -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.Dispose() -> void
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedImageIndex.get -> string!
+Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedImageIndex.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.ImageTags.get -> string![]!
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.ImageTags.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateImageIndex.GeneratedContainers.get -> Microsoft.Build.Framework.ITaskItem![]!
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
index 2e754986334a..87671575f34a 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
@@ -525,13 +525,17 @@ private async Task UploadBlobAsync(string repository, string digest, Stream cont
 
     }
 
-    public async Task PushManifestListAsync(string repositoryName, string[] tags, string manifestListJson, string mediaType, CancellationToken cancellationToken)
+    public async Task PushManifestListAsync(
+        MultiArchImage multiArchImage,
+        SourceImageReference sourceImageReference,
+        DestinationImageReference destinationImageReference,
+        CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
-        foreach (var tag in tags)
+        foreach (var tag in destinationImageReference.Tags)
         {
             _logger.LogInformation(Strings.Registry_TagUploadStarted, tag, RegistryName);
-            await _registryAPI.Manifest.PutAsync(repositoryName, tag, manifestListJson, mediaType, cancellationToken).ConfigureAwait(false);
+            await _registryAPI.Manifest.PutAsync(destinationImageReference.Repository, tag, multiArchImage.ImageIndex, multiArchImage.ImageIndexMediaType, cancellationToken).ConfigureAwait(false);
             _logger.LogInformation(Strings.Registry_TagUploaded, tag, RegistryName);
         }          
     }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
index 128657b0a897..2751eb5ebbc3 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
@@ -61,9 +61,18 @@ partial class CreateImageIndex
     [Required]
     public string[] ImageTags { get; set; }
 
+    /// <summary>
+    /// The generated archive output path.
+    /// </summary>
     [Output]
     public string GeneratedArchiveOutputPath { get; set; }
 
+    /// <summary>
+    /// The generated image index (manifest list) in JSON format.
+    /// </summary>
+    [Output]
+    public string GeneratedImageIndex { get; set; }
+
     public CreateImageIndex()
     {
         BaseRegistry = string.Empty;
@@ -76,5 +85,6 @@ public CreateImageIndex()
         Repository = string.Empty;
         ImageTags = Array.Empty<string>();
         GeneratedArchiveOutputPath = string.Empty;
+        GeneratedImageIndex = string.Empty;
     }
 } 
\ No newline at end of file
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index d56ae92d9b62..65443e816fd6 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -74,14 +74,17 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             return false;
         }
 
+        var multiArchImage = CreateMultiArchImage(images, destinationImageReference.Kind);
+
+        GeneratedImageIndex = multiArchImage.ImageIndex;
+        GeneratedArchiveOutputPath = ArchiveOutputPath;
+
         logger.LogInformation(Strings.BuildingImageIndex, destinationImageReference, string.Join(", ", images.Select(i => i.ManifestDigest)));
 
         var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
-        await ImagePublisher.PublishImageAsync(images, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
-            .ConfigureAwait(false);
-
-        GeneratedArchiveOutputPath = ArchiveOutputPath;
+        await ImagePublisher.PublishImageAsync(multiArchImage, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
+            .ConfigureAwait(false); 
 
         return !Log.HasLoggedErrors;
     }
@@ -157,4 +160,29 @@ private BuiltImage[] ParseImages(DestinationImageReferenceKind destinationKind)
         }
         return (architecture, os);
     }
+
+    private static MultiArchImage CreateMultiArchImage(BuiltImage[] images, DestinationImageReferenceKind destinationImageKind)
+    {
+        switch (destinationImageKind)
+        {
+            case DestinationImageReferenceKind.LocalRegistry:
+                return new MultiArchImage()
+                {
+                    // For multi-arch we publish only oci-formatted image tarballs.
+                    ImageIndex = ImageIndexGenerator.GenerateImageIndex(images, SchemaTypes.OciManifestV1, SchemaTypes.OciImageIndexV1),
+                    ImageIndexMediaType = SchemaTypes.OciImageIndexV1,
+                    Images = images
+                };
+            case DestinationImageReferenceKind.RemoteRegistry:
+                (string imageIndex, string mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
+                return new MultiArchImage()
+                {
+                    ImageIndex = imageIndex,
+                    ImageIndexMediaType = mediaType,
+                    // For remote registry we don't need individual images, as they should be pushed already
+                };
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
 }
diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 51b28a1db5f6..d7cf4bc5ecbf 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -357,7 +357,10 @@
                       ImageTags="@(ContainerImageTags)"
                       BaseRegistry="$(ContainerBaseRegistry)"
                       BaseImageName="$(ContainerBaseName)"
-                      BaseImageTag="$(ContainerBaseTag)" />
+                      BaseImageTag="$(ContainerBaseTag)">
+      <Output TaskParameter="GeneratedImageIndex" PropertyName="GeneratedImageIndex" />
+      <Output TaskParameter="GeneratedArchiveOutputPath" PropertyName="GeneratedArchiveOutputPath" />
+    </CreateImageIndex>
   </Target>
 
   <Target Name="_ParseItemsForPublishingSingleContainer">
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
index 24703040cda6..2615b2e178ee 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs
@@ -44,6 +44,19 @@ public async Task CreateImageIndex_Baseline()
         cii.GeneratedContainers = [image1, image2];
         Assert.True(cii.Execute(), FormatBuildMessages(errors));
 
+        // Assert that the image index is created correctly
+        cii.GeneratedImageIndex.Should().NotBeNullOrEmpty();
+        var imageIndex = cii.GeneratedImageIndex.FromJson<ManifestListV2>();
+        imageIndex.manifests.Should().HaveCount(2);
+
+        imageIndex.manifests[0].digest.Should().Be(image1.GetMetadata("ManifestDigest"));
+        imageIndex.manifests[0].platform.os.Should().Be("linux");
+        imageIndex.manifests[0].platform.architecture.Should().Be("amd64");
+
+        imageIndex.manifests[1].digest.Should().Be(image2.GetMetadata("ManifestDigest"));
+        imageIndex.manifests[1].platform.os.Should().Be("linux");
+        imageIndex.manifests[1].platform.architecture.Should().Be("arm64");
+
         // Assert that the image index is pushed to the registry
         var loggerFactory = new TestLoggerFactory(_testOutput);
         var logger = loggerFactory.CreateLogger(nameof(CreateImageIndex_Baseline));
diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
index f89d2601b9b8..6b87a502d6a6 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
@@ -104,7 +104,7 @@ public void GenerateDockerManifestList()
         ];
 
         var (imageIndex, mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
-        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.docker.distribution.manifest.list.v2\\u002Bjson\",\"manifests\":[{\"mediaType\":\"application/vnd.docker.distribution.manifest.v2\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\"}},{\"mediaType\":\"application/vnd.docker.distribution.manifest.v2\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\"}}]}", imageIndex);
+        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.docker.distribution.manifest.list.v2+json\",\"manifests\":[{\"mediaType\":\"application/vnd.docker.distribution.manifest.v2+json\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\"}},{\"mediaType\":\"application/vnd.docker.distribution.manifest.v2+json\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\"}}]}", imageIndex);
         Assert.Equal(SchemaTypes.DockerManifestListV2, mediaType);
     }
 
@@ -138,7 +138,7 @@ public void GenerateOciImageIndex()
         ];
 
         var (imageIndex, mediaType) = ImageIndexGenerator.GenerateImageIndex(images);
-        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1\\u002Bjson\",\"manifests\":[{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\"}},{\"mediaType\":\"application/vnd.oci.image.manifest.v1\\u002Bjson\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\"}}]}", imageIndex);
+        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1+json\",\"manifests\":[{\"mediaType\":\"application/vnd.oci.image.manifest.v1+json\",\"size\":3,\"digest\":\"sha256:digest1\",\"platform\":{\"architecture\":\"arch1\",\"os\":\"os1\"}},{\"mediaType\":\"application/vnd.oci.image.manifest.v1+json\",\"size\":3,\"digest\":\"sha256:digest2\",\"platform\":{\"architecture\":\"arch2\",\"os\":\"os2\"}}]}", imageIndex);
         Assert.Equal(SchemaTypes.OciImageIndexV1, mediaType);
     }
 
@@ -146,6 +146,6 @@ public void GenerateOciImageIndex()
     public void GenerateImageIndexWithAnnotations()
     {
         string imageIndex = ImageIndexGenerator.GenerateImageIndexWithAnnotations("mediaType", "sha256:digest", 3, "repository", ["1.0", "2.0"]);
-        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1\\u002Bjson\",\"manifests\":[{\"mediaType\":\"mediaType\",\"size\":3,\"digest\":\"sha256:digest\",\"platform\":{},\"annotations\":{\"io.containerd.image.name\":\"repository:1.0\",\"org.opencontainers.image.ref.name\":\"1.0\"}},{\"mediaType\":\"mediaType\",\"size\":3,\"digest\":\"sha256:digest\",\"platform\":{},\"annotations\":{\"io.containerd.image.name\":\"repository:2.0\",\"org.opencontainers.image.ref.name\":\"2.0\"}}]}", imageIndex);
+        Assert.Equal("{\"schemaVersion\":2,\"mediaType\":\"application/vnd.oci.image.index.v1+json\",\"manifests\":[{\"mediaType\":\"mediaType\",\"size\":3,\"digest\":\"sha256:digest\",\"platform\":{},\"annotations\":{\"io.containerd.image.name\":\"docker.io/library/repository:1.0\",\"org.opencontainers.image.ref.name\":\"1.0\"}},{\"mediaType\":\"mediaType\",\"size\":3,\"digest\":\"sha256:digest\",\"platform\":{},\"annotations\":{\"io.containerd.image.name\":\"docker.io/library/repository:2.0\",\"org.opencontainers.image.ref.name\":\"2.0\"}}]}", imageIndex);
     }
 }

From adaffdd48928a927d3cf8cb2bdb7a381cf34c67b Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Wed, 5 Feb 2025 21:36:58 +0100
Subject: [PATCH 098/127] small fix

---
 .../Microsoft.NET.Build.Containers/ImageIndexGenerator.cs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index d2bc53a5900d..ce6d91c1edbf 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -21,7 +21,7 @@ internal static (string, string) GenerateImageIndex(BuiltImage[] images)
     {
         if (images.Length == 0)
         {
-            throw new ArgumentException(string.Format(Strings.ImagesEmpty));
+            throw new ArgumentException(Strings.ImagesEmpty);
         }
 
         string manifestMediaType = images[0].ManifestMediaType;
@@ -49,9 +49,9 @@ internal static string GenerateImageIndex(BuiltImage[] images, string manifestMe
     {
         if (images.Length == 0)
         {
-            throw new ArgumentException(string.Format(Strings.ImagesEmpty));
+            throw new ArgumentException(Strings.ImagesEmpty);
         }
-        
+
         // Here we are using ManifestListV2 struct, but we could use ImageIndexV1 struct as well.
         // We are filling the same fields, so we can use the same struct.
         var manifests = new PlatformSpecificManifest[images.Length];

From 9cbb0d638c4362d0dfa88617abfaf7dcfb2a1a76 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 05:01:55 +0000
Subject: [PATCH 099/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250205.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25103.4 -> To Version 8.0.0-beta.25105.2
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ef34312ab8f8..a2378842110e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 51170146c5ab..280bbbf8d240 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25103.4</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25105.2</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25103.4</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25105.2</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index e48e07bb4359..2822f1b3cfa8 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25103.4"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2"
   }
 }

From 051201809d5250b3eefd8a472363cb570ece80fb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 05:02:14 +0000
Subject: [PATCH 100/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250205.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25066.6 -> To Version 8.0.0-beta.25105.2
---
 NuGet.config            |  9 ---------
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 7c8c159d1ed3..085a142ed279 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,15 +37,6 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-ee4a55e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-ee4a55e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-ee4a55e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-ee4a55e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-ee4a55e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-6ede63a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6ede63a6/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8ae04a1fbcb9..3c9a684fadb6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3201845e0c1b..a3545a05e0a9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25103.4</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25105.2</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25103.4</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25105.2</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index e48e07bb4359..2822f1b3cfa8 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25103.4"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2"
   }
 }

From c6c0826a8a755d86e825f5336efdcd32d7fda3a4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 05:02:16 +0000
Subject: [PATCH 101/127] Update dependencies from
 https://github.com/dotnet/templating build 20250205.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.406-servicing.25066.12 -> To Version 8.0.407-servicing.25105.2
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 71e8d20ed936..d397f5b4bfba 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,7 +37,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-43dbf47" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-43dbf476/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cbbf1c10d46e..7fb7e371f2b5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.406">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.407">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
+      <Sha>43dbf476bd7c34c753d5cb5520c09e56947b49be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.406-servicing.25066.12">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.407-servicing.25105.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
+      <Sha>43dbf476bd7c34c753d5cb5520c09e56947b49be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.406-servicing.25066.12">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.407-servicing.25105.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>40256cc3ba6c47902104c959770822e91642f4a7</Sha>
+      <Sha>43dbf476bd7c34c753d5cb5520c09e56947b49be</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index 757009a7cbc1..87334e56b414 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -141,13 +141,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/templating -->
-    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.406</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.407</MicrosoftTemplateEngineAbstractionsPackageVersion>
     <MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
     <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.406-servicing.25066.12</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.407-servicing.25105.2</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From b1cdb5637fa31b0d89c6ee75e021ef52275d43da Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 05:02:32 +0000
Subject: [PATCH 102/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250205.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25066.6 -> To Version 8.0.0-beta.25105.2
---
 NuGet.config            |  9 ---------
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f4081e60d82a..71e8d20ed936 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,15 +37,6 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 93b45ef7f977..d82de8407eed 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25103.4">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25105.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>6418c9dcdccd29557cffca895f2309b810d45f15</Sha>
+      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 14c9b1f76407..8edddc04a99c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25103.4</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25105.2</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25103.4</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25105.2</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index e48e07bb4359..2822f1b3cfa8 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25103.4"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2"
   }
 }

From 0b14d73dc899d8255aaab688edd76d913c5c3668 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 09:27:08 +0000
Subject: [PATCH 103/127] Update dependencies from
 https://github.com/dotnet/templating build 20250205.10

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25066.8 -> To Version 8.0.114-servicing.25105.10
---
 NuGet.config            | 11 +----------
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 2039bf5fca31..f6258642d5c1 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -36,16 +36,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-67efdba" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-67efdba8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-335a66e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-47dd928" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-47dd9288/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3b6ac550d679..fa2ef9512ac7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.114">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>67efdba8442b2171476bf0b2225b95b5813c2efd</Sha>
+      <Sha>47dd92889cc7783ecc6683a8cb447b02a751870b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25104.16">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25105.10">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>67efdba8442b2171476bf0b2225b95b5813c2efd</Sha>
+      <Sha>47dd92889cc7783ecc6683a8cb447b02a751870b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25104.16">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25105.10">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>67efdba8442b2171476bf0b2225b95b5813c2efd</Sha>
+      <Sha>47dd92889cc7783ecc6683a8cb447b02a751870b</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index ce8ed09ada72..83eea550b186 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25104.16</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25105.10</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 3285270e2870a1a0025b9530bb669abb6ba74a9e Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Thu, 6 Feb 2025 15:47:25 +0100
Subject: [PATCH 104/127] make BuiltImage and MultiArchImage readonly structs

---
 src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs     | 2 +-
 src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
index bd31ccc8cbf5..fd14bce11c58 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
@@ -6,7 +6,7 @@ namespace Microsoft.NET.Build.Containers;
 /// <summary>
 /// Represents constructed image ready for further processing.
 /// </summary>
-internal sealed class BuiltImage
+internal readonly struct BuiltImage
 {
     /// <summary>
     /// Gets image configuration in JSON format.
diff --git a/src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs b/src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs
index 2e671b186d9e..b24fbf65e87f 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/MultiArchImage.cs
@@ -6,7 +6,7 @@ namespace Microsoft.NET.Build.Containers;
 /// <summary>
 /// Represents constructed image ready for further processing.
 /// </summary>
-internal sealed class MultiArchImage
+internal readonly struct MultiArchImage
 {
     internal required string ImageIndex { get; init; }
 

From 9cea231503a99fddc5eacacca09ec102d0260690 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Thu, 6 Feb 2025 21:00:16 +0100
Subject: [PATCH 105/127] if ArchiveOutputPath does't have file extension then
 treat it as directory; add ArchiveFileRegistryTests

---
 .../LocalDaemons/ArchiveFileRegistry.cs       | 12 ++-
 .../ArchiveFileRegistryTests.cs               | 73 +++++++++++++++++++
 2 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ArchiveFileRegistryTests.cs

diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
index c23e22d8b9aa..86c170fcb1f9 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
@@ -14,14 +14,22 @@ public ArchiveFileRegistry(string archiveOutputPath)
         ArchiveOutputPath = archiveOutputPath;
     }
 
-    private async Task LoadAsync<T>(T image, SourceImageReference sourceReference, 
+    internal async Task LoadAsync<T>(T image, SourceImageReference sourceReference, 
         DestinationImageReference destinationReference, CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, Stream, CancellationToken, Task> writeStreamFunc)
     {
         var fullPath = Path.GetFullPath(ArchiveOutputPath);
 
+        var directorySeparatorChar = Path.DirectorySeparatorChar;
+
+        // if doesn't end with a file extension, assume it's a directory
+        if (!fullPath.Split(directorySeparatorChar).Last().Contains('.'))
+        {
+           fullPath += Path.DirectorySeparatorChar;
+        }
+
         // pointing to a directory? -> append default name
-        if (Directory.Exists(fullPath) || ArchiveOutputPath.EndsWith("/") || ArchiveOutputPath.EndsWith("\\"))
+        if (fullPath.EndsWith(directorySeparatorChar))
         {
             fullPath = Path.Combine(fullPath, destinationReference.Repository + ".tar.gz");
         }
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ArchiveFileRegistryTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ArchiveFileRegistryTests.cs
new file mode 100644
index 000000000000..e5bfc54711d0
--- /dev/null
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ArchiveFileRegistryTests.cs
@@ -0,0 +1,73 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.NET.Build.Containers.LocalDaemons;
+
+namespace Microsoft.NET.Build.Containers.IntegrationTests;
+
+public class ArchiveFileRegistryTests
+{
+    [Fact]
+    public async Task ArchiveOutputPathIsExistingDirectory_CreatesFileWithRepositoryNameAndTarGz()
+    {
+        string archiveOutputPath = TestSettings.TestArtifactsDirectory;
+        string expectedCreatedFilePath = Path.Combine(TestSettings.TestArtifactsDirectory, "repository.tar.gz");
+
+        await CreateRegistryAndCallLoadAsync(archiveOutputPath).ConfigureAwait(false);
+        
+        Assert.True(File.Exists(expectedCreatedFilePath));    
+    }  
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task ArchiveOutputPathIsNonExistingDirectory_CreatesDirectoryAndFileWithRepositoryNameAndTarGz(bool includeDirectorySeperatorAtTheEnd)
+    {
+        string archiveOutputPath = Path.Combine(
+            TestSettings.TestArtifactsDirectory,
+             "nonexisting" + (includeDirectorySeperatorAtTheEnd ? Path.DirectorySeparatorChar : ""));
+        string expectedCreatedFilePath = Path.Combine(archiveOutputPath, "repository.tar.gz");
+
+        await CreateRegistryAndCallLoadAsync(archiveOutputPath).ConfigureAwait(false);
+        
+        Assert.True(File.Exists(expectedCreatedFilePath));    
+    }
+
+    [Fact]
+    public async Task ArchiveOutputPathIsCustomFileNameInExistingDirectory_CreatesFileWithThatName()
+    {
+        string archiveOutputPath = Path.Combine(TestSettings.TestArtifactsDirectory, "custom-name.withextension");
+        string expectedCreatedFilePath = archiveOutputPath;
+
+        await CreateRegistryAndCallLoadAsync(archiveOutputPath).ConfigureAwait(false);
+        
+        Assert.True(File.Exists(expectedCreatedFilePath));    
+    }
+
+    [Fact]
+    public async Task ArchiveOutputPathIsCustomFileNameInNonExistingDirectory_CreatesDirectoryAndFileWithThatName()
+    {
+        string archiveOutputPath = Path.Combine(TestSettings.TestArtifactsDirectory, $"nonexisting-directory{Path.AltDirectorySeparatorChar}custom-name.withextension");
+        string expectedCreatedFilePath = archiveOutputPath;
+
+        await CreateRegistryAndCallLoadAsync(archiveOutputPath).ConfigureAwait(false);
+        
+        Assert.True(File.Exists(expectedCreatedFilePath));    
+    }
+
+    private async Task CreateRegistryAndCallLoadAsync(string archiveOutputPath)
+    {
+        var registry = new ArchiveFileRegistry(archiveOutputPath);
+        var destinationImageReference = new DestinationImageReference(registry, "repository", ["tag"]);
+
+        await registry.LoadAsync(
+            "test image",
+            new SourceImageReference(),
+            destinationImageReference,
+            CancellationToken.None,
+            async (img, srcRef, destRef, stream, token) =>
+            {
+                await Task.CompletedTask;
+            }).ConfigureAwait(false);
+    }
+}
\ No newline at end of file

From d9985105ecd7f4730bbcc6a921269a17f88ea06a Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Thu, 6 Feb 2025 21:09:17 +0100
Subject: [PATCH 106/127] trim BaseRegistry before checking null or empty

---
 .../Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs    | 2 +-
 .../Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 65443e816fd6..6382a642cc1b 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -23,7 +23,7 @@ public void Dispose()
         _cancellationTokenSource.Dispose();
     }
 
-    private bool IsLocalPull => string.IsNullOrEmpty(BaseRegistry);
+    private bool IsLocalPull => string.IsNullOrEmpty(BaseRegistry.Trim());
 
     public override bool Execute()
     {
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index 997ca7b74973..a5e98431d802 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -23,7 +23,7 @@ public sealed partial class CreateNewImage : Microsoft.Build.Utilities.Task, ICa
     /// </summary>
     public string ToolPath { get; set; }
 
-    private bool IsLocalPull => string.IsNullOrEmpty(BaseRegistry);
+    private bool IsLocalPull => string.IsNullOrEmpty(BaseRegistry.Trim());
 
     public void Cancel() => _cancellationTokenSource.Cancel();
 

From 5094a413f5ea7e1dc5db83ab73cb495fcb6fb2d7 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Thu, 6 Feb 2025 21:25:40 +0100
Subject: [PATCH 107/127] BaseRegistry shouldn't be required parameter

---
 .../Tasks/CreateImageIndex.Interface.cs                          | 1 -
 .../Tasks/CreateNewImage.Interface.cs                            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
index 2751eb5ebbc3..6e64ede53469 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
@@ -11,7 +11,6 @@ partial class CreateImageIndex
     /// The base registry to pull from.
     /// Ex: mcr.microsoft.com
     /// </summary>
-    [Required]
     public string BaseRegistry { get; set; }
 
     /// <summary>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
index 5e9c01de4e45..b23a8482f3cf 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
@@ -20,7 +20,6 @@ partial class CreateNewImage
     /// The base registry to pull from.
     /// Ex: mcr.microsoft.com
     /// </summary>
-    [Required]
     public string BaseRegistry { get; set; }
 
     /// <summary>

From b9a63cad3ad0b63db2170f1d1e883b8b0eb978e4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 7 Feb 2025 05:01:50 +0000
Subject: [PATCH 108/127] Update dependencies from
 https://github.com/dotnet/templating build 20250205.9

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.406-servicing.25066.12 -> To Version 8.0.407-servicing.25105.9
---
 NuGet.config            | 11 +----------
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 737ba553a018..4a316fe10e42 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -37,16 +37,7 @@
     <add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-43dbf47" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-43dbf476/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ce2f1aafa3f4..ed9f2abd0c35 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.407">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>43dbf476bd7c34c753d5cb5520c09e56947b49be</Sha>
+      <Sha>5d99405601e2672cd496087efc51611f1fc0d860</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.407-servicing.25105.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.407-servicing.25105.9">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>43dbf476bd7c34c753d5cb5520c09e56947b49be</Sha>
+      <Sha>5d99405601e2672cd496087efc51611f1fc0d860</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.407-servicing.25105.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.407-servicing.25105.9">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>43dbf476bd7c34c753d5cb5520c09e56947b49be</Sha>
+      <Sha>5d99405601e2672cd496087efc51611f1fc0d860</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.12">
diff --git a/eng/Versions.props b/eng/Versions.props
index 5da129246917..2ee109077d54 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.407-servicing.25105.2</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.407-servicing.25105.9</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From f2a5bc83beb4a771705cf2613b521c81f725a0bc Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Fri, 7 Feb 2025 18:35:42 -0800
Subject: [PATCH 109/127] Fix
 NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled Test

---
 .../GivenThatWeWantToPublishAnAotApp.cs       | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs
index d136a7f9e3d4..9417f7eb2cd5 100644
--- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs
+++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs
@@ -39,7 +39,25 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
             {
                 testProject.AdditionalProperties["StripSymbols"] = "true";
             }
-            var testAsset = _testAssetsManager.CreateTestProject(testProject);
+            var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);
+
+            string[] ignoredPatterns = null;
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                ignoredPatterns = new string[]
+                {
+                    // Both these exclusions can be removed once the min tested version is .NET 10 and the min supported
+                    // XCode version is XCode 16.
+
+                    // -ld_classic option is required to workaround bugs in XCode 15 and .NET 9 and older runtimes.
+                    // See https://github.com/dotnet/runtime/issues/97745 for details.
+                    "ld: warning: -ld_classic is deprecated and will be removed in a future release",
+                    // These warnings show up when dotnet/runtime compiled using Apple clang 15+ is used
+                    // with classic linker (either Apple clang 14 or clang 15+ with -ld_classic).
+                    "ld: warning: __LD,__compact_unwind entries for",
+                };
+            }
 
             var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
             publishCommand
@@ -48,7 +66,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
                 .And.NotHaveStdOutContaining("IL2026")
                 .And.NotHaveStdErrContaining("NETSDK1179")
                 .And.NotHaveStdErrContaining("warning")
-                .And.NotHaveStdOutContaining("warning");
+                .And.NotHaveStdOutContaining("warning", ignoredPatterns);
 
             var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework);
             var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"];

From d194627f054935f0d9a0ae0cb7943c4b0c9a199e Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Fri, 7 Feb 2025 18:56:16 -0800
Subject: [PATCH 110/127] Add ignoredPatterns parameter to
 NotHaveStdOutContaining method

---
 .../Assertions/CommandResultAssertions.cs       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Tests/Microsoft.NET.TestFramework/Assertions/CommandResultAssertions.cs b/src/Tests/Microsoft.NET.TestFramework/Assertions/CommandResultAssertions.cs
index 176dee7b5dac..0077c1793652 100644
--- a/src/Tests/Microsoft.NET.TestFramework/Assertions/CommandResultAssertions.cs
+++ b/src/Tests/Microsoft.NET.TestFramework/Assertions/CommandResultAssertions.cs
@@ -66,10 +66,23 @@ public AndConstraint<CommandResultAssertions> HaveStdOutContaining(Func<string,
             return new AndConstraint<CommandResultAssertions>(this);
         }
 
-        public AndConstraint<CommandResultAssertions> NotHaveStdOutContaining(string pattern)
+        public AndConstraint<CommandResultAssertions> NotHaveStdOutContaining(string pattern, string[] ignoredPatterns = null)
         {
-            Execute.Assertion.ForCondition(!_commandResult.StdOut.Contains(pattern))
+            string filteredStdOut = _commandResult.StdOut;
+            if (ignoredPatterns != null && ignoredPatterns.Length > 0)
+            {
+                foreach (var ignoredPattern in ignoredPatterns)
+                {
+                    filteredStdOut = string.Join(Environment.NewLine, filteredStdOut
+                        .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                        .Where(line => !line.Contains(ignoredPattern)));
+                }
+            }
+
+            // Perform the assertion on the filtered output
+            Execute.Assertion.ForCondition(!filteredStdOut.Contains(pattern))
                 .FailWith(AppendDiagnosticsTo($"The command output contained a result it should not have contained: {pattern}{Environment.NewLine}"));
+
             return new AndConstraint<CommandResultAssertions>(this);
         }
 

From e9f4af3870ee2346e1ec0036a16c5252ed28337b Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 8 Feb 2025 09:59:15 +0100
Subject: [PATCH 111/127] address comments

---
 .../Microsoft.NET.Build.Containers/DigestUtils.cs    |  2 +-
 .../ImageIndexGenerator.cs                           | 12 +++++++++++-
 .../LocalDaemons/ArchiveFileRegistry.cs              |  2 +-
 .../Tasks/CreateImageIndex.cs                        |  2 +-
 .../Tasks/CreateNewImage.cs                          |  2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/DigestUtils.cs b/src/Containers/Microsoft.NET.Build.Containers/DigestUtils.cs
index 4171589c025d..a6f680436c39 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/DigestUtils.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/DigestUtils.cs
@@ -21,7 +21,7 @@ internal static string GetShaFromDigest(string digest)
     {
         if (!digest.StartsWith("sha256:", StringComparison.OrdinalIgnoreCase))
         {
-            throw new ArgumentException("Invalid digest format. Digest must start with 'sha256:'.");
+            throw new ArgumentException($"Invalid digest '{digest}'. Digest must start with 'sha256:'.");
         }
 
         return digest.Substring("sha256:".Length);
diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index ce6d91c1edbf..86e8d0a5c0c5 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -13,7 +13,7 @@ internal static class ImageIndexGenerator
     /// <summary>
     /// Generates an image index from the given images.
     /// </summary>
-    /// <param name="images"></param>
+    /// <param name="images">Images to generate image index from.</param>
     /// <returns>Returns json string of image index and image index mediaType.</returns>
     /// <exception cref="ArgumentException"></exception>
     /// <exception cref="NotSupportedException"></exception>
@@ -45,6 +45,15 @@ internal static (string, string) GenerateImageIndex(BuiltImage[] images)
         }
     }
 
+    /// <summary>
+    /// Generates an image index from the given images.
+    /// </summary>
+    /// <param name="images">Images to generate image index from.</param>
+    /// <param name="manifestMediaType">Media type of the manifest.</param>
+    /// <param name="imageIndexMediaType">Media type of the produced image index.</param>
+    /// <returns>Returns json string of image index and image index mediaType.</returns>
+    /// <exception cref="ArgumentException"></exception>
+    /// <exception cref="NotSupportedException"></exception>
     internal static string GenerateImageIndex(BuiltImage[] images, string manifestMediaType, string imageIndexMediaType)
     {
         if (images.Length == 0)
@@ -116,6 +125,7 @@ private static string GetJsonStringFromImageIndex<T>(T imageIndex)
         {
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
         };
+        // To avoid things like \u002B for '+' especially in media types ("application/vnd.oci.image.manifest.v1\u002Bjson"), we use UnsafeRelaxedJsonEscaping.
         var escapeOptions = new JsonSerializerOptions
         {
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
index 86c170fcb1f9..d127635ba584 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/ArchiveFileRegistry.cs
@@ -23,7 +23,7 @@ internal async Task LoadAsync<T>(T image, SourceImageReference sourceReference,
         var directorySeparatorChar = Path.DirectorySeparatorChar;
 
         // if doesn't end with a file extension, assume it's a directory
-        if (!fullPath.Split(directorySeparatorChar).Last().Contains('.'))
+        if (!Path.HasExtension(fullPath))
         {
            fullPath += Path.DirectorySeparatorChar;
         }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 6382a642cc1b..918cd60394ac 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -23,7 +23,7 @@ public void Dispose()
         _cancellationTokenSource.Dispose();
     }
 
-    private bool IsLocalPull => string.IsNullOrEmpty(BaseRegistry.Trim());
+    private bool IsLocalPull => string.IsNullOrWhiteSpace(BaseRegistry);
 
     public override bool Execute()
     {
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index a5e98431d802..6f3dbbdf8530 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -23,7 +23,7 @@ public sealed partial class CreateNewImage : Microsoft.Build.Utilities.Task, ICa
     /// </summary>
     public string ToolPath { get; set; }
 
-    private bool IsLocalPull => string.IsNullOrEmpty(BaseRegistry.Trim());
+    private bool IsLocalPull => string.IsNullOrWhiteSpace(BaseRegistry);
 
     public void Cancel() => _cancellationTokenSource.Cancel();
 

From 65837f687913ac2d3f8f8e796bccb42eae04be84 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 8 Feb 2025 10:34:08 +0100
Subject: [PATCH 112/127] refactor ImagePublisher

---
 .../ImagePublisher.cs                         | 62 +++++++++----------
 .../Tasks/CreateImageIndex.cs                 |  2 +-
 .../Tasks/CreateNewImage.cs                   |  2 +-
 3 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index 8dc164f41f49..c44d7fec09fc 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -13,7 +13,7 @@ public static async Task PublishImageAsync(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        IBuildEngine? BuildEngine,
+        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken)
     {
@@ -27,7 +27,7 @@ await PushToLocalRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    BuildEngine,
+                    isSafeLog,
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync).ConfigureAwait(false);
@@ -38,7 +38,7 @@ await PushToRemoteRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    BuildEngine,
+                    isSafeLog,
                     cancellationToken,
                     destinationImageReference.RemoteRegistry!.PushAsync,
                     Strings.ContainerBuilder_ImageUploadedToRegistry).ConfigureAwait(false);
@@ -55,7 +55,7 @@ public static async Task PublishImageAsync(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        IBuildEngine? BuildEngine,
+        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken)
     {
@@ -69,7 +69,7 @@ await PushToLocalRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    BuildEngine,
+                    isSafeLog,
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync).ConfigureAwait(false);
@@ -80,7 +80,7 @@ await PushToRemoteRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    BuildEngine,
+                    isSafeLog,
                     cancellationToken,
                     destinationImageReference.RemoteRegistry!.PushManifestListAsync,
                     Strings.ImageIndexUploadedToRegistry).ConfigureAwait(false);
@@ -97,7 +97,7 @@ private static async Task PushToLocalRegistryAsync<T>(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        IBuildEngine? BuildEngine,
+        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc)
@@ -112,31 +112,34 @@ private static async Task PushToLocalRegistryAsync<T>(
         try
         {
             await loadFunc(image, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
-            if (BuildEngine != null) 
+            if (isSafeLog) 
             {
                 Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
             }
         }
-        catch (ContainerHttpException e)
+        catch (ContainerHttpException e) when (isSafeLog)
         {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorFromException(e, true);
-            }
+            Log.LogErrorFromException(e, true);
         }
         catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
         {
             telemetry.LogLocalLoadError();
-            Log.LogErrorFromException(dle, showStackTrace: false);
+            if (isSafeLog)
+            {
+                Log.LogErrorFromException(dle, showStackTrace: false);
+            }
         }
-        catch (ArgumentException argEx)
+        catch (ArgumentException argEx) when (isSafeLog)
         {
             Log.LogErrorFromException(argEx, showStackTrace: false);
         }
         catch (DockerLoadException dle)
         {
             telemetry.LogLocalLoadError();
-            Log.LogErrorFromException(dle, showStackTrace: false);
+            if (isSafeLog)
+            {
+                Log.LogErrorFromException(dle, showStackTrace: false);
+            }
         }
     }
 
@@ -145,7 +148,7 @@ private static async Task PushToRemoteRegistryAsync<T>(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        IBuildEngine? BuildEngine,
+        bool isSafeLog,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> pushFunc,
         string successMessage)
@@ -157,32 +160,23 @@ await pushFunc(
                 sourceImageReference,
                 destinationImageReference,
                 cancellationToken).ConfigureAwait(false);
-            if (BuildEngine != null) 
+            if (isSafeLog) 
             {
                 Log.LogMessage(MessageImportance.High, successMessage, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
             }
         }
-        catch (UnableToAccessRepositoryException)
+        catch (UnableToAccessRepositoryException) when (isSafeLog)
         {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
-            }
+            Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
         }
-        catch (ContainerHttpException e)
+        catch (ContainerHttpException e) when (isSafeLog)
         {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorFromException(e, true);
-            }
+            Log.LogErrorFromException(e, true);
         }
-        catch (Exception e)
+        catch (Exception e) when (isSafeLog)
         {
-            if (BuildEngine != null)
-            {
-                Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
-                Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
-            }
+            Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
+            Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
         }
     }
 }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 918cd60394ac..64ca1939bdab 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -83,7 +83,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
-        await ImagePublisher.PublishImageAsync(multiArchImage, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
+        await ImagePublisher.PublishImageAsync(multiArchImage, sourceImageReference, destinationImageReference, Log, BuildEngine != null, telemetry, cancellationToken)
             .ConfigureAwait(false); 
 
         return !Log.HasLoggedErrors;
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index 6f3dbbdf8530..c6e1fba6ce43 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -183,7 +183,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         if (!SkipPublishing)
         {
-            await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine, telemetry, cancellationToken)
+            await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine != null, telemetry, cancellationToken)
                 .ConfigureAwait(false);
         }
         

From 960bb7d19ddfd923270d8f9e17066330c8c098d6 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 8 Feb 2025 10:57:41 +0100
Subject: [PATCH 113/127] remove BuildEngine null check before logging

---
 .../ImagePublisher.cs                         | 38 +++++--------------
 .../Tasks/CreateImageIndex.cs                 |  2 +-
 .../Tasks/CreateNewImage.cs                   | 13 +++----
 3 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
index c44d7fec09fc..1a16cbbad500 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImagePublisher.cs
@@ -13,7 +13,6 @@ public static async Task PublishImageAsync(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken)
     {
@@ -27,7 +26,6 @@ await PushToLocalRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    isSafeLog,
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync).ConfigureAwait(false);
@@ -38,7 +36,6 @@ await PushToRemoteRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    isSafeLog,
                     cancellationToken,
                     destinationImageReference.RemoteRegistry!.PushAsync,
                     Strings.ContainerBuilder_ImageUploadedToRegistry).ConfigureAwait(false);
@@ -55,7 +52,6 @@ public static async Task PublishImageAsync(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken)
     {
@@ -69,7 +65,6 @@ await PushToLocalRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    isSafeLog,
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync).ConfigureAwait(false);
@@ -80,7 +75,6 @@ await PushToRemoteRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    isSafeLog,
                     cancellationToken,
                     destinationImageReference.RemoteRegistry!.PushManifestListAsync,
                     Strings.ImageIndexUploadedToRegistry).ConfigureAwait(false);
@@ -97,7 +91,6 @@ private static async Task PushToLocalRegistryAsync<T>(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc)
@@ -112,34 +105,25 @@ private static async Task PushToLocalRegistryAsync<T>(
         try
         {
             await loadFunc(image, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
-            if (isSafeLog) 
-            {
-                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
-            }
+            Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
         }
-        catch (ContainerHttpException e) when (isSafeLog)
+        catch (ContainerHttpException e)
         {
             Log.LogErrorFromException(e, true);
         }
         catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
         {
             telemetry.LogLocalLoadError();
-            if (isSafeLog)
-            {
-                Log.LogErrorFromException(dle, showStackTrace: false);
-            }
+            Log.LogErrorFromException(dle, showStackTrace: false);
         }
-        catch (ArgumentException argEx) when (isSafeLog)
+        catch (ArgumentException argEx)
         {
             Log.LogErrorFromException(argEx, showStackTrace: false);
         }
         catch (DockerLoadException dle)
         {
             telemetry.LogLocalLoadError();
-            if (isSafeLog)
-            {
-                Log.LogErrorFromException(dle, showStackTrace: false);
-            }
+            Log.LogErrorFromException(dle, showStackTrace: false);
         }
     }
 
@@ -148,7 +132,6 @@ private static async Task PushToRemoteRegistryAsync<T>(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        bool isSafeLog,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> pushFunc,
         string successMessage)
@@ -160,20 +143,17 @@ await pushFunc(
                 sourceImageReference,
                 destinationImageReference,
                 cancellationToken).ConfigureAwait(false);
-            if (isSafeLog) 
-            {
-                Log.LogMessage(MessageImportance.High, successMessage, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
-            }
+            Log.LogMessage(MessageImportance.High, successMessage, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
         }
-        catch (UnableToAccessRepositoryException) when (isSafeLog)
+        catch (UnableToAccessRepositoryException)
         {
             Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
         }
-        catch (ContainerHttpException e) when (isSafeLog)
+        catch (ContainerHttpException e)
         {
             Log.LogErrorFromException(e, true);
         }
-        catch (Exception e) when (isSafeLog)
+        catch (Exception e)
         {
             Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
             Log.LogMessage(MessageImportance.Low, "Details: {0}", e);
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index 64ca1939bdab..f168e157ddc7 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -83,7 +83,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
-        await ImagePublisher.PublishImageAsync(multiArchImage, sourceImageReference, destinationImageReference, Log, BuildEngine != null, telemetry, cancellationToken)
+        await ImagePublisher.PublishImageAsync(multiArchImage, sourceImageReference, destinationImageReference, Log, telemetry, cancellationToken)
             .ConfigureAwait(false); 
 
         return !Log.HasLoggedErrors;
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index c6e1fba6ce43..df46fd354709 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -120,13 +120,10 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             return !Log.HasLoggedErrors;
         }
 
-        if (BuildEngine != null) 
-        {
-            (string message, object[] parameters) = SkipPublishing ?
-                ( Strings.ContainerBuilder_StartBuildingImageForRid, new object[] { Repository, ContainerRuntimeIdentifier, sourceImageReference }) :
-                ( Strings.ContainerBuilder_StartBuildingImage, new object[] { Repository, String.Join(",", ImageTags), sourceImageReference });
-            Log.LogMessage(MessageImportance.High, message, parameters);
-        }
+        (string message, object[] parameters) = SkipPublishing ?
+            ( Strings.ContainerBuilder_StartBuildingImageForRid, new object[] { Repository, ContainerRuntimeIdentifier, sourceImageReference }) :
+            ( Strings.ContainerBuilder_StartBuildingImage, new object[] { Repository, String.Join(",", ImageTags), sourceImageReference });
+        Log.LogMessage(MessageImportance.High, message, parameters);
 
         Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
         imageBuilder.AddLayer(newLayer);
@@ -183,7 +180,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         if (!SkipPublishing)
         {
-            await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine != null, telemetry, cancellationToken)
+            await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, telemetry, cancellationToken)
                 .ConfigureAwait(false);
         }
         

From 63847bab1e80d361f1e8fe28cd5cd2ecc3258a66 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Sat, 8 Feb 2025 12:15:53 +0100
Subject: [PATCH 114/127] register task resources for CreateImageIndex

---
 .../Tasks/CreateImageIndex.Interface.cs                        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
index 6e64ede53469..bb69651add0e 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.Interface.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Build.Framework;
+using Microsoft.NET.Build.Containers.Resources;
 
 namespace Microsoft.NET.Build.Containers.Tasks;
 
@@ -85,5 +86,7 @@ public CreateImageIndex()
         ImageTags = Array.Empty<string>();
         GeneratedArchiveOutputPath = string.Empty;
         GeneratedImageIndex = string.Empty;
+
+        TaskResources = Resource.Manager;
     }
 } 
\ No newline at end of file

From 72b4bf04d2a987b1c6c7fdbc331b36e53ab2ada7 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 10 Feb 2025 09:17:24 +0100
Subject: [PATCH 115/127] optimize ParseImages in CreateImageIndex

---
 .../BuiltImage.cs                             |  4 +--
 .../LocalDaemons/DockerCli.cs                 |  4 +--
 .../Registry/Registry.cs                      |  2 +-
 .../Tasks/CreateImageIndex.cs                 | 30 ++++++++++++-------
 .../ImageIndexGeneratorTests.cs               | 14 ---------
 5 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
index fd14bce11c58..91f47193ce66 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/BuiltImage.cs
@@ -16,12 +16,12 @@ internal readonly struct BuiltImage
     /// <summary>
     /// Gets image digest.
     /// </summary>
-    internal required string ImageDigest { get; init; }
+    internal string? ImageDigest { get; init; }
 
     /// <summary>
     /// Gets image SHA.
     /// </summary>
-    internal required string ImageSha { get; init; }
+    internal string? ImageSha { get; init; }
 
     /// <summary>
     /// Gets image manifest.
diff --git a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
index d5b8fb2b3c5f..5bdb7f40c8a4 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs
@@ -311,7 +311,7 @@ private static async Task WriteDockerImageToStreamAsync(
         await WriteImageLayers(writer, image, sourceReference, d => $"{d.Substring("sha256:".Length)}/layer.tar", cancellationToken, layerTarballPaths)
             .ConfigureAwait(false);
 
-        string configTarballPath = $"{image.ImageSha}.json";
+        string configTarballPath = $"{image.ImageSha!}.json";
         await WriteImageConfig(writer, image, configTarballPath, cancellationToken)
             .ConfigureAwait(false);
 
@@ -492,7 +492,7 @@ private static async Task WriteOciImageToBlobs(
         await WriteImageLayers(writer, image, sourceReference, d => $"{_blobsPath}/{d.Substring("sha256:".Length)}", cancellationToken)
             .ConfigureAwait(false);
 
-        await WriteImageConfig(writer, image, $"{_blobsPath}/{image.ImageSha}", cancellationToken)
+        await WriteImageConfig(writer, image, $"{_blobsPath}/{image.ImageSha!}", cancellationToken)
             .ConfigureAwait(false);
 
         await WriteManifestForOciImage(writer, image, cancellationToken)
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
index 87671575f34a..1b01ebd5bdc4 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs
@@ -595,7 +595,7 @@ private async Task PushAsync(BuiltImage builtImage, SourceImageReference source,
         cancellationToken.ThrowIfCancellationRequested();
         using (MemoryStream stringStream = new MemoryStream(Encoding.UTF8.GetBytes(builtImage.Config)))
         {
-            var configDigest = builtImage.ImageDigest;
+            var configDigest = builtImage.ImageDigest!;
             _logger.LogInformation(Strings.Registry_ConfigUploadStarted, configDigest);
             await UploadBlobAsync(destination.Repository, configDigest, stringStream, cancellationToken).ConfigureAwait(false);
             _logger.LogInformation(Strings.Registry_ConfigUploaded);
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
index f168e157ddc7..25658f612e06 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs
@@ -108,19 +108,27 @@ private BuiltImage[] ParseImages(DestinationImageReferenceKind destinationKind)
                 break;
             }
 
-            var manifestV2 = JsonSerializer.Deserialize<ManifestV2>(manifest);
-            if (manifestV2 == null)
-            {
-                Log.LogError(Strings.InvalidImageManifest);
-                break;
-            }
-
-            string imageDigest = manifestV2.Config.digest;
-            string imageSha = DigestUtils.GetShaFromDigest(imageDigest);
-            // We don't need layers for remote registry, as the individual images should be pushed already
-            var layers = destinationKind == DestinationImageReferenceKind.RemoteRegistry ? null : manifestV2.Layers;
             (string architecture, string os) = GetArchitectureAndOsFromConfig(config);
 
+            // We don't need ImageDigest, ImageSha, Layers for remote registry, as the individual images should be pushed already
+            string? imageDigest = null;
+            string? imageSha = null;
+            List<ManifestLayer>? layers = null;
+
+            if (destinationKind == DestinationImageReferenceKind.LocalRegistry)
+            {
+                var manifestV2 = JsonSerializer.Deserialize<ManifestV2>(manifest);
+                if (manifestV2 == null)
+                {
+                    Log.LogError(Strings.InvalidImageManifest);
+                    break;
+                }
+
+                imageDigest = manifestV2.Config.digest;
+                imageSha = DigestUtils.GetShaFromDigest(imageDigest);
+                layers = manifestV2.Layers;
+            }     
+
             images[i] = new BuiltImage()
             {
                 Config = config,
diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
index 6b87a502d6a6..1acc846dcdcd 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageIndexGeneratorTests.cs
@@ -31,8 +31,6 @@ public void UnsupportedMediaTypeThrows()
             new BuiltImage
             {
                 Config = "",
-                ImageDigest = "",
-                ImageSha = "",
                 Manifest = "",
                 ManifestDigest = "",
                 ManifestMediaType = "unsupported"
@@ -53,8 +51,6 @@ public void ImagesWithMixedMediaTypes(string supportedMediaType)
             new BuiltImage
             {
                 Config = "",
-                ImageDigest = "",
-                ImageSha = "",
                 Manifest = "",
                 ManifestDigest = "",
                 ManifestMediaType = supportedMediaType,
@@ -62,8 +58,6 @@ public void ImagesWithMixedMediaTypes(string supportedMediaType)
             new BuiltImage
             {
                 Config = "",
-                ImageDigest = "",
-                ImageSha = "",
                 Manifest = "",
                 ManifestDigest = "",
                 ManifestMediaType = "anotherMediaType"
@@ -82,8 +76,6 @@ public void GenerateDockerManifestList()
             new BuiltImage
             {
                 Config = "",
-                ImageDigest = "",
-                ImageSha = "",
                 Manifest = "123",
                 ManifestDigest = "sha256:digest1",
                 ManifestMediaType = SchemaTypes.DockerManifestV2,
@@ -93,8 +85,6 @@ public void GenerateDockerManifestList()
             new BuiltImage
             {
                 Config = "",
-                ImageDigest = "",
-                ImageSha = "",
                 Manifest = "123",
                 ManifestDigest = "sha256:digest2",
                 ManifestMediaType = SchemaTypes.DockerManifestV2,
@@ -116,8 +106,6 @@ public void GenerateOciImageIndex()
             new BuiltImage
             {
                 Config = "",
-                ImageDigest = "",
-                ImageSha = "",
                 Manifest = "123",
                 ManifestDigest = "sha256:digest1",
                 ManifestMediaType = SchemaTypes.OciManifestV1,
@@ -127,8 +115,6 @@ public void GenerateOciImageIndex()
             new BuiltImage
             {
                 Config = "",
-                ImageDigest = "",
-                ImageSha = "",
                 Manifest = "123",
                 ManifestDigest = "sha256:digest2",
                 ManifestMediaType = SchemaTypes.OciManifestV1,

From 0f5e6c80c92e78d028be4a8a172f84d9a4559d2f Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 10 Feb 2025 13:07:00 +0100
Subject: [PATCH 116/127] fix setting annotation image name prefix: set to
 'docker.io/' when repostory contains /, and 'docker.io/library/' when it
 doesn't; add tests

---
 .../ImageIndexGenerator.cs                    |  4 +++-
 .../DockerSupportsArchFact.cs                 | 19 ++++++++++++++++
 .../EndToEndTests.cs                          | 22 ++++++++++---------
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
index 86e8d0a5c0c5..64a00b4236cb 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageIndexGenerator.cs
@@ -92,6 +92,8 @@ internal static string GenerateImageIndex(BuiltImage[] images, string manifestMe
 
     internal static string GenerateImageIndexWithAnnotations(string manifestMediaType, string manifestDigest, long manifestSize, string repository, string[] tags)
     {
+        string containerdImageNamePrefix = repository.Contains('/') ? "docker.io/" : "docker.io/library/";
+        
         var manifests = new PlatformSpecificOciManifest[tags.Length];
         for (int i = 0; i < tags.Length; i++)
         {
@@ -103,7 +105,7 @@ internal static string GenerateImageIndexWithAnnotations(string manifestMediaTyp
                 digest = manifestDigest,
                 annotations = new Dictionary<string, string> 
                 {
-                    { "io.containerd.image.name", $"docker.io/library/{repository}:{tag}" },
+                    { "io.containerd.image.name", $"{containerdImageNamePrefix}{repository}:{tag}" },
                     { "org.opencontainers.image.ref.name", tag } 
                 }
             };
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
index ae0e76f3c153..e7744d8882d4 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
@@ -21,3 +21,22 @@ public DockerIsAvailableAndSupportsArchFactAttribute(string arch, bool checkCont
         }
     }
 }
+
+public class DockerIsAvailableAndSupportsArchTheoryAttribute : TheoryAttribute
+{
+    public DockerIsAvailableAndSupportsArchTheoryAttribute(string arch, bool checkContainerdStoreAvailability = false)
+    {
+        if (!DockerSupportsArchHelper.DaemonIsAvailable)
+        {
+            base.Skip = "Skipping test because Docker is not available on this host.";
+        }
+        else if (checkContainerdStoreAvailability && !DockerSupportsArchHelper.IsContainerdStoreEnabledForDocker)
+        {
+            base.Skip = "Skipping test because Docker daemon is not using containerd as the storage driver.";
+        }
+        else if (!DockerSupportsArchHelper.DaemonSupportsArch(arch))
+        {
+            base.Skip = $"Skipping test because Docker daemon does not support {arch}.";
+        }
+    }
+}
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index ccef1a3b41c4..836022f30f3b 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -721,10 +721,11 @@ public void EndToEnd_SingleArch_NoRid()
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
-    public void EndToEndMultiArch_LocalRegistry()
+    [InlineData("endtoendmultiarch-localregisty")]
+    [InlineData("myteam/endtoendmultiarch-localregisty")]
+    [DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
+    public void EndToEndMultiArch_LocalRegistry(string imageName)
     {
-        string imageName = NewImageName();
         string tag = "1.0";
         string image = $"{imageName}:{tag}";
 
@@ -759,7 +760,7 @@ public void EndToEndMultiArch_LocalRegistry()
             "--platform",
             "linux/amd64",
             "--name",
-            $"test-container-{imageName}-x64",
+            $"test-container-{imageName.Replace('/', '-')}-x64",
             image)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
@@ -770,7 +771,7 @@ public void EndToEndMultiArch_LocalRegistry()
             "--platform",
             "linux/arm64",
             "--name",
-            $"test-container-{imageName}-arm64",
+            $"test-container-{imageName.Replace('/', '-')}-arm64",
             image)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");
@@ -904,10 +905,11 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
     private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
         => Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
-    public void EndToEndMultiArch_ArchivePublishing()
+    [InlineData("endtoendmultiarch-archivepublishing")]
+    [InlineData("myteam/endtoendmultiarch-archivepublishing")]
+    [DockerIsAvailableAndSupportsArchTheory("linux/arm64", checkContainerdStoreAvailability: true)]
+    public void EndToEndMultiArch_ArchivePublishing(string imageName)
     {
-        string imageName = NewImageName();
         string tag = "1.0";
         string image = $"{imageName}:{tag}";
         string archiveOutput = TestSettings.TestArtifactsDirectory;
@@ -953,7 +955,7 @@ public void EndToEndMultiArch_ArchivePublishing()
             "--platform",
             "linux/amd64",
             "--name",
-            $"test-container-{imageName}-x64",
+            $"test-container-{imageName.Replace('/', '-')}-x64",
             image)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
@@ -964,7 +966,7 @@ public void EndToEndMultiArch_ArchivePublishing()
             "--platform",
             "linux/arm64",
             "--name",
-            $"test-container-{imageName}-arm64",
+            $"test-container-{imageName.Replace('/', '-')}-arm64",
             image)
         .Execute();
         processResultArm64.Should().Pass().And.HaveStdOut("Hello, World!");

From f09c5c41b50cff4cadb36b73912687ab0fa44bb7 Mon Sep 17 00:00:00 2001
From: Surayya Huseyn Zada <surayyahuseynzada@Surayyas-MacBook-Pro.local>
Date: Mon, 10 Feb 2025 13:44:33 +0100
Subject: [PATCH 117/127] move DockerIsAvailableAndSupportsArchTheoryAttribute
 to its own file; rename DockerIsAvailableAndSupportsArchFactAttribute file

---
 ...> DockerIsAvailableAndSupportsArchFact.cs} | 19 ---------------
 .../DockerIsAvailableAndSupportsArchTheory.cs | 23 +++++++++++++++++++
 2 files changed, 23 insertions(+), 19 deletions(-)
 rename src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/{DockerSupportsArchFact.cs => DockerIsAvailableAndSupportsArchFact.cs} (55%)
 create mode 100644 src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerIsAvailableAndSupportsArchTheory.cs

diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerIsAvailableAndSupportsArchFact.cs
similarity index 55%
rename from src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
rename to src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerIsAvailableAndSupportsArchFact.cs
index e7744d8882d4..ae0e76f3c153 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerIsAvailableAndSupportsArchFact.cs
@@ -21,22 +21,3 @@ public DockerIsAvailableAndSupportsArchFactAttribute(string arch, bool checkCont
         }
     }
 }
-
-public class DockerIsAvailableAndSupportsArchTheoryAttribute : TheoryAttribute
-{
-    public DockerIsAvailableAndSupportsArchTheoryAttribute(string arch, bool checkContainerdStoreAvailability = false)
-    {
-        if (!DockerSupportsArchHelper.DaemonIsAvailable)
-        {
-            base.Skip = "Skipping test because Docker is not available on this host.";
-        }
-        else if (checkContainerdStoreAvailability && !DockerSupportsArchHelper.IsContainerdStoreEnabledForDocker)
-        {
-            base.Skip = "Skipping test because Docker daemon is not using containerd as the storage driver.";
-        }
-        else if (!DockerSupportsArchHelper.DaemonSupportsArch(arch))
-        {
-            base.Skip = $"Skipping test because Docker daemon does not support {arch}.";
-        }
-    }
-}
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerIsAvailableAndSupportsArchTheory.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerIsAvailableAndSupportsArchTheory.cs
new file mode 100644
index 000000000000..382e57604fab
--- /dev/null
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerIsAvailableAndSupportsArchTheory.cs
@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.NET.Build.Containers.IntegrationTests;
+
+public class DockerIsAvailableAndSupportsArchTheoryAttribute : TheoryAttribute
+{
+    public DockerIsAvailableAndSupportsArchTheoryAttribute(string arch, bool checkContainerdStoreAvailability = false)
+    {
+        if (!DockerSupportsArchHelper.DaemonIsAvailable)
+        {
+            base.Skip = "Skipping test because Docker is not available on this host.";
+        }
+        else if (checkContainerdStoreAvailability && !DockerSupportsArchHelper.IsContainerdStoreEnabledForDocker)
+        {
+            base.Skip = "Skipping test because Docker daemon is not using containerd as the storage driver.";
+        }
+        else if (!DockerSupportsArchHelper.DaemonSupportsArch(arch))
+        {
+            base.Skip = $"Skipping test because Docker daemon does not support {arch}.";
+        }
+    }
+}
\ No newline at end of file

From bca34b9b6edd70f26b2cf7f5c38f63bf5e4a099c Mon Sep 17 00:00:00 2001
From: Chet Husk <baronfel@users.noreply.github.com>
Date: Tue, 11 Feb 2025 17:48:15 -0600
Subject: [PATCH 118/127] [release/8.0.4xx] Manual Backport of #40611 to
 8.0.4xx - Allow users to set a specific ContainerImageFormat to force OCI
 support (#46140)

---
 .../ContainerBuilder.cs                       |  16 ++
 .../ImageBuilder.cs                           |  17 +-
 .../PublicAPI/net472/PublicAPI.Unshipped.txt  |   2 +
 .../PublicAPI/net8.0/PublicAPI.Unshipped.txt  |   2 +
 .../Registry/SchemaTypes.cs                   |   3 +
 .../Resources/Strings.Designer.cs             | 199 ++++++++++--------
 .../Resources/Strings.resx                    |   4 +
 .../Resources/xlf/Strings.cs.xlf              |   5 +
 .../Resources/xlf/Strings.de.xlf              |   5 +
 .../Resources/xlf/Strings.es.xlf              |   5 +
 .../Resources/xlf/Strings.fr.xlf              |   5 +
 .../Resources/xlf/Strings.it.xlf              |   5 +
 .../Resources/xlf/Strings.ja.xlf              |   5 +
 .../Resources/xlf/Strings.ko.xlf              |   5 +
 .../Resources/xlf/Strings.pl.xlf              |   5 +
 .../Resources/xlf/Strings.pt-BR.xlf           |   5 +
 .../Resources/xlf/Strings.ru.xlf              |   5 +
 .../Resources/xlf/Strings.tr.xlf              |   5 +
 .../Resources/xlf/Strings.zh-Hans.xlf         |   5 +
 .../Resources/xlf/Strings.zh-Hant.xlf         |   5 +
 .../Tasks/CreateNewImage.Interface.cs         |   4 +
 .../Tasks/CreateNewImage.cs                   |  18 ++
 .../Tasks/CreateNewImageToolTask.cs           |   4 +
 .../containerize/ContainerizeCommand.cs       |   8 +
 .../Microsoft.NET.Build.Containers.targets    |   1 +
 .../CreateNewImageTests.cs                    |  66 ++++++
 26 files changed, 313 insertions(+), 96 deletions(-)

diff --git a/src/Containers/Microsoft.NET.Build.Containers/ContainerBuilder.cs b/src/Containers/Microsoft.NET.Build.Containers/ContainerBuilder.cs
index 48867a93de6b..665869e4a7a0 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ContainerBuilder.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ContainerBuilder.cs
@@ -6,6 +6,12 @@
 
 namespace Microsoft.NET.Build.Containers;
 
+internal enum KnownImageFormats
+{
+    OCI,
+    Docker
+}
+
 internal static class ContainerBuilder
 {
     internal static async Task<int> ContainerizeAsync(
@@ -33,6 +39,7 @@ internal static async Task<int> ContainerizeAsync(
         string? archiveOutputPath,
         bool generateLabels,
         bool generateDigestLabel,
+        KnownImageFormats? imageFormat,
         ILoggerFactory loggerFactory,
         CancellationToken cancellationToken)
     {
@@ -98,6 +105,15 @@ internal static async Task<int> ContainerizeAsync(
         logger.LogInformation(Strings.ContainerBuilder_StartBuildingImage, imageName, string.Join(",", imageName), sourceImageReference);
         cancellationToken.ThrowIfCancellationRequested();
 
+        // forcibly change the media type if required
+        imageBuilder.ManifestMediaType = imageFormat switch
+        {
+            null => imageBuilder.ManifestMediaType,
+            KnownImageFormats.Docker => SchemaTypes.DockerManifestV2,
+            KnownImageFormats.OCI => SchemaTypes.OciManifestV1,
+            _ => imageBuilder.ManifestMediaType // should be impossible unless we add to the enum
+        };
+
         Layer newLayer = Layer.FromDirectory(publishDirectory.FullName, workingDir, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
         imageBuilder.AddLayer(newLayer);
         imageBuilder.SetWorkingDirectory(workingDir);
diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs
index 633ca8e98860..9a41e432c6a9 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs
@@ -20,7 +20,6 @@ internal sealed class ImageBuilder
 
     // the mutable internal manifest that we're building by modifying the base and applying customizations
     private readonly ManifestV2 _manifest;
-    private readonly string _manifestMediaType;
     private readonly ImageConfig _baseImageConfig;
     private readonly ILogger _logger;
 
@@ -33,15 +32,15 @@ internal sealed class ImageBuilder
     public ImageConfig BaseImageConfig => _baseImageConfig;
 
     /// <summary>
-    /// MediaType of the output manifest.
+    /// MediaType of the output manifest. By default, this will be the same as the base image manifest.
     /// </summary>
-    public string ManifestMediaType => _manifestMediaType; // output the same media type as the base image manifest.
+    public string ManifestMediaType { get; set; }
 
     internal ImageBuilder(ManifestV2 manifest, string manifestMediaType, ImageConfig baseImageConfig, ILogger logger)
     {
         _baseImageManifest = manifest;
         _manifest = new ManifestV2() { SchemaVersion = manifest.SchemaVersion, Config = manifest.Config, Layers = new(manifest.Layers), MediaType = manifest.MediaType };
-        _manifestMediaType = manifestMediaType;
+        ManifestMediaType = manifestMediaType;
         _baseImageConfig = baseImageConfig;
         _logger = logger;
     }
@@ -71,14 +70,20 @@ internal BuiltImage Build()
         ManifestConfig newManifestConfig = _manifest.Config with
         {
             digest = imageDigest,
-            size = imageSize
+            size = imageSize,
+            mediaType = ManifestMediaType switch
+            {
+                SchemaTypes.OciManifestV1 => SchemaTypes.OciImageConfigV1,
+                SchemaTypes.DockerManifestV2 => SchemaTypes.DockerContainerV1,
+                _ => SchemaTypes.OciImageConfigV1 // opinion - defaulting to modern here, but really this should never happen
+            }
         };
 
         ManifestV2 newManifest = new ManifestV2()
         {
             Config = newManifestConfig,
             SchemaVersion = _manifest.SchemaVersion,
-            MediaType = _manifest.MediaType,
+            MediaType = ManifestMediaType,
             Layers = _manifest.Layers
         };
 
diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt
index 9e6b0de71dc0..4da41db6b2dc 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt
+++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt
@@ -90,6 +90,8 @@ Microsoft.NET.Build.Containers.Tasks.CreateNewImage.SkipPublishing.get -> bool
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.SkipPublishing.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GeneratedContainerNames.get -> Microsoft.Build.Framework.ITaskItem![]!
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GeneratedContainerNames.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateNewImage.ImageFormat.get -> string?
+Microsoft.NET.Build.Containers.Tasks.CreateNewImage.ImageFormat.set -> void
 override Microsoft.NET.Build.Containers.Tasks.CreateNewImage.ToolName.get -> string!
 override Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateCommandLineCommands() -> string!
 override Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GenerateFullPathToTool() -> string!
diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
index 5c07a3871ceb..3370734680b1 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
+++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -255,6 +255,8 @@ Microsoft.NET.Build.Containers.Tasks.CreateNewImage.SkipPublishing.get -> bool
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.SkipPublishing.set -> void
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GeneratedContainerNames.get -> Microsoft.Build.Framework.ITaskItem![]!
 Microsoft.NET.Build.Containers.Tasks.CreateNewImage.GeneratedContainerNames.set -> void
+Microsoft.NET.Build.Containers.Tasks.CreateNewImage.ImageFormat.get -> string?
+Microsoft.NET.Build.Containers.Tasks.CreateNewImage.ImageFormat.set -> void
 Microsoft.NET.Build.Containers.Tasks.ParseContainerProperties
 Microsoft.NET.Build.Containers.Tasks.ParseContainerProperties.ContainerEnvironmentVariables.get -> Microsoft.Build.Framework.ITaskItem![]!
 Microsoft.NET.Build.Containers.Tasks.ParseContainerProperties.ContainerEnvironmentVariables.set -> void
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs
index 8021f652f72d..f7ae91a19e8b 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs
@@ -9,8 +9,11 @@ internal class SchemaTypes
     internal const string DockerContainerV1 = "application/vnd.docker.container.image.v1+json";
     internal const string DockerManifestListV2 = "application/vnd.docker.distribution.manifest.list.v2+json";
     internal const string DockerManifestV2 = "application/vnd.docker.distribution.manifest.v2+json";
+
     internal const string OciManifestV1 = "application/vnd.oci.image.manifest.v1+json"; // https://containers.gitbook.io/build-containers-the-hard-way/#registry-format-oci-image-manifest
     internal const string OciImageIndexV1 = "application/vnd.oci.image.index.v1+json";
+    internal const string OciImageConfigV1 = "application/vnd.oci.image.config.v1+json";
+
     internal const string DockerLayerGzip = "application/vnd.docker.image.rootfs.diff.tar.gzip";
     internal const string OciLayerGzipV1 = "application/vnd.oci.image.layer.v1.tar+gzip";
 }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
index 59a9f28b0b83..ec4966caaa27 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs
@@ -10,8 +10,8 @@
 
 namespace Microsoft.NET.Build.Containers.Resources {
     using System;
-    
-    
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -23,15 +23,15 @@ namespace Microsoft.NET.Build.Containers.Resources {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {
-        
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Strings() {
         }
-        
+
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
@@ -45,7 +45,7 @@ internal Strings() {
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
@@ -59,7 +59,7 @@ internal Strings() {
                 resourceCulture = value;
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER0000: Value for unit test {0}.
         /// </summary>
@@ -68,7 +68,7 @@ internal static string _Test {
                 return ResourceManager.GetString("_Test", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1002: Request to Amazon Elastic Container Registry failed prematurely. This is often caused when the target repository does not exist in the registry..
         /// </summary>
@@ -77,7 +77,7 @@ internal static string AmazonRegistryFailed {
                 return ResourceManager.GetString("AmazonRegistryFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2008: Both {0} and {1} were provided, but only one or the other is allowed..
         /// </summary>
@@ -86,7 +86,7 @@ internal static string AmbiguousTags {
                 return ResourceManager.GetString("AmbiguousTags", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2025: ContainerAppCommandArgs are provided without specifying a ContainerAppCommand..
         /// </summary>
@@ -95,7 +95,7 @@ internal static string AppCommandArgsSetNoAppCommand {
                 return ResourceManager.GetString("AppCommandArgsSetNoAppCommand", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2026: ContainerAppCommand and ContainerAppCommandArgs must be empty when ContainerAppCommandInstruction is &apos;{0}&apos;..
         /// </summary>
@@ -104,7 +104,7 @@ internal static string AppCommandSetNotUsed {
                 return ResourceManager.GetString("AppCommandSetNotUsed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to local archive at &apos;{0}&apos;.
         /// </summary>
@@ -113,7 +113,7 @@ internal static string ArchiveRegistry_PushInfo {
                 return ResourceManager.GetString("ArchiveRegistry_PushInfo", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2022: The base image has an entrypoint that will be overwritten to start the application. Set ContainerAppCommandInstruction to &apos;Entrypoint&apos; if this is desired. To preserve the base image entrypoint, set ContainerAppCommandInstruction to &apos;DefaultArgs&apos;..
         /// </summary>
@@ -122,7 +122,7 @@ internal static string BaseEntrypointOverwritten {
                 return ResourceManager.GetString("BaseEntrypointOverwritten", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2009: Could not parse {0}: {1}.
         /// </summary>
@@ -131,7 +131,7 @@ internal static string BaseImageNameParsingFailed {
                 return ResourceManager.GetString("BaseImageNameParsingFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2020: {0} does not specify a registry and will be pulled from Docker Hub. Please prefix the name with the image registry, for example: &apos;{1}/&lt;image&gt;&apos;..
         /// </summary>
@@ -140,7 +140,7 @@ internal static string BaseImageNameRegistryFallback {
                 return ResourceManager.GetString("BaseImageNameRegistryFallback", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2013: {0} had spaces in it, replacing with dashes..
         /// </summary>
@@ -149,7 +149,7 @@ internal static string BaseImageNameWithSpaces {
                 return ResourceManager.GetString("BaseImageNameWithSpaces", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1011: Couldn&apos;t find matching base image for {0} that matches RuntimeIdentifier {1}..
         /// </summary>
@@ -158,7 +158,7 @@ internal static string BaseImageNotFound {
                 return ResourceManager.GetString("BaseImageNotFound", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1001: Failed to upload blob using {0}; received status code &apos;{1}&apos;..
         /// </summary>
@@ -167,7 +167,7 @@ internal static string BlobUploadFailed {
                 return ResourceManager.GetString("BlobUploadFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Building image index &apos;{0}&apos; on top of manifests {1}..
         /// </summary>
@@ -176,7 +176,7 @@ internal static string BuildingImageIndex {
                 return ResourceManager.GetString("BuildingImageIndex", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Pushed image &apos;{0}&apos; to {1}..
         /// </summary>
@@ -185,7 +185,7 @@ internal static string ContainerBuilder_ImageUploadedToLocalDaemon {
                 return ResourceManager.GetString("ContainerBuilder_ImageUploadedToLocalDaemon", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Pushed image &apos;{0}&apos; to registry &apos;{1}&apos;..
         /// </summary>
@@ -194,7 +194,7 @@ internal static string ContainerBuilder_ImageUploadedToRegistry {
                 return ResourceManager.GetString("ContainerBuilder_ImageUploadedToRegistry", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Building image &apos;{0}&apos; with tags &apos;{1}&apos; on top of base image &apos;{2}&apos;..
         /// </summary>
@@ -203,7 +203,7 @@ internal static string ContainerBuilder_StartBuildingImage {
                 return ResourceManager.GetString("ContainerBuilder_StartBuildingImage", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Building image &apos;{0}&apos; for runtime identifier &apos;{1}&apos; on top of base image &apos;{2}&apos;..
         /// </summary>
@@ -221,7 +221,7 @@ internal static string ContainerRuntimeProcessCreationFailed {
                 return ResourceManager.GetString("ContainerRuntimeProcessCreationFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1007: Could not deserialize token from JSON..
         /// </summary>
@@ -230,7 +230,7 @@ internal static string CouldntDeserializeJsonToken {
                 return ResourceManager.GetString("CouldntDeserializeJsonToken", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2012: Could not recognize registry &apos;{0}&apos;..
         /// </summary>
@@ -239,7 +239,7 @@ internal static string CouldntRecognizeRegistry {
                 return ResourceManager.GetString("CouldntRecognizeRegistry", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to local registry via &apos;{0}&apos;.
         /// </summary>
@@ -248,7 +248,7 @@ internal static string DockerCli_PushInfo {
                 return ResourceManager.GetString("DockerCli_PushInfo", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER3002: Failed to get docker info({0})\n{1}\n{2}.
         /// </summary>
@@ -257,7 +257,7 @@ internal static string DockerInfoFailed {
                 return ResourceManager.GetString("DockerInfoFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER3002: Failed to get docker info: {0}.
         /// </summary>
@@ -266,7 +266,7 @@ internal static string DockerInfoFailed_Ex {
                 return ResourceManager.GetString("DockerInfoFailed_Ex", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER4006: Property &apos;{0}&apos; is empty or contains whitespace and will be ignored..
         /// </summary>
@@ -275,7 +275,7 @@ internal static string EmptyOrWhitespacePropertyIgnored {
                 return ResourceManager.GetString("EmptyOrWhitespacePropertyIgnored", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER4004: Items &apos;{0}&apos; contain empty item(s) which will be ignored..
         /// </summary>
@@ -284,7 +284,7 @@ internal static string EmptyValuesIgnored {
                 return ResourceManager.GetString("EmptyValuesIgnored", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2023: A ContainerEntrypoint and ContainerAppCommandArgs are provided. ContainerAppInstruction must be set to configure how the application is started. Valid instructions are {0}..
         /// </summary>
@@ -293,7 +293,7 @@ internal static string EntrypointAndAppCommandArgsSetNoAppCommandInstruction {
                 return ResourceManager.GetString("EntrypointAndAppCommandArgsSetNoAppCommandInstruction", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2024: ContainerEntrypointArgs are provided without specifying a ContainerEntrypoint..
         /// </summary>
@@ -302,7 +302,7 @@ internal static string EntrypointArgsSetNoEntrypoint {
                 return ResourceManager.GetString("EntrypointArgsSetNoEntrypoint", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2029: ContainerEntrypointArgsSet are provided. Change to use ContainerAppCommandArgs for arguments that must always be set, or ContainerDefaultArgs for arguments that can be overridden when the container is created..
         /// </summary>
@@ -311,7 +311,7 @@ internal static string EntrypointArgsSetPreferAppCommandArgs {
                 return ResourceManager.GetString("EntrypointArgsSetPreferAppCommandArgs", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2028: ContainerEntrypoint can not be combined with ContainerAppCommandInstruction &apos;{0}&apos;..
         /// </summary>
@@ -320,7 +320,7 @@ internal static string EntrypointConflictAppCommand {
                 return ResourceManager.GetString("EntrypointConflictAppCommand", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2027: A ContainerEntrypoint is provided. ContainerAppInstruction must be set to configure how the application is started. Valid instructions are {0}..
         /// </summary>
@@ -329,7 +329,7 @@ internal static string EntrypointSetNoAppCommandInstruction {
                 return ResourceManager.GetString("EntrypointSetNoAppCommandInstruction", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1008: Failed retrieving credentials for &quot;{0}&quot;: {1}.
         /// </summary>
@@ -338,7 +338,7 @@ internal static string FailedRetrievingCredentials {
                 return ResourceManager.GetString("FailedRetrievingCredentials", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2030: GenerateLabels was disabled but GenerateDigestLabel was enabled - no digest label will be created..
         /// </summary>
@@ -347,7 +347,7 @@ internal static string GenerateDigestLabelWithoutGenerateLabels {
                 return ResourceManager.GetString("GenerateDigestLabelWithoutGenerateLabels", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to No host object detected..
         /// </summary>
@@ -356,7 +356,7 @@ internal static string HostObjectNotDetected {
                 return ResourceManager.GetString("HostObjectNotDetected", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Pushed image index &apos;{0}&apos; to registry &apos;{1}&apos;..
         /// </summary>
@@ -365,7 +365,7 @@ internal static string ImageIndexUploadedToRegistry {
                 return ResourceManager.GetString("ImageIndexUploadedToRegistry", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1009: Failed to load image from local registry. stdout: {0}.
         /// </summary>
@@ -374,7 +374,7 @@ internal static string ImageLoadFailed {
                 return ResourceManager.GetString("ImageLoadFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1010: Pulling images from local registry is not supported..
         /// </summary>
@@ -383,7 +383,7 @@ internal static string ImagePullNotSupported {
                 return ResourceManager.GetString("ImagePullNotSupported", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Cannot create image index because no images were provided..
         /// </summary>
@@ -392,7 +392,16 @@ internal static string ImagesEmpty {
                 return ResourceManager.GetString("ImagesEmpty", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to CONTAINER2031: The container image format &apos;{0}&apos; is not supported. Supported formats are &apos;{1}&apos;..
+        /// </summary>
+        internal static string InvalidContainerImageFormat {
+            get {
+                return ResourceManager.GetString("InvalidContainerImageFormat", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2015: {0}: &apos;{1}&apos; was not a valid Environment Variable. Ignoring..
         /// </summary>
@@ -401,7 +410,7 @@ internal static string InvalidEnvVar {
                 return ResourceManager.GetString("InvalidEnvVar", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Cannot create image index because provided images are invalid. Items must have &apos;Config&apos;, &apos;Manifest&apos;, &apos;ManifestMediaType&apos; and &apos;ManifestDigest&apos; metadata..
         /// </summary>
@@ -410,7 +419,7 @@ internal static string InvalidImageMetadata {
                 return ResourceManager.GetString("InvalidImageMetadata", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Cannot create image index because at least one of the provided images manifest is invalid..
         /// </summary>
@@ -473,7 +482,7 @@ internal static string InvalidImageName_EntireNameIsInvalidCharacters {
                 return ResourceManager.GetString("InvalidImageName_EntireNameIsInvalidCharacters", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2005: The first character of the image name &apos;{0}&apos; must be a lowercase letter or a digit and all characters in the name must be an alphanumeric character, -, /, or _..
         /// </summary>
@@ -482,7 +491,7 @@ internal static string InvalidImageName_NonAlphanumericStartCharacter {
                 return ResourceManager.GetString("InvalidImageName_NonAlphanumericStartCharacter", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2017: A ContainerPort item was provided with an invalid port number &apos;{0}&apos;. ContainerPort items must have an Include value that is an integer, and a Type value that is either &apos;tcp&apos; or &apos;udp&apos;..
         /// </summary>
@@ -491,7 +500,7 @@ internal static string InvalidPort_Number {
                 return ResourceManager.GetString("InvalidPort_Number", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2017: A ContainerPort item was provided with an invalid port number &apos;{0}&apos; and an invalid port type &apos;{1}&apos;. ContainerPort items must have an Include value that is an integer, and a Type value that is either &apos;tcp&apos; or &apos;udp&apos;..
         /// </summary>
@@ -500,7 +509,7 @@ internal static string InvalidPort_NumberAndType {
                 return ResourceManager.GetString("InvalidPort_NumberAndType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2017: A ContainerPort item was provided with an invalid port type &apos;{0}&apos;. ContainerPort items must have an Include value that is an integer, and a Type value that is either &apos;tcp&apos; or &apos;udp&apos;..
         /// </summary>
@@ -509,7 +518,7 @@ internal static string InvalidPort_Type {
                 return ResourceManager.GetString("InvalidPort_Type", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2018: Invalid SDK prerelease version &apos;{0}&apos; - only &apos;rc&apos; and &apos;preview&apos; are supported..
         /// </summary>
@@ -518,7 +527,7 @@ internal static string InvalidSdkPrereleaseVersion {
                 return ResourceManager.GetString("InvalidSdkPrereleaseVersion", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2019: Invalid SDK semantic version &apos;{0}&apos;..
         /// </summary>
@@ -527,7 +536,7 @@ internal static string InvalidSdkVersion {
                 return ResourceManager.GetString("InvalidSdkVersion", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2007: Invalid {0} provided: {1}. Image tags must be alphanumeric, underscore, hyphen, or period..
         /// </summary>
@@ -536,7 +545,7 @@ internal static string InvalidTag {
                 return ResourceManager.GetString("InvalidTag", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2010: Invalid {0} provided: {1}. {0} must be a semicolon-delimited list of valid image tags. Image tags must be alphanumeric, underscore, hyphen, or period..
         /// </summary>
@@ -545,7 +554,7 @@ internal static string InvalidTags {
                 return ResourceManager.GetString("InvalidTags", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Invalid string[] TargetRuntimeIdentifiers. Either all should be &apos;linux-musl&apos; or none..
         /// </summary>
@@ -554,7 +563,7 @@ internal static string InvalidTargetRuntimeIdentifiers {
                 return ResourceManager.GetString("InvalidTargetRuntimeIdentifiers", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1003: Token response had neither token nor access_token..
         /// </summary>
@@ -563,7 +572,7 @@ internal static string InvalidTokenResponse {
                 return ResourceManager.GetString("InvalidTokenResponse", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER4005: Item &apos;{0}&apos; contains items without metadata &apos;Value&apos;, and they will be ignored..
         /// </summary>
@@ -572,7 +581,7 @@ internal static string ItemsWithoutMetadata {
                 return ResourceManager.GetString("ItemsWithoutMetadata", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Error while reading daemon config: {0}.
         /// </summary>
@@ -581,7 +590,7 @@ internal static string LocalDocker_FailedToGetConfig {
                 return ResourceManager.GetString("LocalDocker_FailedToGetConfig", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to The daemon server reported errors: {0}.
         /// </summary>
@@ -590,7 +599,7 @@ internal static string LocalDocker_LocalDaemonErrors {
                 return ResourceManager.GetString("LocalDocker_LocalDaemonErrors", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1012: The local registry is not available, but pushing to a local registry was requested..
         /// </summary>
@@ -599,7 +608,7 @@ internal static string LocalRegistryNotAvailable {
                 return ResourceManager.GetString("LocalRegistryNotAvailable", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2004: Unable to download layer with descriptor &apos;{0}&apos; from registry &apos;{1}&apos; because it does not exist..
         /// </summary>
@@ -608,7 +617,7 @@ internal static string MissingLinkToRegistry {
                 return ResourceManager.GetString("MissingLinkToRegistry", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2016: ContainerPort item &apos;{0}&apos; does not specify the port number. Please ensure the item&apos;s Include is a port number, for example &apos;&lt;ContainerPort Include=&quot;80&quot; /&gt;&apos;.
         /// </summary>
@@ -617,7 +626,7 @@ internal static string MissingPortNumber {
                 return ResourceManager.GetString("MissingPortNumber", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to &apos;mediaType&apos; of manifests should be the same in image index..
         /// </summary>
@@ -626,7 +635,7 @@ internal static string MixedMediaTypes {
                 return ResourceManager.GetString("MixedMediaTypes", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1004: No RequestUri specified..
         /// </summary>
@@ -635,7 +644,7 @@ internal static string NoRequestUriSpecified {
                 return ResourceManager.GetString("NoRequestUriSpecified", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to &apos;{0}&apos; was not a valid container image name, it was normalized to &apos;{1}&apos;.
         /// </summary>
@@ -645,6 +654,16 @@ internal static string NormalizedContainerName {
             }
         }
 
+
+        /// <summary>
+        ///   Looks up a localized string similar to Unable to create tarball for oci image with multiple tags..
+        /// </summary>
+        internal static string OciImageMultipleTagsNotSupported {
+            get {
+                return ResourceManager.GetString("OciImageMultipleTagsNotSupported", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2011: {0} &apos;{1}&apos; does not exist.
         /// </summary>
@@ -653,7 +672,7 @@ internal static string PublishDirectoryDoesntExist {
                 return ResourceManager.GetString("PublishDirectoryDoesntExist", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Uploaded config to registry..
         /// </summary>
@@ -662,7 +681,7 @@ internal static string Registry_ConfigUploaded {
                 return ResourceManager.GetString("Registry_ConfigUploaded", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Uploading config to registry at blob &apos;{0}&apos;,.
         /// </summary>
@@ -671,7 +690,7 @@ internal static string Registry_ConfigUploadStarted {
                 return ResourceManager.GetString("Registry_ConfigUploadStarted", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Layer &apos;{0}&apos; already exists..
         /// </summary>
@@ -680,7 +699,7 @@ internal static string Registry_LayerExists {
                 return ResourceManager.GetString("Registry_LayerExists", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Finished uploading layer &apos;{0}&apos; to &apos;{1}&apos;..
         /// </summary>
@@ -689,7 +708,7 @@ internal static string Registry_LayerUploaded {
                 return ResourceManager.GetString("Registry_LayerUploaded", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Uploading layer &apos;{0}&apos; to &apos;{1}&apos;..
         /// </summary>
@@ -698,7 +717,7 @@ internal static string Registry_LayerUploadStarted {
                 return ResourceManager.GetString("Registry_LayerUploadStarted", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Uploaded manifest to &apos;{0}&apos;..
         /// </summary>
@@ -707,7 +726,7 @@ internal static string Registry_ManifestUploaded {
                 return ResourceManager.GetString("Registry_ManifestUploaded", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Uploading manifest to registry &apos;{0}&apos; as blob &apos;{1}&apos;..
         /// </summary>
@@ -716,7 +735,7 @@ internal static string Registry_ManifestUploadStarted {
                 return ResourceManager.GetString("Registry_ManifestUploadStarted", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Uploaded tag &apos;{0}&apos; to &apos;{1}&apos;..
         /// </summary>
@@ -725,7 +744,7 @@ internal static string Registry_TagUploaded {
                 return ResourceManager.GetString("Registry_TagUploaded", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Uploading tag &apos;{0}&apos; to &apos;{1}&apos;..
         /// </summary>
@@ -734,7 +753,7 @@ internal static string Registry_TagUploadStarted {
                 return ResourceManager.GetString("Registry_TagUploadStarted", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1017: Unable to communicate with the registry &apos;{0}&apos;..
         /// </summary>
@@ -743,7 +762,7 @@ internal static string RegistryOperationFailed {
                 return ResourceManager.GetString("RegistryOperationFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1013: Failed to push to the output registry: {0}.
         /// </summary>
@@ -752,7 +771,7 @@ internal static string RegistryOutputPushFailed {
                 return ResourceManager.GetString("RegistryOutputPushFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1014: Manifest pull failed..
         /// </summary>
@@ -761,7 +780,7 @@ internal static string RegistryPullFailed {
                 return ResourceManager.GetString("RegistryPullFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1005: Registry push failed; received status code &apos;{0}&apos;..
         /// </summary>
@@ -770,7 +789,7 @@ internal static string RegistryPushFailed {
                 return ResourceManager.GetString("RegistryPushFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1015: Unable to access the repository &apos;{0}&apos; at tag &apos;{1}&apos; in the registry &apos;{2}&apos;. Please confirm that this name and tag are present in the registry..
         /// </summary>
@@ -779,7 +798,7 @@ internal static string RepositoryNotFound {
                 return ResourceManager.GetString("RepositoryNotFound", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER4003: Required &apos;{0}&apos; items contain empty items..
         /// </summary>
@@ -788,7 +807,7 @@ internal static string RequiredItemsContainsEmptyItems {
                 return ResourceManager.GetString("RequiredItemsContainsEmptyItems", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER4002: Required &apos;{0}&apos; items were not set..
         /// </summary>
@@ -797,7 +816,7 @@ internal static string RequiredItemsNotSet {
                 return ResourceManager.GetString("RequiredItemsNotSet", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER4001: Required property &apos;{0}&apos; was not set or empty..
         /// </summary>
@@ -806,7 +825,7 @@ internal static string RequiredPropertyNotSetOrEmpty {
                 return ResourceManager.GetString("RequiredPropertyNotSetOrEmpty", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1006: Too many retries, stopping..
         /// </summary>
@@ -815,7 +834,7 @@ internal static string TooManyRetries {
                 return ResourceManager.GetString("TooManyRetries", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER1016: Unable to access the repository &apos;{0}&apos; in the registry &apos;{1}&apos;. Please confirm your credentials are correct and that you have access to this repository and registry..
         /// </summary>
@@ -824,7 +843,7 @@ internal static string UnableToAccessRepository {
                 return ResourceManager.GetString("UnableToAccessRepository", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2021: Unknown AppCommandInstruction &apos;{0}&apos;. Valid instructions are {1}..
         /// </summary>
@@ -833,7 +852,7 @@ internal static string UnknownAppCommandInstruction {
                 return ResourceManager.GetString("UnknownAppCommandInstruction", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2002: Unknown local registry type &apos;{0}&apos;. Valid local container registry types are {1}..
         /// </summary>
@@ -842,7 +861,7 @@ internal static string UnknownLocalRegistryType {
                 return ResourceManager.GetString("UnknownLocalRegistryType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2003: The manifest for {0}:{1} from registry {2} was an unknown type: {3}. Please raise an issue at https://github.com/dotnet/sdk-container-builds/issues with this message..
         /// </summary>
@@ -851,7 +870,7 @@ internal static string UnknownMediaType {
                 return ResourceManager.GetString("UnknownMediaType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to CONTAINER2001: Unrecognized mediaType &apos;{0}&apos;..
         /// </summary>
@@ -860,7 +879,7 @@ internal static string UnrecognizedMediaType {
                 return ResourceManager.GetString("UnrecognizedMediaType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Cannot create image index for the provided &apos;mediaType&apos; = &apos;{0}&apos;..
         /// </summary>
@@ -869,7 +888,7 @@ internal static string UnsupportedMediaType {
                 return ResourceManager.GetString("UnsupportedMediaType", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Unable to create tarball for mediaType &apos;{0}&apos;..
         /// </summary>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
index bac283c4ac0c..b0e7350da710 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.resx
@@ -481,4 +481,8 @@
     <value>CONTAINER2030: GenerateLabels was disabled but GenerateDigestLabel was enabled - no digest label will be created.</value>
     <comment>{StrBegin="CONTAINER2030: "}</comment>
   </data>
+  <data name="InvalidContainerImageFormat" xml:space="preserve">
+    <value>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</value>
+    <comment>{StrBegins="CONTAINER2031: "}</comment>
+  </data>
 </root>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
index f916d5f3d916..383c7346ddca 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.cs.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: '{1}' není platná proměnná prostředí. Ignorování.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
index d0ac67812ab7..f273669dca6c 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.de.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: „{1}“ war keine gültige Umgebungsvariable. Sie wird ignoriert.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
index b1febfedfbc6..fb785d4e4f7d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.es.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: "{1}" no era una variable de entorno válida. Ignorando.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
index 2566778c2a07..ff593f5316cb 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.fr.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0} : '{1}' n’était pas une variable d’environnement valide. Ignorant.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
index e6b319944c11..0a8f8a977150 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.it.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: '{1}' non è una variabile di ambiente valida. Il valore verrà ignorato.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
index 16e01793da1d..6cf8d131368c 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ja.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: '{1}' は有効な環境変数ではありませんでした。無視しています。</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
index 370181275c81..77de4d142dd3 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ko.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: '{1}'은(는) 유효한 환경 변수가 아닙니다. 무시 중.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
index d92686d7d371..6eeb96f72d6d 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pl.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: „{1}” nie jest prawidłową zmienną środowiskową. Ignorowanie.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
index 651ea8dd65b6..9686e1444a08 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.pt-BR.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: '{1}' não era uma variável de ambiente válida. Ignorando.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
index a52774d219e5..8b942db5bfef 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.ru.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: "{1}" не является допустимой переменной среды. Пропуск.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
index f513dfc84940..146196fba1bc 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.tr.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: '{1}' geçerli bir Ortam Değişkeni değildi. Görmezden geliniyor.</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
index 82b415641aa9..ab3a5f1b5993 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hans.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: "{1}" 不是有效的环境变量。忽略。</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
index ef91ab2848e8..9a144ff7f80b 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Containers/Microsoft.NET.Build.Containers/Resources/xlf/Strings.zh-Hant.xlf
@@ -204,6 +204,11 @@
         <target state="new">Cannot create image index because no images were provided.</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidContainerImageFormat">
+        <source>CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</source>
+        <target state="new">CONTAINER2031: The container image format '{0}' is not supported. Supported formats are '{1}'.</target>
+        <note>{StrBegins="CONTAINER2031: "}</note>
+      </trans-unit>
       <trans-unit id="InvalidEnvVar">
         <source>CONTAINER2015: {0}: '{1}' was not a valid Environment Variable. Ignoring.</source>
         <target state="translated">CONTAINER2015: {0}: '{1}' 不是有效的環境變數。正在忽略。</target>
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
index b23a8482f3cf..5ce5a7286fce 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.Interface.cs
@@ -161,6 +161,10 @@ partial class CreateNewImage
     public bool GenerateDigestLabel { get; set; }
 
     /// <summary>
+    /// Set to either 'OCI', 'Docker', or null. If unset, the generated images' mediaType will be that of the base image. If set, the generated image will be given the specified media type.
+    /// </summary>
+    public string? ImageFormat { get; set; }
+
     /// If true, the tooling will skip the publishing step.
     /// </summary>
     public bool SkipPublishing { get; set; }
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
index df46fd354709..b0f4899f75e8 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs
@@ -125,6 +125,24 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             ( Strings.ContainerBuilder_StartBuildingImage, new object[] { Repository, String.Join(",", ImageTags), sourceImageReference });
         Log.LogMessage(MessageImportance.High, message, parameters);
 
+        // forcibly change the media type if required
+        if (ImageFormat is not null)
+        {
+            if (Enum.TryParse<KnownImageFormats>(ImageFormat, out var imageFormat))
+            {
+                imageBuilder.ManifestMediaType = imageFormat switch
+                {
+                    KnownImageFormats.Docker => SchemaTypes.DockerManifestV2,
+                    KnownImageFormats.OCI => SchemaTypes.OciManifestV1,
+                    _ => imageBuilder.ManifestMediaType // should be impossible unless we add to the enum
+                };
+            }
+            else
+            {
+                Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidContainerImageFormat), ImageFormat, string.Join(",", Enum.GetValues<KnownImageFormats>()));
+            }
+        }
+
         Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
         imageBuilder.AddLayer(newLayer);
         imageBuilder.SetWorkingDirectory(WorkingDirectory);
diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs
index 51869ccb6c54..d2ac3dbe0313 100644
--- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs
+++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs
@@ -119,6 +119,10 @@ internal string GenerateCommandLineCommandsInt()
         {
             builder.AppendSwitchIfNotNull("--appcommandinstruction ", AppCommandInstruction);
         }
+        if (!string.IsNullOrWhiteSpace(ImageFormat))
+        {
+            builder.AppendSwitchIfNotNull("--image-format ", ImageFormat);
+        }
 
         AppendSwitchIfNotNullSanitized(builder, "--entrypoint ", nameof(Entrypoint), Entrypoint);
         AppendSwitchIfNotNullSanitized(builder, "--entrypointargs ", nameof(EntrypointArgs), EntrypointArgs);
diff --git a/src/Containers/containerize/ContainerizeCommand.cs b/src/Containers/containerize/ContainerizeCommand.cs
index 52b7e390b503..d611fb3e154d 100644
--- a/src/Containers/containerize/ContainerizeCommand.cs
+++ b/src/Containers/containerize/ContainerizeCommand.cs
@@ -197,6 +197,11 @@ internal class ContainerizeCommand : CliRootCommand
         Arity = ArgumentArity.Zero
     };
 
+    internal CliOption<KnownImageFormats?> ImageFormatOption { get; } = new("--image-format")
+    {
+        Description = "If set to OCI or Docker will force the generated image to be that format. If unset, the base images format will be used."
+    };
+
     internal ContainerizeCommand() : base("Containerize an application without Docker.")
     {
         PublishDirectoryArgument.AcceptLegalFilePathsOnly();
@@ -225,6 +230,7 @@ internal ContainerizeCommand() : base("Containerize an application without Docke
         this.Options.Add(ContainerUserOption);
         this.Options.Add(GenerateLabelsOption);
         this.Options.Add(GenerateDigestLabelOption);
+        this.Options.Add(ImageFormatOption);
 
         this.SetAction(async (parseResult, cancellationToken) =>
         {
@@ -252,6 +258,7 @@ internal ContainerizeCommand() : base("Containerize an application without Docke
             string? _containerUser = parseResult.GetValue(ContainerUserOption);
             bool _generateLabels = parseResult.GetValue(GenerateLabelsOption);
             bool _generateDigestLabel = parseResult.GetValue(GenerateDigestLabelOption);
+            KnownImageFormats? _imageFormat = parseResult.GetValue(ImageFormatOption);
 
             //setup basic logging
             bool traceEnabled = Env.GetEnvironmentVariableAsBool("CONTAINERIZE_TRACE_LOGGING_ENABLED");
@@ -283,6 +290,7 @@ await ContainerBuilder.ContainerizeAsync(
                 _archiveOutputPath,
                 _generateLabels,
                 _generateDigestLabel,
+                _imageFormat,
                 loggerFactory,
                 cancellationToken).ConfigureAwait(false);
         });
diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index d7cf4bc5ecbf..ff22ed811e83 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -255,6 +255,7 @@
                     BaseRegistry="$(ContainerBaseRegistry)"
                     BaseImageName="$(ContainerBaseName)"
                     BaseImageTag="$(ContainerBaseTag)"
+                    ImageFormat="$(ContainerImageFormat)"
                     LocalRegistry="$(LocalRegistry)"
                     OutputRegistry="$(ContainerRegistry)"
                     ArchiveOutputPath="$(ContainerArchiveOutputPath)"
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs
index cf25db4b0309..f6a8e0823117 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs
@@ -295,6 +295,72 @@ public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
         Assert.Equal(RootlessUser, imageBuilder.BaseImageConfig.GetUser());
     }
 
+
+    [DockerAvailableFact]
+    public void CanOverrideContainerImageFormat()
+    {
+        DirectoryInfo newProjectDir = new(GetTestDirectoryName());
+
+        if (newProjectDir.Exists)
+        {
+            newProjectDir.Delete(recursive: true);
+        }
+
+        newProjectDir.Create();
+
+        new DotnetNewCommand(_testOutput, "console", "-f", ToolsetInfo.CurrentTargetFramework)
+            .WithVirtualHive()
+            .WithWorkingDirectory(newProjectDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetCommand(_testOutput, "build", "--configuration", "release")
+            .WithWorkingDirectory(newProjectDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        ParseContainerProperties pcp = new();
+        (IBuildEngine buildEngine, List<string?> errors) = SetupBuildEngine();
+        pcp.BuildEngine = buildEngine;
+
+        pcp.FullyQualifiedBaseImageName = "mcr.microsoft.com/dotnet/runtime:9.0";
+        pcp.ContainerRegistry = "localhost:5010";
+        pcp.ContainerRepository = "dotnet/testimage";
+        pcp.ContainerImageTags = new[] { "5.0", "latest" };
+
+        Assert.True(pcp.Execute(), FormatBuildMessages(errors));
+        Assert.Equal("mcr.microsoft.com", pcp.ParsedContainerRegistry);
+        Assert.Equal("dotnet/runtime", pcp.ParsedContainerImage);
+        Assert.Equal("9.0", pcp.ParsedContainerTag);
+
+        Assert.Equal("dotnet/testimage", pcp.NewContainerRepository);
+        pcp.NewContainerTags.Should().BeEquivalentTo(new[] { "5.0", "latest" });
+
+        CreateNewImage cni = new();
+        (buildEngine, errors) = SetupBuildEngine();
+        cni.BuildEngine = buildEngine;
+
+        cni.BaseRegistry = pcp.ParsedContainerRegistry;
+        cni.BaseImageName = pcp.ParsedContainerImage;
+        cni.BaseImageTag = pcp.ParsedContainerTag;
+        cni.Repository = pcp.NewContainerRepository;
+        cni.OutputRegistry = "localhost:5010";
+        cni.PublishDirectory = Path.Combine(newProjectDir.FullName, "bin", "release", ToolsetInfo.CurrentTargetFramework);
+        cni.WorkingDirectory = "app/";
+        cni.Entrypoint = new TaskItem[] { new(newProjectDir.Name) };
+        cni.ImageTags = pcp.NewContainerTags;
+        cni.ContainerRuntimeIdentifier = "linux-x64";
+        cni.RuntimeIdentifierGraphPath = ToolsetUtils.GetRuntimeGraphFilePath();
+
+        cni.ImageFormat = KnownImageFormats.OCI.ToString();
+
+        Assert.True(cni.Execute(), FormatBuildMessages(errors));
+
+        cni.GeneratedContainerMediaType.Should().Be(SchemaTypes.OciManifestV1);
+        newProjectDir.Delete(true);
+    }
+
+
     private static (IBuildEngine buildEngine, List<string?> errors) SetupBuildEngine()
     {
         List<string?> errors = new();

From 187b72fe9c1227b2dc86d1855b28c10a13f01a70 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 05:01:43 +0000
Subject: [PATCH 119/127] Update dependencies from
 https://github.com/dotnet/msbuild build 20250211.4

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.11.24-servicing-25072-01 -> To Version 17.11.26-servicing-25111-04
---
 NuGet.config            | 16 +---------------
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index d00403e2a50e..e201daa389a7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -19,7 +19,7 @@
     <add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-89b5892" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-89b58924/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-2b19be4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2b19be47/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
@@ -29,20 +29,6 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d0d8b2d661f5..03c5c951a3fa 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.11.24">
+    <Dependency Name="Microsoft.Build" Version="17.11.26">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>89b58924da213679505c63060e5c84786865000f</Sha>
+      <Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.11.24-servicing-25072-01">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.11.26-servicing-25111-04">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>89b58924da213679505c63060e5c84786865000f</Sha>
+      <Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.24-servicing-25072-01">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.26-servicing-25111-04">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>89b58924da213679505c63060e5c84786865000f</Sha>
+      <Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index 9394d0576e44..d35dd056c48f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,7 +124,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.11.24</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.11.26</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
     <MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.11.24-servicing-25072-01</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.11.26-servicing-25111-04</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From 998c820d230282f70375f1fcaac776a0e42fe136 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 05:01:48 +0000
Subject: [PATCH 120/127] Update dependencies from
 https://github.com/dotnet/arcade build 20250211.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25105.2 -> To Version 8.0.0-beta.25111.4
---
 NuGet.config            | 14 --------------
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  6 +++---
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index d00403e2a50e..472927744622 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -29,20 +29,6 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d0d8b2d661f5..88f3478a182b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25105.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
+      <Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25105.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25111.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
+      <Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25105.2">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25111.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
+      <Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25105.2">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25111.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
+      <Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9394d0576e44..87caab4cf055 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25105.2</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25111.4</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25105.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25111.4</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 2822f1b3cfa8..ba40e5c7d5b5 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.112",
+    "dotnet": "8.0.113",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25111.4",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25111.4"
   }
 }

From 37052dc78e4baf15fc302afd1efa3fc58bd49dfe Mon Sep 17 00:00:00 2001
From: ProductConstructionServiceProd <ProductConstructionServiceProd>
Date: Wed, 12 Feb 2025 05:02:35 +0000
Subject: [PATCH 121/127] Merged PR 47537: [internal/release/8.0.4xx] Update
 dependencies from dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.12 to 8.0.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 82bc8158-ef88-4a27-3f7b-08dca299e604
- **Build**: 20250211.10
- **Date Produced**: February 12, 2025 3:38:00 AM UTC
- **Commit**: d8ee7c837b53a52795d374c694ff2c72b62bcef0
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.3 to 8.0.3][1]
  - **Microsoft.NET.HostModel**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 8.0.13 to 8.0.14][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.13 to 8.0.14][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.13 to 8.0.14][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.13 to 8.0.14][1]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.13 to 8.0.14][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1]
  - **System.Formats.Asn1**: [from 8.0.2 to 8.0.2][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1]
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.12 to 8.0.14][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&targetVersion=GCd8ee7c837b53a52795d374c694ff2c72b62bcef0&_a=files
[2]: https://github.com/dotnet/emsdk/compare/c458a7647c...ec84e775d2

[DependencyUpdate]: <> (End)

[marker]: <> (End:82bc8158-ef88-4a27-3f7b-08dca299e604)
---
 NuGet.config            | 55 ++++++++++++++++++++++++++---------------
 eng/Version.Details.xml | 44 ++++++++++++++++-----------------
 eng/Versions.props      | 14 +++++------
 3 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index a1a9e2ecd946..48a1c1283e52 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,16 +4,21 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-89b5892" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-89b58924/nuget/v3/index.json" />
@@ -21,27 +26,21 @@
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-d8ee7c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d8ee7c83/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -68,14 +67,30 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="true" />
     <add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
     <!--  Begin: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-eba546b" value="true" />
+    <add key="darc-int-dotnet-runtime-d8ee7c8" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b7c3de6188e3..773e9c1f210d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -14,46 +14,46 @@
       <Sha>5d99405601e2672cd496087efc51611f1fc0d860</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.13">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.13-servicing.25066.9">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25111.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.13-servicing.25066.9">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.14-servicing.25111.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.13">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.13">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.13-servicing.25066.9">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.14-servicing.25111.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.13-servicing.25066.9">
+    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.14-servicing.25111.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.13">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.12" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.14" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
+      <Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.11.24">
       <Uri>https://github.com/dotnet/msbuild</Uri>
@@ -200,13 +200,13 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>7855c9b221686104532ebf3380f2d45b3613b369</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.13">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
     <Dependency Name="System.Formats.Asn1" Version="8.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
     <Dependency Name="System.CodeDom" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -408,7 +408,7 @@
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
     <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
+      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.1">
diff --git a/eng/Versions.props b/eng/Versions.props
index b8e291def448..780c54a17c24 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -51,19 +51,19 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>8.0.13</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.13-servicing.25066.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.13</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.14</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.14-servicing.25111.10</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.13</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>8.0.13-servicing.25066.9</MicrosoftNETHostModelVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.14</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETHostModelVersion>8.0.14-servicing.25111.10</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>8.0.1</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>8.0.13</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>8.0.14</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
     <MicrosoftExtensionsObjectPoolPackageVersion>8.0.13</MicrosoftExtensionsObjectPoolPackageVersion>
@@ -229,7 +229,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Workloads from dotnet/emsdk -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.12</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.14</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
     <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion>
     <!-- emsdk workload prerelease version band must match the emsdk feature band -->
     <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))</EmscriptenWorkloadFeatureBand>

From b7c80c2a949ff6561485c4dd87485341113cfb0c Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 12 Feb 2025 23:18:53 +0000
Subject: [PATCH 122/127] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build
 20250212.3

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.13 -> To Version 8.0.14

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 8.0.13-servicing.25066.5 -> To Version 8.0.14-servicing.25112.3 (parent: Microsoft.WindowsDesktop.App.Ref
---
 NuGet.config            | 20 ++------------------
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      |  2 +-
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index ed1a8cc91931..03dfb00ac3ef 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -32,15 +32,7 @@
     <add key="darc-pub-dotnet-templating-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-8/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-7/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-6/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-69887e8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-69887e87/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -83,15 +75,7 @@
     <add key="darc-int-dotnet-runtime-d8ee7c8" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-3" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-4" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-5" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-6" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-7" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d-8" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-69887e8" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 728b1913fb61..c93b2eb9ed83 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -228,25 +228,25 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.13">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>e43b37de7d5916352702dda1b65d98dd66f5f9f4</Sha>
+      <Sha>69887e87036c6dcd5353f22004673f984e730c9c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.13-servicing.25067.2">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.14-servicing.25112.3">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>e43b37de7d5916352702dda1b65d98dd66f5f9f4</Sha>
+      <Sha>69887e87036c6dcd5353f22004673f984e730c9c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.13">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>e43b37de7d5916352702dda1b65d98dd66f5f9f4</Sha>
+      <Sha>69887e87036c6dcd5353f22004673f984e730c9c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.13-servicing.25067.2">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.14-servicing.25112.3">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>e43b37de7d5916352702dda1b65d98dd66f5f9f4</Sha>
+      <Sha>69887e87036c6dcd5353f22004673f984e730c9c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.13-servicing.25066.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.14-servicing.25112.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>b7c5b2dd5e9b61459c7ba2e58f306029ec791c0d</Sha>
+      <Sha>8cb5046180a4017a2deebd673641844bd5e9d444</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 66eabe98ed57..61ccc5b0a489 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -185,7 +185,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
-    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.13-servicing.25066.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.14-servicing.25112.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Manually updated">
     <!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

From 4ad620175d816b37ff3e0b76cca2059358eec89f Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 12 Feb 2025 23:19:07 +0000
Subject: [PATCH 123/127] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250211.18

Microsoft.Extensions.Logging.Abstractions , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Formats.Asn1 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0
 From Version 8.0.3 -> To Version 8.0.3
---
 NuGet.config            |  4 ++--
 eng/Version.Details.xml | 30 +++++++++++++++---------------
 eng/Versions.props      |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 03dfb00ac3ef..8d1295320a98 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -26,7 +26,7 @@
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-d8ee7c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d8ee7c83/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
@@ -72,7 +72,7 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-d8ee7c8" value="true" />
+    <add key="darc-int-dotnet-runtime-1584e49" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-69887e8" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c93b2eb9ed83..aa5b27ce8ccc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -16,32 +16,32 @@
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25111.10">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25111.18">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.14-servicing.25111.10">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.14-servicing.25111.18">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.14-servicing.25111.10">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.14-servicing.25111.18">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.14-servicing.25111.10">
+    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.14-servicing.25111.18">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -49,7 +49,7 @@
     </Dependency>
     <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.14" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
@@ -202,11 +202,11 @@
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
     <Dependency Name="System.Formats.Asn1" Version="8.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
     <Dependency Name="System.CodeDom" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -408,7 +408,7 @@
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
     <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
+      <Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
     </Dependency>
     <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
     <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.1">
diff --git a/eng/Versions.props b/eng/Versions.props
index 61ccc5b0a489..bb7578a76a3c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -52,12 +52,12 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
     <MicrosoftNETCoreAppRefPackageVersion>8.0.14</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.14-servicing.25111.10</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.14-servicing.25111.18</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.14</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>8.0.14-servicing.25111.10</MicrosoftNETHostModelVersion>
+    <MicrosoftNETHostModelVersion>8.0.14-servicing.25111.18</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>

From bfcecb601594df59ede30cfad044772adb10a02d Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 12 Feb 2025 23:19:18 +0000
Subject: [PATCH 124/127] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250212.9

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.13-servicing.25066.10 -> To Version 8.0.14-servicing.25112.9
---
 NuGet.config            | 20 ++----------
 eng/Version.Details.xml | 72 ++++++++++++++++++++---------------------
 eng/Versions.props      | 16 ++++-----
 3 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 8d1295320a98..523760a5a609 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,15 +10,7 @@
     <add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-8/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-7/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-6/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-de7b00c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-de7b00c4/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-2b19be4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2b19be47/nuget/v3/index.json" />
@@ -59,15 +51,7 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-de7b00c" value="true" />
     <!--  Begin: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index aa5b27ce8ccc..81dac081bde6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,13 +111,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>bc1c3011064a493b0ca527df6fb7215e2e5cfa96</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.13">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.11.1-rc.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
@@ -248,50 +248,50 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
       <Sha>8cb5046180a4017a2deebd673641844bd5e9d444</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.13">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.13">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.13-servicing.25066.10">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.14-servicing.25112.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24577.3">
       <Uri>https://github.com/dotnet/razor</Uri>
@@ -306,21 +306,21 @@
       <Uri>https://github.com/dotnet/razor</Uri>
       <Sha>c937db618f8c8739c6fa66ab4ca541344a468fdc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.13">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.13">
+    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.13">
+    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="8.0.13">
+    <Dependency Name="Microsoft.JSInterop" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
       <Uri>https://github.com/dotnet/xdt</Uri>
@@ -437,9 +437,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.13">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>009e1ccafde4086ea52999e878f6e7aa5a7c4ccf</Sha>
+      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index bb7578a76a3c..a43e4b825c24 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -66,7 +66,7 @@
     <MicrosoftNETILLinkTasksPackageVersion>8.0.14</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsObjectPoolPackageVersion>8.0.13</MicrosoftExtensionsObjectPoolPackageVersion>
+    <MicrosoftExtensionsObjectPoolPackageVersion>8.0.14</MicrosoftExtensionsObjectPoolPackageVersion>
     <MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
     <SystemCompositionAttributedModelPackageVersion>8.0.0</SystemCompositionAttributedModelPackageVersion>
     <SystemCompositionConventionPackageVersion>8.0.0</SystemCompositionConventionPackageVersion>
@@ -169,13 +169,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.13</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.13-servicing.25066.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.13-servicing.25066.10</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.13-servicing.25066.10</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.13-servicing.25066.10</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.13-servicing.25066.10</MicrosoftAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.13</MicrosoftAspNetCoreTestHostPackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.14</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.14</MicrosoftAspNetCoreTestHostPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>

From ab9654e37c93182c426c2bc1bc2934b18bbc2e15 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Thu, 13 Feb 2025 07:56:55 +0000
Subject: [PATCH 125/127] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build
 20250212.21

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.14-servicing.25112.9 -> To Version 8.0.14-servicing.25112.21
---
 NuGet.config            |  4 +--
 eng/Version.Details.xml | 56 ++++++++++++++++++++---------------------
 eng/Versions.props      | 10 ++++----
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 523760a5a609..05bc5dbedd20 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,7 +10,7 @@
     <add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-de7b00c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-de7b00c4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-2b19be4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2b19be47/nuget/v3/index.json" />
@@ -51,7 +51,7 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-de7b00c" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
     <!--  Begin: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a998d57bf6ca..5004f692ea76 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,13 +111,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>bc1c3011064a493b0ca527df6fb7215e2e5cfa96</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.11.1-rc.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
@@ -250,48 +250,48 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.14-servicing.25112.9">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.14-servicing.25112.21">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24577.3">
       <Uri>https://github.com/dotnet/razor</Uri>
@@ -308,19 +308,19 @@
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.JSInterop" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
       <Uri>https://github.com/dotnet/xdt</Uri>
@@ -439,7 +439,7 @@
     </Dependency>
     <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>de7b00c4d2de63b521485a7faba6f3c3fe0b6294</Sha>
+      <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d1764b488d2f..f2115ae412ec 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -170,11 +170,11 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRefPackageVersion>8.0.14</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.14-servicing.25112.9</MicrosoftAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.14-servicing.25112.21</MicrosoftAspNetCoreAnalyzersPackageVersion>
     <MicrosoftAspNetCoreTestHostPackageVersion>8.0.14</MicrosoftAspNetCoreTestHostPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->

From 1a8696547a175b9bbcac79284a686d9c65f5fc2e Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Thu, 13 Feb 2025 18:18:01 +0000
Subject: [PATCH 126/127] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build
 20250212.8

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.14 -> To Version 8.0.14

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 8.0.14-servicing.25112.3 -> To Version 8.0.14-servicing.25112.6 (parent: Microsoft.WindowsDesktop.App.Ref
---
 NuGet.config            |  4 ++--
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 05bc5dbedd20..80242a2607cb 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -24,7 +24,7 @@
     <add key="darc-pub-dotnet-templating-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-69887e8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-69887e87/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-61d6d8d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-61d6d8d4/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -59,7 +59,7 @@
     <add key="darc-int-dotnet-runtime-1584e49" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-69887e8" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-61d6d8d" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5004f692ea76..bb86e3b82ae3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -230,23 +230,23 @@
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>69887e87036c6dcd5353f22004673f984e730c9c</Sha>
+      <Sha>61d6d8d41744fb25e649a338664bc05f1d1e618a</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.14-servicing.25112.3">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.14-servicing.25112.8">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>69887e87036c6dcd5353f22004673f984e730c9c</Sha>
+      <Sha>61d6d8d41744fb25e649a338664bc05f1d1e618a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>69887e87036c6dcd5353f22004673f984e730c9c</Sha>
+      <Sha>61d6d8d41744fb25e649a338664bc05f1d1e618a</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.14-servicing.25112.3">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.14-servicing.25112.8">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>69887e87036c6dcd5353f22004673f984e730c9c</Sha>
+      <Sha>61d6d8d41744fb25e649a338664bc05f1d1e618a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.14-servicing.25112.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.14-servicing.25112.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>8cb5046180a4017a2deebd673641844bd5e9d444</Sha>
+      <Sha>bc7aac6b2148cc0fd0ce48cbc7932e21b4aa5b6a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index f2115ae412ec..da912c61a004 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -185,7 +185,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
-    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.14-servicing.25112.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.14-servicing.25112.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Manually updated">
     <!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

From bdf01a4fa2ae87dbe6322c31ea52b2eefc3029f6 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Thu, 13 Feb 2025 20:33:00 +0000
Subject: [PATCH 127/127] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build
 20250213.1

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.14 -> To Version 8.0.14

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 8.0.14-servicing.25112.3 -> To Version 8.0.14-servicing.25113.2 (parent: Microsoft.WindowsDesktop.App.Ref
---
 NuGet.config            |  4 ++--
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 80242a2607cb..b99b27aa1d76 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -24,7 +24,7 @@
     <add key="darc-pub-dotnet-templating-5d99405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5d994056/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-61d6d8d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-61d6d8d4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -59,7 +59,7 @@
     <add key="darc-int-dotnet-runtime-1584e49" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-61d6d8d" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bb86e3b82ae3..ddfd21bca8e8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -230,23 +230,23 @@
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>61d6d8d41744fb25e649a338664bc05f1d1e618a</Sha>
+      <Sha>8506c0d82a3737ab3e7edce3976f11065bb57fd2</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.14-servicing.25112.8">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.14-servicing.25113.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>61d6d8d41744fb25e649a338664bc05f1d1e618a</Sha>
+      <Sha>8506c0d82a3737ab3e7edce3976f11065bb57fd2</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>61d6d8d41744fb25e649a338664bc05f1d1e618a</Sha>
+      <Sha>8506c0d82a3737ab3e7edce3976f11065bb57fd2</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.14-servicing.25112.8">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.14-servicing.25113.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>61d6d8d41744fb25e649a338664bc05f1d1e618a</Sha>
+      <Sha>8506c0d82a3737ab3e7edce3976f11065bb57fd2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.14-servicing.25112.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.14-servicing.25113.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>bc7aac6b2148cc0fd0ce48cbc7932e21b4aa5b6a</Sha>
+      <Sha>af059f93ea0cd5b695d098162f0d9b1651adb6a3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index da912c61a004..2000178115a6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -185,7 +185,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
-    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.14-servicing.25112.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.14-servicing.25113.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Manually updated">
     <!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->