Remove support for NS2x runtime tfm and rename Sdk

ViktorHofer · ViktorHofer · commit 9a1769852a3a · 2022-02-01T17:06:43.000+01:00
dotnet/runtime was the only consumer that dependent on runtime specific .NETStandard tfms. Now that we are removing them with dotnet/runtime#64610 we can also delete the hacks to make them work in the TargetFramework package. Also renaming the project from Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk to Microsoft.DotNet.Build.Tasks.TargetFramework as doesn't need to be an msbuild sdk anymore and consuming it as a package will reduce evaluation time.
diff --git a/Arcade.sln b/Arcade.sln
@@ -91,7 +91,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Helix.JobS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.CMake.Sdk", "src\Microsoft.DotNet.CMake.Sdk\Microsoft.DotNet.CMake.Sdk.csproj", "{B1BFCB54-0FE7-4745-A471-2D7F21B5C7B9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk", "src\Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk\src\Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.csproj", "{E83B25A9-66C3-4E15-9BC3-E843CC471622}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.TargetFramework", "src\Microsoft.DotNet.Build.Tasks.TargetFramework\src\Microsoft.DotNet.Build.Tasks.TargetFramework.csproj", "{E83B25A9-66C3-4E15-9BC3-E843CC471622}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Helix.Sdk.Tests", "src\Microsoft.DotNet.Helix\Sdk.Tests\Microsoft.DotNet.Helix.Sdk.Tests\Microsoft.DotNet.Helix.Sdk.Tests.csproj", "{03390E61-9DC1-4893-93A4-193D76C16034}"
 EndProject
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
@@ -29,7 +29,7 @@
         $(RepoRoot)src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props;
         $(RepoRoot)src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props;
         $(RepoRoot)src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.common.targets;
-        $(RepoRoot)src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.props;
+        $(RepoRoot)src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props;
         $(RepoRoot)src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets;
         $(RepoRoot)src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props" />
     </ItemGroup>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SymStore.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SymStore.targets
@@ -25,13 +25,7 @@
       <_BuildsPortablePdb>false</_BuildsPortablePdb>
       <_BuildsPortablePdb Condition="'$(DebugType)' == 'portable' or '$(DebugType)' == 'embedded'">true</_BuildsPortablePdb>
 
-      <!--
-        Support Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk TargetFrameworkSuffix property.
-        TODO: Remove when https://github.com/dotnet/arcade/issues/4859 is fixed.
-      -->
       <_SymStoreTargetFramework>$(TargetFramework)</_SymStoreTargetFramework>
-      <_SymStoreTargetFramework Condition="'$(TargetFrameworkSuffix)' != ''">$(_SymStoreTargetFramework)-$(TargetFrameworkSuffix)</_SymStoreTargetFramework>
-
       <_SymStoreOutputDir>$(ArtifactsSymStoreDirectory)$(OutDirName)\$(_SymStoreTargetFramework)\</_SymStoreOutputDir>
       <_SymStoreOutputDir Condition="'$(PlatformName)' != 'AnyCPU'">$(_SymStoreOutputDir)$(PlatformName)\</_SymStoreOutputDir>
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.props b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.props
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.props b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.props
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/sdk/Sdk.targets
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/README.md b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/README.md
@@ -1,4 +1,4 @@
-Part of the TargetFramework SDK is the binplacing infrastructure which is described below. The TargetFramework SDK infrastructure itself isn't yet documented.
+Part of the TargetFramework package is the binplacing infrastructure which is described below. The TargetFramework package infrastructure itself isn't yet documented.
 
 ## BinPlacing
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestP2PTargetFrameworkTask.cs b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestP2PTargetFrameworkTask.cs
@@ -5,7 +5,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk
+namespace Microsoft.DotNet.Build.Tasks.TargetFramework
 {
     public class ChooseBestP2PTargetFrameworkTask : BuildTask
     {
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestTargetFrameworksTask.cs b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/ChooseBestTargetFrameworksTask.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk
+namespace Microsoft.DotNet.Build.Tasks.TargetFramework
 {
     public class ChooseBestTargetFrameworksTask : BuildTask
     {
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj
@@ -7,7 +7,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
     <Title>Configuration system for cross-targeting projects.</Title>
-    <PackageDescription>This package provides the following MSBuild tasks: ChooseBestTargetFrameworksTask and ChooseBestP2PTargetFrameworkTask. It is also a msbuild sdk which adds default functionality via sdk imports.</PackageDescription>
+    <PackageDescription>This package provides the following MSBuild tasks: ChooseBestTargetFrameworksTask and ChooseBestP2PTargetFrameworkTask.</PackageDescription>
     <DefaultItemExcludes Condition="'$(TargetFramework)' != 'net472'">**/*.Desktop.*</DefaultItemExcludes>
   </PropertyGroup>
 
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/TargetFrameworkResolver.cs b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/TargetFrameworkResolver.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk
+namespace Microsoft.DotNet.Build.Tasks.TargetFramework
 {
     /// <summary>
     /// This class uses NuGet's asset selection logic to choose the best TargetFramework given the list of supported TargetFrameworks.
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/BinPlace.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/BinPlace.targets
@@ -1,6 +1,7 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
-  <UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)"/>
+  <UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkAssembly)" />
+
   <PropertyGroup>
     <BinPlaceUseHardlinksIfPossible Condition="'$(BinPlaceUseHardlinksIfPossible)' == ''">true</BinPlaceUseHardlinksIfPossible>
     <EnableBinPlacing Condition="'$(EnableBinPlacing)' == '' and ('$(BinPlaceNative)' == 'true' or '$(BinPlaceRef)' == 'true' or '$(BinPlaceRuntime)' == 'true' or '$(BinPlaceTest)' == 'true')">true</EnableBinPlacing>
@@ -59,8 +60,8 @@
 
     <!-- This filename is chosen so that each build of every project has a uniquie filename.-->
     <PropertyGroup>
-      <_propsFilename>$(TargetName).$(_OriginalTargetFramework)</_propsFilename>
-      <_propsFilename Condition="'$(TargetName)' == ''">$(MSBuildProjectName).$(_OriginalTargetFramework)</_propsFilename>
+      <_propsFilename>$(TargetName).$(TargetFramework)</_propsFilename>
+      <_propsFilename Condition="'$(TargetName)' == ''">$(MSBuildProjectName).$(TargetFramework)</_propsFilename>
       <_projectDirLength>$(ProjectDir.Length)</_projectDirLength>
     </PropertyGroup>
 
@@ -130,13 +131,9 @@
                                     RuntimeGraph="$(RuntimeGraph)">
       <Output TaskParameter="BestTargetFrameworks" ItemName="_bestBinPlaceTargetFrameworks" />
     </ChooseBestTargetFrameworksTask>
-
-    <PropertyGroup>
-      <_OriginalTargetFramework Condition="'$(_OriginalTargetFramework)' == ''">$(TargetFramework)</_OriginalTargetFramework>
-    </PropertyGroup>
     
     <ItemGroup>
-      <_currentBinPlaceTargetFrameworks Include="@(_bestBinPlaceTargetFrameworks)" Condition="'%(Identity)' == '$(_OriginalTargetFramework)'" />
+      <_currentBinPlaceTargetFrameworks Include="@(_bestBinPlaceTargetFrameworks)" Condition="'%(Identity)' == '$(TargetFramework)'" />
 
       <BinPlaceDir Condition="'$(BinPlaceNative)' == 'true'" Include="@(_currentBinPlaceTargetFrameworks->'%(NativePath)')" />
       <BinPlaceDir Condition="'$(BinPlaceRef)' == 'true'" Include="@(_currentBinPlaceTargetFrameworks->'%(RefPath)')" />
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.props
@@ -0,0 +1,14 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+  <!-- Add unparsed TargetFrameworks property to GetTargetFrameworks return item metadata to read from it later. -->
+  <ItemDefinitionGroup>
+    <_ThisProjectBuildMetadata>
+      <RawTargetFrameworks>$(TargetFrameworks)</RawTargetFrameworks>
+    </_ThisProjectBuildMetadata>
+  </ItemDefinitionGroup>
+
+  <PropertyGroup>
+    <DotNetBuildTasksTargetFrameworkAssembly Condition="'$(DotNetBuildTasksTargetFrameworkAssembly)' == '' and '$(MSBuildRuntimeType)' == 'core'">..\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.TargetFramework.dll</DotNetBuildTasksTargetFrameworkAssembly>
+    <DotNetBuildTasksTargetFrameworkAssembly Condition="'$(DotNetBuildTasksTargetFrameworkAssembly)' == '' and '$(MSBuildRuntimeType)' != 'core'">..\tools\net472\Microsoft.DotNet.Build.Tasks.TargetFramework.dll</DotNetBuildTasksTargetFrameworkAssembly>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.targets
@@ -1,13 +1,7 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
-
-  <UsingTask TaskName="ChooseBestP2PTargetFrameworkTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)" />
-  <UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkSdkAssembly)" />
-
-  <!-- Strip away the TargetPlatforms during the graph build restore for frameworks older than net5.0 -->
-  <PropertyGroup Condition="'$(IsGraphBuild)' == 'true' and '$(MSBuildRestoreSessionId)' != ''">
-    <TargetFrameworks Condition="'$(TargetFrameworks)' != ''">$([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '$(TargetFrameworkPattern)', '${1}'))</TargetFrameworks>
-  </PropertyGroup>
+  <UsingTask TaskName="ChooseBestP2PTargetFrameworkTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkAssembly)" />
+  <UsingTask TaskName="ChooseBestTargetFrameworksTask" AssemblyFile="$(DotNetBuildTasksTargetFrameworkAssembly)" />
 
   <!-- We filter _InnerBuildProjects items during DispatchToInnerBuilds and Clean to only run for best target frameworks. -->
   <Target Name="RunOnlyBestTargetFrameworks"
@@ -66,10 +60,6 @@
           Condition="'@(ProjectReference)' != ''"
           BeforeTargets="AssignProjectConfiguration"
           DependsOnTargets="ResolvePackageDependenciesForBuild">
-    <PropertyGroup>
-      <_OriginalTargetFramework Condition="'$(_OriginalTargetFramework)' == ''">$(TargetFramework)</_OriginalTargetFramework>
-    </PropertyGroup>
-
     <MSBuild Projects="@(ProjectReference)"
              Targets="GetTargetFrameworks"
              BuildInParallel="$(BuildInParallel)"
@@ -83,7 +73,7 @@
       <_ProjectReferenceWithTargetFrameworks Include="@(ProjectReference->WithMetadataValue('SkipGetTargetFrameworkProperties', 'true'))" />
     </ItemGroup>
 
-    <ChooseBestP2PTargetFrameworkTask TargetFramework="$(_OriginalTargetFramework)"
+    <ChooseBestP2PTargetFrameworkTask TargetFramework="$(TargetFramework)"
                                       ProjectReferencesWithTargetFrameworks="@(_ProjectReferenceWithTargetFrameworks)"
                                       RuntimeGraph="$(RuntimeGraph)">
       <Output TaskParameter="AnnotatedProjectReferencesWithSetTargetFramework" ItemName="_ProjectReferenceWithBestTargetFramework" />
@@ -95,4 +85,5 @@
     </ItemGroup>
   </Target>
 
+  <Import Project="BinPlace.targets" />
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Part of the TargetFramework SDK is the binplacing infrastructure which is described below. The TargetFramework SDK infrastructure itself isn't yet documented.`
	`1`	`+Part of the TargetFramework package is the binplacing infrastructure which is described below. The TargetFramework package infrastructure itself isn't yet documented.`
`2`	`2`
`3`	`3`	`## BinPlacing`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System;`
`6`	`6`	`using System.IO;`
`7`	`7`
`8`		`-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk`
	`8`	`+namespace Microsoft.DotNet.Build.Tasks.TargetFramework`
`9`	`9`	`{`
`10`	`10`	`public class ChooseBestP2PTargetFrameworkTask : BuildTask`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Linq;`
`8`	`8`
`9`		`-namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk`
	`9`	`+namespace Microsoft.DotNet.Build.Tasks.TargetFramework`
`10`	`10`	`{`
`11`	`11`	`public class ChooseBestTargetFrameworksTask : BuildTask`
`12`	`12`	`{`