From 653e4acdbebb7fff95867008b175d970cbe53b8f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 20 Feb 2025 22:51:33 +0100
Subject: [PATCH] Clean-up in src/Layout/redist

---
 Directory.Build.props                         |  2 +
 .../redist-installer/Directory.Build.props    |  3 -
 .../redist-installer/Directory.Build.targets  |  3 +-
 .../targets/GenerateLayout.targets            | 10 ---
 src/Layout/Directory.Build.props              | 12 ++++
 src/Layout/redist/redist.csproj               |  3 -
 src/Layout/redist/targets/BundledSdks.targets | 37 ++++++++++-
 .../redist/targets/BundledTools.targets       |  4 +-
 .../redist/targets/GenerateLayout.targets     | 62 ++++++-------------
 .../targets/GetRuntimeInformation.targets     | 15 -----
 .../redist/targets/MSBuildExtensions.targets  | 32 ----------
 .../redist/targets/OverlaySdkOnLKG.targets    |  6 +-
 .../redist/targets/PublishDotnetWatch.targets | 18 +++---
 .../redist/targets/RestoreDependency.proj     | 50 ---------------
 src/Layout/redist/targets/Version.targets     |  5 --
 src/Layout/redist/targets/sdks/sdks.csproj    | 16 -----
 src/Layout/redist/targets/test/Empty.props    |  3 -
 src/Layout/redist/targets/test/Empty.targets  |  3 -
 src/Layout/tool_fsharp/tool_fsc.csproj        | 10 +--
 src/Layout/tool_msbuild/tool_msbuild.csproj   |  3 +-
 src/Layout/tool_nuget/tool_nuget.csproj       |  3 +-
 21 files changed, 96 insertions(+), 204 deletions(-)
 create mode 100644 src/Layout/Directory.Build.props
 delete mode 100644 src/Layout/redist/targets/GetRuntimeInformation.targets
 delete mode 100644 src/Layout/redist/targets/MSBuildExtensions.targets
 delete mode 100644 src/Layout/redist/targets/RestoreDependency.proj
 delete mode 100644 src/Layout/redist/targets/Version.targets
 delete mode 100644 src/Layout/redist/targets/sdks/sdks.csproj
 delete mode 100644 src/Layout/redist/targets/test/Empty.props
 delete mode 100644 src/Layout/redist/targets/test/Empty.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index 19d712c6c260..93eea8242e9d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -92,6 +92,8 @@
 
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+
+    <SdkLayoutOutputDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\dotnet-toolset-internal\</SdkLayoutOutputDirectory>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
diff --git a/src/Installer/redist-installer/Directory.Build.props b/src/Installer/redist-installer/Directory.Build.props
index 8393e4d58050..c7b1908eda90 100644
--- a/src/Installer/redist-installer/Directory.Build.props
+++ b/src/Installer/redist-installer/Directory.Build.props
@@ -25,9 +25,6 @@
     <ProductMonikerRid Condition="'$(ProductMonikerRid)' == ''">$(Rid)</ProductMonikerRid>
 
     <PortableProductMonikerRid Condition="'$(PortableProductMonikerRid)' == ''">$(PortableRid)</PortableProductMonikerRid>
-
-    <PgoTerm Condition="'$(PgoInstrument)' == 'true'">-pgo</PgoTerm>
-    <ArtifactNameSdk>dotnet-sdk-internal$(PgoTerm)</ArtifactNameSdk>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Installer/redist-installer/Directory.Build.targets b/src/Installer/redist-installer/Directory.Build.targets
index 6ae697a49528..3f475fa3b0d3 100644
--- a/src/Installer/redist-installer/Directory.Build.targets
+++ b/src/Installer/redist-installer/Directory.Build.targets
@@ -11,7 +11,8 @@
 
   <PropertyGroup>
     <!-- Any properties that depend on Version and are not in a Target must not be defined in Directory.Build.props as Version won't be available yet. -->
-    <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
+    <PgoTerm Condition="'$(PgoInstrument)' == 'true'">-pgo</PgoTerm>
+    <ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
     <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
     <!-- Warning: changing the value "ProductBandCombinedHostHostFxrFrameworkSdkName" can only occur on a product-band boundary [CliProductBandVersion],
               Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradability of the SDK bundle installer. -->
