Don't redistribute inbox msbuild dependencies (#10722)

* Don't redistribute inbox msbuild dependencies

Fixes #10721
Also use the "Toolset" version prefix that is also used in dotnet/runtime and dotnet/sdk.

* Improvements

* Use SRM toolset version on .NETFramework

* Fix typo

Author: ViktorHofer

eng/Versions.props

@@ -45,6 +45,11 @@
     <SystemSecurityPermissionsPackageVersion>10.0.0-preview.4.25205.3</SystemSecurityPermissionsPackageVersion>
     <SystemWindowsExtensionsPackageVersion>10.0.0-preview.4.25205.3</SystemWindowsExtensionsPackageVersion>
   </PropertyGroup>
+  <!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
+       Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
+  <PropertyGroup>
+    <SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
+  </PropertyGroup>
   <!-- Docs / Intellisense -->
   <PropertyGroup>
     <MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
@@ -58,11 +63,6 @@
     <MicrosoftSourceLinkGitHubVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubVersion>
     <MicrosoftSourceLinkAzureReposGitVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitVersion>
   </PropertyGroup>
-  <!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
-  <!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
-  <PropertyGroup>
-    <SystemCodeDomPackageVersionForPresentationBuildTasks>4.5.0</SystemCodeDomPackageVersionForPresentationBuildTasks>
-  </PropertyGroup>
   <!-- Other Packages that require manual updating-->
   <PropertyGroup>
     <MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj

@@ -47,19 +47,9 @@
     <PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFX.targets" SubFolder="root\targets" />
   </ItemGroup>
 
-  <!--
-    Limit the assemblies that are packaged into Microsoft.NET.Sdk.WindowsDesktop
-  -->
-  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
-    <PackagingAssemblyContent Include="System.Collections.Immutable.dll" />
-    <PackagingAssemblyContent Include="System.Memory.dll" />
-    <PackagingAssemblyContent Include="System.Numerics.Vectors.dll" />
-    <PackagingAssemblyContent Include="System.Reflection.Metadata.dll" />
-    <PackagingAssemblyContent Include="System.Runtime.CompilerServices.Unsafe.dll" />
-  </ItemGroup>
+  <!-- Limit the assemblies that are packaged into Microsoft.NET.Sdk.WindowsDesktop -->
   <ItemGroup>
     <PackagingAssemblyContent Include="PresentationBuildTasks.dll" />
-    <PackagingAssemblyContent Include="System.Reflection.MetadataLoadContext.dll" />
   </ItemGroup>
 
   <ItemGroup>
@@ -308,14 +298,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
-    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" IncludeAssets="compile" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" IncludeAssets="compile" />
 
-    <!--
-      Provide specific/old versions for PresentationBuildTasks which needs to run inside MSBuild
-    -->
-    <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersionForPresentationBuildTasks)" />
+    <!-- Reference (don't redistribute) the live version of SRM on .NETCoreApp and fallback to the toolset version for .NET Framework. -->
+    <PackageReference Include="System.Reflection.MetadataLoadContext" IncludeAssets="compile">
+      <Version Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">$(SystemReflectionMetadataLoadContextVersion)</Version>
+      <Version Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">$(SystemReflectionMetadataLoadContextToolsetVersion)</Version>
+    </PackageReference>
+    <!-- System.CodeDom live version is provided by the SDK. Use latest and don't redistribute it. -->
+    <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" IncludeAssets="compile" />
   </ItemGroup>
 
 </Project>