From ed59078629fa6cb78b1322ab0cafc7895ce023d6 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Wed, 13 Dec 2023 16:40:29 -0800
Subject: [PATCH] Use Microsoft.Build.NoTargets for the SdkResolver.csproj and
 VSTemplateLocator.csproj projects. Added the projects back to the SLN so they
 build using the proper configuration (debug/release).

---
 Microsoft.DotNet.Cli.sln                     | 22 +++++++++++++++++++-
 src/redist/projects/SdkResolver.csproj       |  5 ++---
 src/redist/projects/VSTemplateLocator.csproj |  5 ++---
 src/redist/redist.csproj                     |  4 ----
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 32a2283a9..b6bf75b01 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -21,6 +21,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{658EF9BE-452C-4D31-AA24-B9E2235799A8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "redist", "redist", "{0F9ADC9A-20D9-498C-9016-C21DBAD8615E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{3A366863-9C7B-4789-8F72-57F62DE9C71F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\redist\projects\SdkResolver.csproj", "{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSTemplateLocator", "src\redist\projects\VSTemplateLocator.csproj", "{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,17 +63,29 @@ Global
 		{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CDD151F-BFD1-4440-B9CB-772A3DE4987E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6180AD29-2F76-4E52-B8D7-211D01F9F2CB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{098D9321-1201-4974-A75E-F58EBCD98ACF} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+		{098D9321-1201-4974-A75E-F58EBCD98ACF} = {0F9ADC9A-20D9-498C-9016-C21DBAD8615E}
 		{1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+		{0F9ADC9A-20D9-498C-9016-C21DBAD8615E} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+		{3A366863-9C7B-4789-8F72-57F62DE9C71F} = {0F9ADC9A-20D9-498C-9016-C21DBAD8615E}
+		{2CDD151F-BFD1-4440-B9CB-772A3DE4987E} = {3A366863-9C7B-4789-8F72-57F62DE9C71F}
+		{6180AD29-2F76-4E52-B8D7-211D01F9F2CB} = {3A366863-9C7B-4789-8F72-57F62DE9C71F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}
diff --git a/src/redist/projects/SdkResolver.csproj b/src/redist/projects/SdkResolver.csproj
index a8313629d..c71adf315 100644
--- a/src/redist/projects/SdkResolver.csproj
+++ b/src/redist/projects/SdkResolver.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.Build.NoTargets">
 
   <PropertyGroup>
     <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
@@ -6,7 +6,6 @@
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
-    <AssemblyName>UNUSED</AssemblyName>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
@@ -17,7 +16,7 @@
     <PackageReference Include="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <Target Name="GenerateLayout" Condition=" '$(OS)' == 'Windows_NT' " BeforeTargets="AfterBuild">
+  <Target Name="GenerateLayout" Condition="'$(OS)' == 'Windows_NT'" BeforeTargets="AfterBuild">
     <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
 
     <RemoveDir Directories="$(OutputPath)" />
diff --git a/src/redist/projects/VSTemplateLocator.csproj b/src/redist/projects/VSTemplateLocator.csproj
index 7c0833feb..aaf6b5931 100644
--- a/src/redist/projects/VSTemplateLocator.csproj
+++ b/src/redist/projects/VSTemplateLocator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.Build.NoTargets">
 
   <PropertyGroup>
     <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
@@ -6,7 +6,6 @@
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
-    <AssemblyName>UNUSED</AssemblyName>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
@@ -18,7 +17,7 @@
     <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <Target Name="GenerateLayout"  Condition=" '$(OS)' == 'Windows_NT' " BeforeTargets="AfterBuild">
+  <Target Name="GenerateLayout"  Condition="'$(OS)' == 'Windows_NT'" BeforeTargets="AfterBuild">
     <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
 
     <RemoveDir Directories="$(OutputPath)" />
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 4e55d611f..43c026318 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -20,10 +20,6 @@
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="targets\DownloadPackage.csproj" />
-  </ItemGroup>
-
   <Import Project="targets\BuildCoreSdkTasks.targets" />
   <Import Project="targets\GetRuntimeInformation.targets" />
   <Import Project="targets\SetBuildDefaults.targets" />