diff --git a/src/Installer/redist-installer/targets/GenerateLayout.targets b/src/Installer/redist-installer/targets/GenerateLayout.targets
index 0ef83f0679ad..6fa52ae44df2 100644
--- a/src/Installer/redist-installer/targets/GenerateLayout.targets
+++ b/src/Installer/redist-installer/targets/GenerateLayout.targets
@@ -375,16 +375,6 @@
           DestinationFolder="$(RedistLayoutPath)/library-packs"
           SkipUnchangedFiles="true" />
 
-    <!-- From Version.targets in SDK redist -->
-    <PropertyGroup>
-      <ArtifactNameSdk>dotnet-toolset-internal</ArtifactNameSdk>
-    </PropertyGroup>
-
-    <!-- From GenerateLayout.targets in SDK redist -->
-    <PropertyGroup>
-      <SdkLayoutOutputDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\$(ArtifactNameSdk)\</SdkLayoutOutputDirectory>
-    </PropertyGroup>
-
     <!-- https://github.com/dotnet/msbuild/issues/5881#issuecomment-802492423 -->
     <ItemGroup>
       <DotnetToolsetInternalSource Include="$(SdkLayoutOutputDirectory)**\*" />
diff --git a/src/Layout/Directory.Build.props b/src/Layout/Directory.Build.props
new file mode 100644
index 000000000000..4df9e95147af
--- /dev/null
+++ b/src/Layout/Directory.Build.props
@@ -0,0 +1,12 @@
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <PropertyGroup>
+    <OSName Condition="'$(OSName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win</OSName>
+    <OSName Condition="'$(OSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</OSName>
+    <OSName Condition="'$(OSName)' == '' ">linux</OSName>
+    <Rid Condition="'$(Rid)' == ''">$(OSName)-$(Architecture)</Rid>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj
index eb9372e9932f..12b0173ae396 100644
--- a/src/Layout/redist/redist.csproj
+++ b/src/Layout/redist/redist.csproj
@@ -18,14 +18,11 @@
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
-  <Import Project="targets\GetRuntimeInformation.targets" />
-  <Import Project="targets\Version.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'" />
-  <Import Project="targets\MSBuildExtensions.targets" />
 
   <ItemGroup>
     <PackageReference Include="NuGet.Build.Tasks" />
diff --git a/src/Layout/redist/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets
index 17853b9ae7d1..242c1c0242d6 100644
--- a/src/Layout/redist/targets/BundledSdks.targets
+++ b/src/Layout/redist/targets/BundledSdks.targets
@@ -1,4 +1,5 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
+
   <ItemGroup>
     <BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackPackageVersion)" />
     <BundledSdk Include="Microsoft.NET.Sdk.WindowsDesktop" Version="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
@@ -12,4 +13,38 @@
     <BundledSdk Include="Microsoft.SourceLink.GitLab" Version="$(MicrosoftSourceLinkGitLabVersion)" />
     <BundledSdk Include="Microsoft.SourceLink.Bitbucket.Git" Version="$(MicrosoftSourceLinkBitBucketGitVersion)" />
   </ItemGroup>
+
+  <!-- Restore bundled sdks -->
+  <ItemGroup>
+    <PackageDownload Include="@(BundledSdk)" Version="[%(Version)]" />
+  </ItemGroup>
+
+  <Target Name="PublishSdks">
+    <ItemGroup>
+      <BundledSdk SdkLayoutDirectory="$(OutputPath)Sdks\%(Identity)\"
+                  PackageNameLowercase="$([System.String]::new('%(Identity)').ToLowerInvariant())" />
+      <BundledSdk NuPkgPath="$(NuGetPackageRoot)%(PackageNameLowercase)\%(Version)\" />
+    </ItemGroup>
+
+    <Error Text="Bundled SDK has not been restored yet: '%(BundledSdk.NuPkgPath)%(BundledSdk.PackageNameLowercase).nuspec'"
+           Condition="!Exists('%(BundledSdk.NuPkgPath)%(BundledSdk.PackageNameLowercase).nuspec')" />
+
+    <ItemGroup>
+      <SdkContent Include="%(BundledSdk.NuPkgPath)**\*"
+                  Exclude="%(BundledSdk.NuPkgPath)Icon.png;
+                           %(BundledSdk.NuPkgPath)%(BundledSdk.PackageNameLowercase).nuspec;
+                           %(BundledSdk.NuPkgPath)%(BundledSdk.PackageNameLowercase).%(BundledSdk.Version).nupkg;
+                           %(BundledSdk.NuPkgPath)%(BundledSdk.PackageNameLowercase).%(BundledSdk.Version).nupkg.sha512;
+                           %(BundledSdk.NuPkgPath)**\*.nupkg.metadata;
+                           %(BundledSdk.NuPkgPath)**\*.signature.p7s"
+                  SdkLayoutDirectory="%(BundledSdk.SdkLayoutDirectory)" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(SdkContent)"
+          DestinationFiles="@(SdkContent->'%(SdkLayoutDirectory)%(RecursiveDir)%(FileName)%(Extension)')"
+          SkipUnchangedFiles="true" />
+
+    <Message Text="Copied Sdk '%(BundledSdk.Identity)' from '%(BundledSdk.NuPkgPath)' to '%(BundledSdk.SdkLayoutDirectory)'." Importance="High" />
+  </Target>
+
 </Project>
