From 08a78c8b955ecfa3ce4aa4b0af2d084ba2a59807 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 11 Apr 2025 03:19:14 +0000
Subject: [PATCH 1/4] Update dependencies from
 https://github.com/dotnet/templating build 20250410.4

Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.204 -> To Version 9.0.204
---
 NuGet.config            | 2 +-
 eng/Version.Details.xml | 6 +++---
 eng/Versions.props      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 0aed2c12d3dd..352fbee14e2e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -35,7 +35,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-029cb83" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-029cb834/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-6e72754" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6e727541/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  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 0e2e12f1a2f2..8b535d7729ce 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,11 +3,11 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.204">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>029cb834bc42a5f6091cb6e8937b14b6da02d29c</Sha>
+      <Sha>6e7275412c921599a753c88b33fe0c5ce75e50da</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.204-servicing.25209.4">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.204-servicing.25210.4">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>029cb834bc42a5f6091cb6e8937b14b6da02d29c</Sha>
+      <Sha>6e7275412c921599a753c88b33fe0c5ce75e50da</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
     <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.204-servicing.25209.4">
diff --git a/eng/Versions.props b/eng/Versions.props
index 46de742d0964..c2062b8d0a94 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -191,7 +191,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>9.0.204-servicing.25209.4</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>9.0.204-servicing.25210.4</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 44344468cdc1a636480d9e84b9227d43a5d9c3ed Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 15 Apr 2025 12:55:22 -0700
Subject: [PATCH 2/4] Update to the stable nuget version

---
 eng/Version.Details.xml | 34 +++++++++++++++++-----------------
 eng/Versions.props      | 24 ++++++++++++------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8b535d7729ce..675a9762bb7e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -139,72 +139,72 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>b96167fbfe8bd45d94e4dcda42c7d09eb5745459</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.13.2-rc.1">
+    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks.Console" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Build.Tasks.Console" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Commands" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Commands" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.CommandLine.XPlat" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.CommandLine.XPlat" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Common" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Common" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Configuration" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Configuration" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Credentials" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Credentials" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.DependencyResolver.Core" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.DependencyResolver.Core" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Frameworks" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Frameworks" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.LibraryModel" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.LibraryModel" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.ProjectModel" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.ProjectModel" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Protocol" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Protocol" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Packaging" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Packaging" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Versioning" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Versioning" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Localization" Version="6.13.2-rc.1">
+    <Dependency Name="NuGet.Localization" Version="6.13.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
diff --git a/eng/Versions.props b/eng/Versions.props
index c2062b8d0a94..d2d7810c0547 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -135,18 +135,18 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/nuget/nuget.client -->
-    <NuGetBuildTasksPackageVersion>6.13.2-rc.1</NuGetBuildTasksPackageVersion>
-    <NuGetBuildTasksConsolePackageVersion>6.13.2-rc.1</NuGetBuildTasksConsolePackageVersion>
-    <NuGetLocalizationPackageVersion>6.13.2-rc.1</NuGetLocalizationPackageVersion>
-    <NuGetBuildTasksPackPackageVersion>6.13.2-rc.1</NuGetBuildTasksPackPackageVersion>
-    <NuGetCommandLineXPlatPackageVersion>6.13.2-rc.1</NuGetCommandLineXPlatPackageVersion>
-    <NuGetProjectModelPackageVersion>6.13.2-rc.1</NuGetProjectModelPackageVersion>
-    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.2-rc.1</MicrosoftBuildNuGetSdkResolverPackageVersion>
-    <NuGetCommonPackageVersion>6.13.2-rc.1</NuGetCommonPackageVersion>
-    <NuGetConfigurationPackageVersion>6.13.2-rc.1</NuGetConfigurationPackageVersion>
-    <NuGetFrameworksPackageVersion>6.13.2-rc.1</NuGetFrameworksPackageVersion>
-    <NuGetPackagingPackageVersion>6.13.2-rc.1</NuGetPackagingPackageVersion>
-    <NuGetVersioningPackageVersion>6.13.2-rc.1</NuGetVersioningPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.13.2</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksConsolePackageVersion>6.13.2</NuGetBuildTasksConsolePackageVersion>
+    <NuGetLocalizationPackageVersion>6.13.2</NuGetLocalizationPackageVersion>
+    <NuGetBuildTasksPackPackageVersion>6.13.2</NuGetBuildTasksPackPackageVersion>
+    <NuGetCommandLineXPlatPackageVersion>6.13.2</NuGetCommandLineXPlatPackageVersion>
+    <NuGetProjectModelPackageVersion>6.13.2</NuGetProjectModelPackageVersion>
+    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.2</MicrosoftBuildNuGetSdkResolverPackageVersion>
+    <NuGetCommonPackageVersion>6.13.2</NuGetCommonPackageVersion>
+    <NuGetConfigurationPackageVersion>6.13.2</NuGetConfigurationPackageVersion>
+    <NuGetFrameworksPackageVersion>6.13.2</NuGetFrameworksPackageVersion>
+    <NuGetPackagingPackageVersion>6.13.2</NuGetPackagingPackageVersion>
+    <NuGetVersioningPackageVersion>6.13.2</NuGetVersioningPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/vstest -->

