Move redist tools projects under src\Layout\redist (#47546)

Author: ViktorHofer

sdk.sln

@@ -81,11 +81,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet", "src\Cli\dotnet\do
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Layout", "Layout", "{71C279BD-E850-4A8D-9775-11CA26B8E5BA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_fsc", "src\Layout\tool_fsharp\tool_fsc.csproj", "{8274C645-CBB8-4B94-B58D-5A485FA8514C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_fsc", "src\Layout\redist\tools\tool_fsc.csproj", "{8274C645-CBB8-4B94-B58D-5A485FA8514C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_msbuild", "src\Layout\tool_msbuild\tool_msbuild.csproj", "{10D77F17-F5CB-46A1-B2A9-178615430C0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_msbuild", "src\Layout\redist\tools\tool_msbuild.csproj", "{10D77F17-F5CB-46A1-B2A9-178615430C0E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\Layout\tool_nuget\tool_nuget.csproj", "{C2DF833D-2A83-408B-8122-3038ACDFDFD0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\Layout\redist\tools\tool_nuget.csproj", "{C2DF833D-2A83-408B-8122-3038ACDFDFD0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\Layout\redist\redist.csproj", "{AA273ACB-56FE-4F0C-8CC9-C2C45D31491D}"
 EndProject

source-build.slnf

@@ -23,9 +23,9 @@
       "src\\Installer\\redist-installer\\redist-installer.proj",
       "src\\Installer\\pkg\\dotnet-sdk.proj",
       "src\\Layout\\redist\\redist.csproj",
-      "src\\Layout\\tool_fsharp\\tool_fsc.csproj",
-      "src\\Layout\\tool_msbuild\\tool_msbuild.csproj",
-      "src\\Layout\\tool_nuget\\tool_nuget.csproj",
+      "src\\Layout\\redist\\tools\\tool_fsc.csproj",
+      "src\\Layout\\redist\\tools\\tool_msbuild.csproj",
+      "src\\Layout\\redist\\tools\\tool_nuget.csproj",
       "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj",
       "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj",
       "src\\RazorSdk\\Tasks\\Microsoft.NET.Sdk.Razor.Tasks.csproj",

src/Layout/redist/redist.csproj

@@ -19,7 +19,6 @@
 
   <Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
   <Import Project="targets\BundledSdks.targets" />
-  <Import Project="targets\BundledTools.targets" />
   <Import Project="targets\PublishDotnetWatch.targets" />
   <Import Project="targets\GenerateLayout.targets" />
   <Import Project="targets\OverlaySdkOnLKG.targets" Condition="'$(DotNetBuild)' != 'true'" />
@@ -60,8 +59,8 @@
          in the outer build (which is the case for some of these references), there may be sporadic incorrect builds if the outer build happens to run concurrently
          with or after the redist build. -->
     <ProjectReference Include="..\..\Containers\packaging\package.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
-    <ProjectReference Include="..\tool_msbuild\tool_msbuild.csproj" />
-    <ProjectReference Include="..\tool_nuget\tool_nuget.csproj" />
+    <ProjectReference Include="tools\tool_msbuild.csproj" />
+    <ProjectReference Include="tools\tool_nuget.csproj" />
     <ProjectReference Include="..\..\Cli\dotnet\dotnet.csproj" />
     <ProjectReference Include="..\..\Tasks\Microsoft.NET.Build.Tasks\Microsoft.NET.Build.Tasks.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
     <ProjectReference Include="..\..\Tasks\Microsoft.NET.Build.Extensions.Tasks\Microsoft.NET.Build.Extensions.Tasks.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />

src/Layout/redist/targets/BundledTools.targets

@@ -212,7 +212,7 @@
           BeforeTargets="Build">
     <MSBuild
       Targets="Publish"
-      Projects="$(RepoRoot)/src/Layout/tool_fsharp/tool_fsc.csproj"
+      Projects="$(MSBuildProjectDirectory)\tools\tool_fsc.csproj"
       Properties="Configuration=$(Configuration);PublishDir=$(OutputPath)/FSharp" />
   </Target>
 
@@ -242,6 +242,17 @@
 
   <Target Name="GenerateCliRuntimeConfigurationFiles"
           AfterTargets="Build">
+    <ItemGroup>
+      <BundledTools Include="MSBuild;
+                            dotnet;
+                            NuGet.CommandLine.XPlat" />
+
+      <BundledToolProjects Include="tool_msbuild;
+                                    tool_nuget;
+                                    tool_cli;
+                                    redist;" />
+    </ItemGroup>
+
     <RemoveAssetFromDepsPackages DepsFile="$(OutputPath)/$(TargetName).deps.json"
                                  SectionName="runtime"
                                  AssetPath="%(BundledToolProjects.Identity).dll" />