diff --git a/src/Layout/redist/targets/BundledTools.targets b/src/Layout/redist/targets/BundledTools.targets
index 6be26a9490a0..59ec817765d5 100644
--- a/src/Layout/redist/targets/BundledTools.targets
+++ b/src/Layout/redist/targets/BundledTools.targets
@@ -1,4 +1,5 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
+
   <ItemGroup>
     <BundledTools Include="MSBuild;
                            dotnet;
@@ -9,4 +10,5 @@
                                   tool_cli;
                                   redist;" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
index 3bc52e05e89d..b815d7d74b74 100644
--- a/src/Layout/redist/targets/GenerateLayout.targets
+++ b/src/Layout/redist/targets/GenerateLayout.targets
@@ -6,7 +6,6 @@
 
   <Target Name="PublishPortableRuntimeIdentifierGraph"
           BeforeTargets="Build">
-
     <Copy SourceFiles="$(NuGetPackageRoot)/microsoft.netcore.platforms/$(MicrosoftNETCorePlatformsPackageVersion)/runtime.json"
           DestinationFiles="$(OutputPath)RuntimeIdentifierGraph.json"
           SkipUnchangedFiles="true" />
@@ -14,12 +13,10 @@
     <Copy SourceFiles="$(NuGetPackageRoot)/microsoft.netcore.platforms/$(MicrosoftNETCorePlatformsPackageVersion)/PortableRuntimeIdentifierGraph.json"
           DestinationFolder="$(OutputPath)"
           SkipUnchangedFiles="true" />
-
   </Target>
 
   <Target Name="PublishVersionFile"
           BeforeTargets="Build">
-
     <WriteLinesToFile File="$(OutputPath)/.toolsetversion"
                       Lines="$(SourceRevisionId);$(Version);$(Rid)"
                       Overwrite="true" />