From 9fe45ce28b3214d62884d1ed241078fff7c91223 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 20:22:53 +0000
Subject: [PATCH 3/4] Update dependencies from
 https://github.com/dotnet/templating build 20250415.4

Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.204 -> To Version 9.0.204
---
 NuGet.config            | 2 +-
 eng/Version.Details.xml | 6 +++---
 eng/Versions.props      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 352fbee14e2e..951309eb26b9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -35,7 +35,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-6e72754" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6e727541/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-ad75e8e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ad75e8e2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  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 675a9762bb7e..8c8e9f332e7e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,11 +3,11 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.204">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>6e7275412c921599a753c88b33fe0c5ce75e50da</Sha>
+      <Sha>ad75e8e2fb4f2897d5884b60f10ad2e9a59d0554</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.204-servicing.25210.4">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.204-servicing.25215.4">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>6e7275412c921599a753c88b33fe0c5ce75e50da</Sha>
+      <Sha>ad75e8e2fb4f2897d5884b60f10ad2e9a59d0554</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
     <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.204-servicing.25209.4">
diff --git a/eng/Versions.props b/eng/Versions.props
index d2d7810c0547..415190abd0d6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -191,7 +191,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>9.0.204-servicing.25210.4</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>9.0.204-servicing.25215.4</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 7dec919078141d050c994992907ba754f2b38b8e Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 15 Apr 2025 13:56:47 -0700
Subject: [PATCH 4/4] revert nugetsdkresolver back to the unstable version

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

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8c8e9f332e7e..f65f15c65d35 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -139,7 +139,7 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>b96167fbfe8bd45d94e4dcda42c7d09eb5745459</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.13.2">
+    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.13.2-rc.1">
       <Uri>https://github.com/nuget/nuget.client</Uri>
       <Sha>5d81cb8da82eda8a6b47aae92d1e6f888de982ce</Sha>
     </Dependency>
diff --git a/eng/Versions.props b/eng/Versions.props
index 415190abd0d6..6c7d340e02f4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -141,7 +141,7 @@
     <NuGetBuildTasksPackPackageVersion>6.13.2</NuGetBuildTasksPackPackageVersion>
     <NuGetCommandLineXPlatPackageVersion>6.13.2</NuGetCommandLineXPlatPackageVersion>
     <NuGetProjectModelPackageVersion>6.13.2</NuGetProjectModelPackageVersion>
-    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.2</MicrosoftBuildNuGetSdkResolverPackageVersion>
+    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.2-rc.1</MicrosoftBuildNuGetSdkResolverPackageVersion>
     <NuGetCommonPackageVersion>6.13.2</NuGetCommonPackageVersion>
     <NuGetConfigurationPackageVersion>6.13.2</NuGetConfigurationPackageVersion>
     <NuGetFrameworksPackageVersion>6.13.2</NuGetFrameworksPackageVersion>