From 0203fd5ffc6404154d1bfa1fcb006d1f6c71bc6c Mon Sep 17 00:00:00 2001
From: Copilot <223556219+Copilot@users.noreply.github.com>
Date: Mon, 1 Jun 2026 16:44:07 -0400
Subject: [PATCH 1/2] Produce TemplateLocator package in product build

Schedule Microsoft.DotNet.TemplateLocator as a pass-2 product build project and restore the historical NuGet package ID so official builds can pack and publish microsoft.dotnet.templateLocator again.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/Build.props                                                | 3 ++-
 .../Microsoft.DotNet.TemplateLocator.csproj                    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/Build.props b/eng/Build.props
index 9c20ef3cf4a5..25737d3a05c5 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -4,13 +4,14 @@
     <ProjectToBuild Include="$(RepoRoot)source-build.slnf" />
   </ItemGroup>
 
-  <!-- For product build, build MSBuildExtensions and VSTemplateLocator in the second build pass on win-x64 as
+  <!-- For product build, build MSBuildExtensions, TemplateLocator, and VSTemplateLocator in the second build pass on win-x64 as
        they depend on assets from other verticals that are built in the first build pass. -->
   <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
                         '$(TargetOS)' == 'windows' and
                         '$(TargetArchitecture)' == 'x64' and
                         '$(BuildWorkloads)' != 'true'">
     <ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj" DotNetBuildPass="2" />
+    <ProjectToBuild Include="$(RepoRoot)src\Microsoft.DotNet.TemplateLocator\Microsoft.DotNet.TemplateLocator.csproj" DotNetBuildPass="2" />
     <ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj" DotNetBuildPass="2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
index f1fe1cb57575..442a81d66842 100644
--- a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
+++ b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
@@ -8,6 +8,7 @@
     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
     <IsPackable>true</IsPackable>
     <IsPackable Condition="'$(DotNetBuild)' == 'true' and '$(DotNetBuildPass)' != '2'">false</IsPackable>
+    <PackageId>microsoft.dotnet.templateLocator</PackageId>
     <!-- Create FileDefinitions items for ResolveHostfxrCopyLocalContent target -->
     <EmitLegacyAssetsFileItems>true</EmitLegacyAssetsFileItems>
     <!-- https://github.com/dotnet/sdk/issues/14801 -->

From d380e05492121c8f0fe20e419d3a7efe46fb672d Mon Sep 17 00:00:00 2001
From: Emanuel Fernandez Dell'Oca <emafern@microsoft.com>
Date: Tue, 2 Jun 2026 15:58:58 -0400
Subject: [PATCH 2/2] Remove explicit TemplateLocator package ID

The default SDK pack identity already matches the project name, so keep the project file simpler while still producing the standalone TemplateLocator package in pass 2.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Microsoft.DotNet.TemplateLocator.csproj                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
index 442a81d66842..f1fe1cb57575 100644
--- a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
+++ b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
@@ -8,7 +8,6 @@
     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
     <IsPackable>true</IsPackable>
     <IsPackable Condition="'$(DotNetBuild)' == 'true' and '$(DotNetBuildPass)' != '2'">false</IsPackable>
-    <PackageId>microsoft.dotnet.templateLocator</PackageId>
     <!-- Create FileDefinitions items for ResolveHostfxrCopyLocalContent target -->
     <EmitLegacyAssetsFileItems>true</EmitLegacyAssetsFileItems>
     <!-- https://github.com/dotnet/sdk/issues/14801 -->