@@ -35,8 +32,6 @@
 	      The resolution of the product version (https://github.com/dotnet/sdk/blob/main/src/Cli/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs#L21)
 		  then need the version file there as well. -->
     <Copy SourceFiles="$(OutputPath)/.version" DestinationFiles="$(BaseOutputPath)$(Configuration)/.version" SkipUnchangedFiles="true" />
-
-
   </Target>
 
   <Target Name="PublishRoslyn"
@@ -57,7 +52,7 @@
 
   <Target Name="PublishNETAnalyzers"
           BeforeTargets="Build;PublishNetSdk">
-     <PropertyGroup>
+    <PropertyGroup>
       <AnalyzerAssembliesDirectory>$(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\analyzers</AnalyzerAssembliesDirectory>
       <AnalyzerTargetsDirectory>$(AnalyzerAssembliesDirectory)\build</AnalyzerTargetsDirectory>
       <AnalyzerConfigDirectory>$(AnalyzerTargetsDirectory)\config</AnalyzerConfigDirectory>
@@ -123,12 +118,27 @@
     <Copy SourceFiles="@(DotnetFormatConfigFiles)" DestinationFiles="@(DotnetFormatConfigFiles->'$(DotnetFormatDestinationDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
-  <Target Name="PublishMSBuildExtensions"
-          DependsOnTargets="GenerateMSBuildExtensions"
-          BeforeTargets="Build">
+  <Target Name="PublishMSBuildExtensions">
+    <PropertyGroup>
+      <MSBuildExtensionsPackageName>Microsoft.NET.Build.Extensions</MSBuildExtensionsPackageName>
+      <MSBuildExtensionsVersionSubfolder>Current</MSBuildExtensionsVersionSubfolder>
+      <MSBuildExtensionsSourceRoot>$(ArtifactsBinDir)$(Configuration)\Sdks\$(MSBuildExtensionsPackageName)</MSBuildExtensionsSourceRoot>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- Include MSBuild imports that are checked into repo -->
+      <MSBuildExtensionsContent Include="$(MSBuildProjectDirectory)/MSBuildImports/**/*" />
+      <MSBuildExtensionsContent Include="$(MSBuildExtensionsSourceRoot)\msbuildExtensions\**\*.*" />
+
+      <!-- Don't include .NET Framework MS.NET.Build.Extensions tasks in CLI layout -->
+      <MSBuildExtensionsContent Remove="$(MSBuildExtensionsSourceRoot)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools\net472\**" />
+
+      <MSBuildExtensionsContent Include="$(MSBuildExtensionsSourceRoot)\msbuildExtensions-ver\**\*.*"
+                                DeploymentSubpath="$(MSBuildExtensionsVersionSubfolder)/" />
+    </ItemGroup>
+
     <Copy SourceFiles="@(MSBuildExtensionsContent)"
           DestinationFiles="@(MSBuildExtensionsContent->'$(OutputPath)\%(DeploymentSubpath)\%(RecursiveDir)%(Filename)%(Extension)')" />
-
   </Target>
 
   <Target Name="PublishNetSdks"
@@ -396,34 +406,6 @@
                                    AssetPath="%(NuPkgContentForMSBuildExtensionsRelativePaths.Identity)" />
   </Target>
 
-  <Target Name="PublishSdks"
-          AfterTargets="Build">
-    <ItemGroup>
-      <SdksToBundle Include="targets\RestoreDependency.proj">
-        <Properties>
-          NuGetPackageRoot=$(NuGetPackageRoot);
-          SdkLayoutDirectory=$(OutputPath)/Sdks/%(BundledSdk.Identity);
-          DependencyPackageName=%(BundledSdk.Identity);
-          DependencyPackageVersion=%(BundledSdk.Version);
-          PreviousStageDirectory=$(PreviousStageDirectory)
-        </Properties>
-      </SdksToBundle>
-    </ItemGroup>
-
-    <MSBuild
-      BuildInParallel="False"
-      Projects="@(SdksToBundle)">
-    </MSBuild>
-
-    <!-- The WPF SDK .nupkg includes some files in the root that we don't want to bundle, so delete them -->
-    <ItemGroup>
-      <SDKFilesToDelete Include="$(OutputPath)/Sdks/Microsoft.NET.Sdk.Wpf/*" />
-      <SDKFilesToDelete Include="$(OutputPath)/Sdks/**/*.nupkg.metadata" />
-      <SDKFilesToDelete Include="$(OutputPath)/Sdks/**/*.signature.p7s" />
-    </ItemGroup>
-    <Delete Files="@(SDKFilesToDelete)" />
-  </Target>
-
   <Target Name="ChmodPublishDir"
           AfterTargets="GenerateCliRuntimeConfigurationFiles"
           Condition=" '$(OSName)' != 'win' ">
@@ -487,10 +469,6 @@
                             RetargetTools;
                             GetDotnetWatchRedistOutputDirectory"
           AfterTargets="Build">
-    <PropertyGroup>
-      <SdkLayoutOutputDirectory>$(BaseOutputPath)$(Configuration)\layouts\$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
-    </PropertyGroup>
-
     <ItemGroup>
       <ToolsetLayoutInput Include="$(OutputPath)/**/*" />
       <!-- Include redist outputs published by dotnet-watch.csproj build. -->
diff --git a/src/Layout/redist/targets/GetRuntimeInformation.targets b/src/Layout/redist/targets/GetRuntimeInformation.targets
deleted file mode 100644
index 6e8927785e78..000000000000
--- a/src/Layout/redist/targets/GetRuntimeInformation.targets
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project>
-  <Target Name="GetCurrentRuntimeInformation"
-          BeforeTargets="Build">
-
-    <PropertyGroup>
-      <OSName Condition=" '$(OSName)' == '' AND $([MSBuild]::IsOSPlatform(`Windows`)) ">win</OSName>
-      <OSName Condition=" '$(OSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX')) ">osx</OSName>
-      <OSName Condition=" '$(OSName)' == '' ">linux</OSName>
-
-      <Architecture Condition=" '$(Architecture)' == '' ">x64</Architecture>
-      <Rid Condition=" '$(Rid)' == '' ">$(OSName)-$(Architecture)</Rid>
-    </PropertyGroup>
-
-  </Target>
-</Project>
diff --git a/src/Layout/redist/targets/MSBuildExtensions.targets b/src/Layout/redist/targets/MSBuildExtensions.targets
deleted file mode 100644
index 41bcd4be1172..000000000000
--- a/src/Layout/redist/targets/MSBuildExtensions.targets
+++ /dev/null
@@ -1,32 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <MSBuildExtensionsPackageName>Microsoft.NET.Build.Extensions</MSBuildExtensionsPackageName>
-    <MSBuildExtensionsVersionSubfolder>Current</MSBuildExtensionsVersionSubfolder>
-    <MSBuildExtensionsSourceRoot>$(ArtifactsBinDir)$(Configuration)\Sdks\$(MSBuildExtensionsPackageName)</MSBuildExtensionsSourceRoot>
-  </PropertyGroup>
-
-  <Target Name="GenerateMSBuildExtensions">
-
-    <ItemGroup>
-      
-      <!-- Include MSBuild imports that are checked into repo -->
-      <MSBuildExtensionsContent Include="$(MSBuildProjectDirectory)/MSBuildImports/**/*" />
-
-      
-      <MSBuildExtensionsContent Include="$(MSBuildExtensionsSourceRoot)\msbuildExtensions\**\*.*" />
-
-      <!-- Don't include .NET Framework MS.NET.Build.Extensions tasks in CLI layout -->
-      <MSBuildExtensionsContent Remove="$(MSBuildExtensionsSourceRoot)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools\net472\**" />
-
-      <MSBuildExtensionsContent Include="$(MSBuildExtensionsSourceRoot)\msbuildExtensions-ver\**\*.*"
-                          DeploymentSubpath="$(MSBuildExtensionsVersionSubfolder)/" />
-
-
-
-
-    </ItemGroup>
-
-  </Target>
-
-</Project>
diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
index 7fd3a1e90db1..b29cd7a03e28 100644
--- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets
+++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
@@ -1,4 +1,5 @@
-<Project ToolsVersion="14.0" DefaultTargets="Test">
+<Project>
+
   <Target Name="OverlaySdkOnLKG" AfterTargets="Build" DependsOnTargets="GenerateLayout">
     <PropertyGroup>
       <RedistLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet\</RedistLayoutPath>
@@ -111,7 +112,6 @@
       WorkloadManifestPath="%(MonoToolchainCurrentWorkloadManifests.FullPath)" />
   </Target>
 
-
   <Target Name="PublishTestWorkloads"
           AfterTargets="OverlaySdkOnLKG">
     <PropertyGroup>
@@ -134,6 +134,6 @@
 
     <Copy SourceFiles="@(WorkloadPackContent)"
       DestinationFiles="@(WorkloadPackContent->'$(RedistLayoutPath)\packs\%(RecursiveDir)%(Filename)%(Extension)')" />
-
   </Target>
+
 </Project>
diff --git a/src/Layout/redist/targets/PublishDotnetWatch.targets b/src/Layout/redist/targets/PublishDotnetWatch.targets
index b8573283fdc6..43908fd79586 100644
--- a/src/Layout/redist/targets/PublishDotnetWatch.targets
+++ b/src/Layout/redist/targets/PublishDotnetWatch.targets
@@ -1,4 +1,5 @@
 <Project>
+
   <Target Name="GetDotnetWatchRedistOutputDirectory">
     <PropertyGroup>
       <DotnetWatchRedistOutputDirectory>$(ArtifactsDir)bin\redist\$(Configuration)\dotnet\sdk\$(Version)\DotnetTools\dotnet-watch\</DotnetWatchRedistOutputDirectory>
@@ -6,7 +7,7 @@
     </PropertyGroup>
   </Target>
 
-  <Target Name="_PublishDotnetWatchToRedist_Inputs">
+  <Target Name="PublishDotnetWatchToRedist" DependsOnTargets="GetDotnetWatchRedistOutputDirectory">
     <ItemGroup>
       <_DotnetWatchBuildOutput Include="$(ArtifactsDir)bin\dotnet-watch\$(Configuration)\$(SdkTargetFramework)\**"/>
 
@@ -26,15 +27,12 @@
                                          '%(Filename)' != 'Microsoft.CodeAnalysis.CSharp.resources') or
                                         $([MSBuild]::ValueOrDefault('%(FullPath)', '').Contains('BuildHost'))" />
     </ItemGroup>
-  </Target>
-
-  <Target Name="PublishDotnetWatchToRedist"
-          DependsOnTargets="GetDotnetWatchRedistOutputDirectory;_PublishDotnetWatchToRedist_Inputs">
-
-    <Copy SourceFiles="@(_DotnetWatchInputFile)" DestinationFiles="@(_DotnetWatchInputFile->'$(DotnetWatchRedistOutputDirectory)$(DotnetWatchRedistOutputSubdirectory)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
 
-    <ItemGroup>
-      <FileWrites Include="@(_DotnetWatchInputFile->'$(DotnetWatchRedistOutputDirectory)$(DotnetWatchRedistOutputSubdirectory)%(RecursiveDir)%(Filename)%(Extension)')" />
-    </ItemGroup>
+    <Copy SourceFiles="@(_DotnetWatchInputFile)"
+          DestinationFiles="@(_DotnetWatchInputFile->'$(DotnetWatchRedistOutputDirectory)$(DotnetWatchRedistOutputSubdirectory)%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true">
+      <Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
+    </Copy>
   </Target>
+
 </Project>
diff --git a/src/Layout/redist/targets/RestoreDependency.proj b/src/Layout/redist/targets/RestoreDependency.proj
deleted file mode 100644
index bb9d05098845..000000000000
--- a/src/Layout/redist/targets/RestoreDependency.proj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project ToolsVersion="15.0" DefaultTargets="PrepareBundledDependencyProps;EnsureDependencyRestored;CopySdkToOutput">
-<!--
-
-  Note that the CopySdkToOutput target explicitly does NOT have Inputs and Outputs declared.
-  This is because it is supposed to overlay updated SDK items on a folder that may already
-  have different versions from a different package.  If Inputs and Outputs are declared,
-  MSBuild will skip files where a newer version already exists in the target folder, which
-  is not what we want.
-
- -->
-
-  <Target Name="CopySdkToOutput"
-          DependsOnTargets="EnsureDependencyRestored;
-                            GetSdkItemsToCopy"
-          Condition="'$(SdkLayoutDirectory)' != ''"
->
-    <Copy SourceFiles="@(SdkContent)"
-          DestinationFiles="@(SdkContent->'$(SdkLayoutDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
-
-    <Message Text="Copied Sdk $(DependencyPackageName) from $(DependencyNuPkgPath) to $(SdkLayoutDirectory)."
-             Importance="High" />
-  </Target>
-
-  <Target Name="GetSdkItemsToCopy">
-    <ItemGroup>
-      <SdkContent Include="$(DependencyNuPkgPath)**\*"
-                  Exclude="$(DependencyNuPkgPath)Icon.png;
-                           $(DependencyNuPkgPath)$(DependencyPackageName).nuspec;
-                           $(DependencyNuPkgPath)$(DependencyPackageName).$(DependencyPackageVersion).nupkg;
-                           $(DependencyNuPkgPath)$(DependencyPackageName).$(DependencyPackageVersion).nupkg.sha512" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="EnsureDependencyRestored"
-          Condition="!Exists('$(DependencyNuPkgPath)$(DependencyPackageName.ToLower()).nuspec')">
-
-    <Message Text="Dependency has not been restored yet: '$(DependencyNuPkgPath)$(DependencyPackageName.ToLower()).nuspec'"/>
-
-    <MSbuild
-      Projects="$(MSBuildThisFileDirectory)sdks\sdks.csproj"
-      Properties="DependencyPackageName=$(DependencyPackageName);DependencyPackageVersion=$(DependencyPackageVersion)"
-      Targets="Restore" />
-  </Target>
-
-  <Target Name="PrepareBundledDependencyProps">
-    <PropertyGroup>
-      <DependencyNuPkgPath>$(NuGetPackageRoot)$(DependencyPackageName.ToLower())\$(DependencyPackageVersion.ToLower())\</DependencyNuPkgPath>
-    </PropertyGroup>
-  </Target>
-</Project>
diff --git a/src/Layout/redist/targets/Version.targets b/src/Layout/redist/targets/Version.targets
deleted file mode 100644
index a1c8e6a85003..000000000000
--- a/src/Layout/redist/targets/Version.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <ArtifactNameSdk>dotnet-toolset-internal</ArtifactNameSdk>
-  </PropertyGroup>
-</Project>
diff --git a/src/Layout/redist/targets/sdks/sdks.csproj b/src/Layout/redist/targets/sdks/sdks.csproj
deleted file mode 100644
index 7fbf2a576773..000000000000
--- a/src/Layout/redist/targets/sdks/sdks.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <TargetFrameworkMoniker>.NETCoreApp,Version=v7.0</TargetFrameworkMoniker>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="$(DependencyPackageName)" VersionOverride="$(DependencyPackageVersion)" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/src/Layout/redist/targets/test/Empty.props b/src/Layout/redist/targets/test/Empty.props
deleted file mode 100644
index 905549edcbe6..000000000000
--- a/src/Layout/redist/targets/test/Empty.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-  <!-- Empty Directory.Build.props file to prevent test asset projects from picking up the repo's Directory.Build.props' -->
-</Project>
diff --git a/src/Layout/redist/targets/test/Empty.targets b/src/Layout/redist/targets/test/Empty.targets
deleted file mode 100644
index 0c98d167d193..000000000000
--- a/src/Layout/redist/targets/test/Empty.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-</Project>
\ No newline at end of file
diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 3131d245407b..876671a029f4 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>$(SdkTargetFramework)</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -6,10 +7,9 @@
   </PropertyGroup>
 
   <!-- MIBC, PGO -->
-  <Import Project="..\redist\targets\GetRuntimeInformation.targets" /> <!-- Rid is set here -->
   <PropertyGroup>
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
-    <MibcRid>$(Rid)</MibcRid>  
+    <MibcRid>$(Rid)</MibcRid>
     <MibcRid Condition="$(MibcRid.Contains('musl-'))">$(MibcRid.Replace('musl-', ''))</MibcRid>
     <MibcFile>$(MibcPath)/optimization.$(MibcRid).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
     <ReadyToRunOptimizationData>$(MibcFile)</ReadyToRunOptimizationData>
@@ -35,6 +35,7 @@
         <FSharpTfm>net9.0</FSharpTfm>
         <FSharpTfm Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildOrchestrator)' == 'true'">$(NetCurrent)</FSharpTfm>
     </PropertyGroup>
