From 407eb0f84e180dcad74021726c3d1c89a5338dd3 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Mon, 16 Sep 2024 22:02:32 +0000
Subject: [PATCH 1/2] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.15

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.135-servicing.24463.32 -> To Version 6.0.135-servicing.24466.15

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.133 -> To Version 6.0.135 (parent: Microsoft.NET.Sdk
---
 NuGet.config            | 14 ++------------
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      |  8 ++++----
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 152bf96486cc..9470a2b9a8f5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -19,12 +19,7 @@
     <add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-b66746d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-b66746d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-b66746d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-b66746d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-b66746d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-b66746d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-1e5db13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
@@ -55,12 +50,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-b357f86" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-b66746d-1" value="true" />
-    <add key="darc-int-dotnet-templating-b66746d-2" value="true" />
-    <add key="darc-int-dotnet-templating-b66746d-3" value="true" />
-    <add key="darc-int-dotnet-templating-b66746d-4" value="true" />
-    <add key="darc-int-dotnet-templating-b66746d-5" value="true" />
-    <add key="darc-int-dotnet-templating-b66746d" value="true" />
+    <add key="darc-int-dotnet-templating-1e5db13" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ddc195bf75e4..802f4b96f841 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -90,27 +90,27 @@
       <Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.133" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.135" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>b66746dd945089102c4932375063d67616bea606</Sha>
+      <Sha>1e5db134e25b38b223858e7dd497f9f8a9312f4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.133-servicing.24417.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.135-servicing.24466.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>b66746dd945089102c4932375063d67616bea606</Sha>
+      <Sha>1e5db134e25b38b223858e7dd497f9f8a9312f4e</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.133" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.135" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>b66746dd945089102c4932375063d67616bea606</Sha>
+      <Sha>1e5db134e25b38b223858e7dd497f9f8a9312f4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.135-servicing.24463.32">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.135-servicing.24466.15">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>040861c1545b11ae75ad0a86c40af20239913b49</Sha>
+      <Sha>01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.135-servicing.24463.32">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.135-servicing.24466.15">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>040861c1545b11ae75ad0a86c40af20239913b49</Sha>
+      <Sha>01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.35-servicing.24462.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 43e4f0a1c496..b24c9b414f3b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,7 +31,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.133</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.135</MicrosoftDotNetCommonItemTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -55,8 +55,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.135-servicing.24463.32</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.135-servicing.24463.32</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.135-servicing.24466.15</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.135-servicing.24466.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -115,7 +115,7 @@
     <MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
     <NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
     <MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
-    <MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.133</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.135</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
     <AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
   </PropertyGroup>
   <!-- infrastructure and test only dependencies -->

From 817d9ca990ad43d08b5ad995db5921f6354a1a73 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Tue, 17 Sep 2024 00:38:23 +0000
Subject: [PATCH 2/2] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.24

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.135-servicing.24466.15 -> To Version 6.0.135-servicing.24466.24
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 802f4b96f841..fe34771e4171 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -103,14 +103,14 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
       <Sha>1e5db134e25b38b223858e7dd497f9f8a9312f4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.135-servicing.24466.15">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.135-servicing.24466.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105</Sha>
+      <Sha>954f381d16c2d44b573890786ca2d071c217a433</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.135-servicing.24466.15">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.135-servicing.24466.24">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105</Sha>
+      <Sha>954f381d16c2d44b573890786ca2d071c217a433</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.35-servicing.24462.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index b24c9b414f3b..394ee243dc24 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -55,8 +55,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.135-servicing.24466.15</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.135-servicing.24466.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.135-servicing.24466.24</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.135-servicing.24466.24</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>