From ef6f5ce48ccbafbe7b1bf3d3adae147c9e04956c Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 24 Oct 2024 17:45:57 +0000
Subject: [PATCH] Merged PR 44319: Update to the 6.0.36 emsdk build

- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Update to the 6.0.36 emsdk build

----
#### AI description  (iteration 1)
#### PR Classification
Dependency update

#### PR Summary
This pull request updates the Emscripten SDK to version 6.0.36 and modifies related package configurations.
- `NuGet.config`: Updated package sources for `dotnet-emsdk` and added new sources for `dotnet-windowsdesktop`.
- `eng/Version.Details.xml`: Updated the version and SHA for `Microsoft.NET.Workload.Emscripten.Manifest-6.0.400`.
- `eng/Versions.props`: Updated the `MicrosoftNETWorkloadEmscriptenManifest60400Version` to 6.0.36.
---
 NuGet.config            | 13 +++++++------
 eng/Version.Details.xml |  4 ++--
 eng/Versions.props      |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 63f896782b29..5fcd1653434f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,10 +10,7 @@
     <add key="darc-int-dotnet-aspnetcore-64ea410" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-64ea4108/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-c68eace" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c68eace-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c68eace-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-c68eace-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-d440134" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d440134a/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
@@ -22,10 +19,12 @@
     <add key="darc-int-dotnet-runtime-f1dd571" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f1dd5716/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-7a8644f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7a8644f1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-320a638" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-320a638-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-320a638-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-320a638-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d-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="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -52,9 +51,11 @@
     <add key="darc-int-dotnet-runtime-f1dd571" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-7a8644f" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-320a638-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-320a638-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-320a638-3" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-320a638" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d08bbbad1821..baf05811959c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -166,9 +166,9 @@
       <Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
       <SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.35" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.36">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>c68eace1f3c11ab25cdf30a425ab3792773bb2cc</Sha>
+      <Sha>d440134ad1037c7a3c91c78fff964078f240e08c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/source-build</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 43d773b93fa4..62e7901f4a01 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -156,7 +156,7 @@
     <XamarinMacOSWorkloadManifestVersion>12.3.303</XamarinMacOSWorkloadManifestVersion>
     <XamarinTvOSWorkloadManifestVersion>15.4.303</XamarinTvOSWorkloadManifestVersion>
     <MonoWorkloadManifestVersion>6.0.5</MonoWorkloadManifestVersion>
-    <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.35</MicrosoftNETWorkloadEmscriptenManifest60400Version>
+    <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.36</MicrosoftNETWorkloadEmscriptenManifest60400Version>
     <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60400Version)</EmscriptenWorkloadManifestVersion>
   </PropertyGroup>
   <PropertyGroup>