+
     <ItemGroup>
         <ResolvedFileToPublish
           Include="$(PkgMicrosoft_FSharp_Compiler)/lib/$(FSharpTfm)/FSharp.Core.xml"
@@ -47,6 +48,7 @@
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/any/any/*" Exclude="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/any/any/Microsoft.FSharp.Core.NetSdk.props" SubDir="" />
         <FilesToCopyFromFSharpCompilerPackage Include="$(MibcPath)/*" SubDir="" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
     </ItemGroup>
+
     <ItemGroup>
         <ResolvedFileToPublish
           Include="@(FilesToCopyFromFSharpCompilerPackage)"
@@ -55,6 +57,6 @@
           RelativePath="%(FilesToCopyFromFSharpCompilerPackage.SubDir)%(Filename)%(Extension)"
           TargetPath="%(FilesToCopyFromFSharpCompilerPackage.SubDir)%(Filename)%(Extension)" />
     </ItemGroup>
-
   </Target>
+
 </Project>
diff --git a/src/Layout/tool_msbuild/tool_msbuild.csproj b/src/Layout/tool_msbuild/tool_msbuild.csproj
index 095fc998b3da..979007924480 100644
--- a/src/Layout/tool_msbuild/tool_msbuild.csproj
+++ b/src/Layout/tool_msbuild/tool_msbuild.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(SdkTargetFramework)</TargetFramework>
@@ -16,4 +16,5 @@
     <PackageReference Include="Microsoft.NET.StringTools" VersionOverride="$(MicrosoftBuildVersion)" />
     <PackageReference Include="System.Resources.Extensions" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Layout/tool_nuget/tool_nuget.csproj b/src/Layout/tool_nuget/tool_nuget.csproj
index 535c323352bf..47b91456c971 100644
--- a/src/Layout/tool_nuget/tool_nuget.csproj
+++ b/src/Layout/tool_nuget/tool_nuget.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(SdkTargetFramework)</TargetFramework>
@@ -9,4 +9,5 @@
   <ItemGroup>
     <PackageReference Include="NuGet.CommandLine.XPlat" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file