From 26661b74715a327a0fca68641f419cb01785837f Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Fri, 19 Jan 2024 19:12:53 +0000
Subject: [PATCH 1/3] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.11

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.200 -> To Version 8.0.200

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.9.0-rc.74 -> To Version 6.9.1-rc.3 (parent: Microsoft.NET.Sdk
---
 NuGet.config            |  4 ++--
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index ee1171ec6..b05f57230 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -22,7 +22,7 @@
     <add key="darc-int-dotnet-runtime-1381d5e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-b52099f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-b52099fa/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-a96621e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-a96621e7/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--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" />
@@ -47,7 +47,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-1381d5e" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-b52099f" value="true" />
+    <add key="darc-int-dotnet-sdk-a96621e" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-593444a" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6c765391e..3c2b0dd78 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -87,20 +87,20 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.200">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>b52099fa633d4a8951144072c341cf859df36b45</Sha>
+      <Sha>a96621e7a46f1549e058719777f4c12650cc5ee7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.200-rtm.24069.6">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.200-rtm.24069.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>b52099fa633d4a8951144072c341cf859df36b45</Sha>
+      <Sha>a96621e7a46f1549e058719777f4c12650cc5ee7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.200-rtm.24069.6">
+    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.200-rtm.24069.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>b52099fa633d4a8951144072c341cf859df36b45</Sha>
+      <Sha>a96621e7a46f1549e058719777f4c12650cc5ee7</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.200-rtm.24069.6">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.200-rtm.24069.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>b52099fa633d4a8951144072c341cf859df36b45</Sha>
+      <Sha>a96621e7a46f1549e058719777f4c12650cc5ee7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -159,9 +159,9 @@
       <Uri>https://github.com/dotnet/msbuild</Uri>
       <Sha>90725d08d9825ad5897029b47f600345c29125b7</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.9.0-rc.74" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
+    <Dependency Name="NuGet.Build.Tasks" Version="6.9.1-rc.3" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
+      <Sha>623fde83a3cd73cb479ec7fa03866c6116894dbf</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
diff --git a/eng/Versions.props b/eng/Versions.props
index cb3811182..b37213b7e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -86,8 +86,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.200</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>8.0.200-rtm.24069.6</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.200-rtm.24069.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>8.0.200-rtm.24069.11</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.200-rtm.24069.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -127,7 +127,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
-    <NuGetBuildTasksPackageVersion>6.9.0-rc.74</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.9.1-rc.3</NuGetBuildTasksPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/deployment-tools -->
   <PropertyGroup>

From 746e3e55e52bc944f3689bca5060463199d912bb Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 19 Jan 2024 19:51:37 +0000
Subject: [PATCH 2/3] Fix the emsdk versions.props entry

---
 eng/Versions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index b37213b7e..28210248b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -249,8 +249,8 @@
     <XamarinMacOSWorkloadManifestVersion>13.3.8825-net8-rc1</XamarinMacOSWorkloadManifestVersion>
     <XamarinTvOSWorkloadManifestVersion>16.4.8825-net8-rc1</XamarinTvOSWorkloadManifestVersion>
     <!-- Workloads from dotnet/emsdk -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
-    <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.2</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>
     <!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->

From c26160121f0b4ac08ce944ffd0f92a1a061ec2dc Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Fri, 19 Jan 2024 20:52:26 +0000
Subject: [PATCH 3/3] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.18

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.200 -> To Version 8.0.200

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.9.0-rc.74 -> To Version 6.9.1-rc.3 (parent: Microsoft.NET.Sdk
---
 NuGet.config            |  4 ++--
 eng/Version.Details.xml | 14 +++++++-------
 eng/Versions.props      |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index b05f57230..bd0c81012 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -22,7 +22,7 @@
     <add key="darc-int-dotnet-runtime-1381d5e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-a96621e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-a96621e7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-af4967d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-af4967de/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--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" />
@@ -47,7 +47,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-1381d5e" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-a96621e" value="true" />
+    <add key="darc-int-dotnet-sdk-af4967d" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-593444a" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3c2b0dd78..503791971 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -87,20 +87,20 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.200">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>a96621e7a46f1549e058719777f4c12650cc5ee7</Sha>
+      <Sha>af4967de46a87229c49f6d567028791c4c4683d0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.200-rtm.24069.11">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.200-rtm.24069.18">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>a96621e7a46f1549e058719777f4c12650cc5ee7</Sha>
+      <Sha>af4967de46a87229c49f6d567028791c4c4683d0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.200-rtm.24069.11">
+    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.200-rtm.24069.18">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>a96621e7a46f1549e058719777f4c12650cc5ee7</Sha>
+      <Sha>af4967de46a87229c49f6d567028791c4c4683d0</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.200-rtm.24069.11">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.200-rtm.24069.18">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>a96621e7a46f1549e058719777f4c12650cc5ee7</Sha>
+      <Sha>af4967de46a87229c49f6d567028791c4c4683d0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 28210248b..c9d82544c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -86,8 +86,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.200</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>8.0.200-rtm.24069.11</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.200-rtm.24069.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>8.0.200-rtm.24069.18</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.200-rtm.24069.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>