From d69f3bf8147bf1316ec28c981584aa1ee199d6ea Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Mon, 25 Sep 2023 13:52:02 -0700
Subject: [PATCH] Remove old TFMs from Artifacts SDK (#484)

* Remove old TFMs from Artifacts SDK
* Rev major version
---
 .../Microsoft.Build.Artifacts.csproj          | 24 +++++++------------
 .../Microsoft.Build.Artifacts.Common.targets  |  9 +------
 src/Artifacts/version.json                    |  2 +-
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/Artifacts/Microsoft.Build.Artifacts.csproj b/src/Artifacts/Microsoft.Build.Artifacts.csproj
index dc270409..c58c73c8 100644
--- a/src/Artifacts/Microsoft.Build.Artifacts.csproj
+++ b/src/Artifacts/Microsoft.Build.Artifacts.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net46;net472;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <BuildOutputTargetFolder>build\</BuildOutputTargetFolder>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>Build logic for staging artifacts from build outputs.</Description>
@@ -10,10 +10,9 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);GetMyPackageFiles</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CopyOnWrite" GeneratePathProperty="True" PrivateAssets="All" Condition="'$(TargetFramework)' != 'net46'" />
+    <PackageReference Include="CopyOnWrite" GeneratePathProperty="True" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
   </ItemGroup>
@@ -28,18 +27,6 @@
     <FilesToSign Include="$(TargetPath)" Authenticode="Microsoft400" StrongName="StrongName" />
   </ItemGroup>
   <Target Name="SignNuGetPackage" />
-  <Target Name="GetMyPackageFiles" DependsOnTargets="ResolveProjectReferences" Condition=" '$(TargetFramework)' != 'net46' ">
-    <PropertyGroup>
-      <CoWFramework Condition=" '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'netstandard2.0' ">netstandard2.0</CoWFramework>
-      <CoWFramework Condition=" '$(TargetFramework)' == 'net6.0' ">net6.0</CoWFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="$(PkgCopyOnWrite)\lib\$(CoWFramework)\CopyOnWrite.dll"
-                              Pack="true"
-                              PackagePath="\build\$(TargetFramework)" />
-    </ItemGroup>
-  </Target>
   <Target Name="CopyArtifacts"
           AfterTargets="Pack"
           DependsOnTargets="SignNuGetPackage"
@@ -53,4 +40,11 @@
           SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
           OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" />
   </Target>
+
+  <Target Name="IncludeReferenceCopyLocalPathsInBuildOutputInPackage" BeforeTargets="_GetBuildOutputFilesWithTfm" DependsOnTargets="ResolveReferences;ResolvePackageDependenciesForBuild">
+    <ItemGroup>
+      <BuildOutputInPackage Include="@(RuntimeCopyLocalItems-&gt;WithMetadataValue('AssetType', 'runtime'))" TargetPath="%(RuntimeCopyLocalItems.DestinationSubDirectory)%(Filename)%(Extension)" />
+      <BuildOutputInPackage Include="@(RuntimeCopyLocalItems-&gt;WithMetadataValue('CopyLocal', 'true'))" TargetPath="%(RuntimeCopyLocalItems.DestinationSubDirectory)%(Filename)%(Extension)" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/Artifacts/build/Microsoft.Build.Artifacts.Common.targets b/src/Artifacts/build/Microsoft.Build.Artifacts.Common.targets
index 0f15c194..a045f32e 100644
--- a/src/Artifacts/build/Microsoft.Build.Artifacts.Common.targets
+++ b/src/Artifacts/build/Microsoft.Build.Artifacts.Common.targets
@@ -10,14 +10,7 @@
   </PropertyGroup>
 
   <UsingTask TaskName="Robocopy"
-             AssemblyFile="$([MSBuild]::ValueOrDefault('$(ArtifactsTaskAssembly)', '$(MSBuildThisFileDirectory)net46\Microsoft.Build.Artifacts.dll'))"
-             Condition="'$(MSBuildRuntimeType)' != 'Core' And '$(MSBuildVersion)' &lt; '16.0'" />
-  <UsingTask TaskName="Robocopy"
-             AssemblyFile="$([MSBuild]::ValueOrDefault('$(ArtifactsTaskAssembly)', '$(MSBuildThisFileDirectory)net472\Microsoft.Build.Artifacts.dll'))"
-             Condition="'$(MSBuildRuntimeType)' != 'Core' And '$(MSBuildVersion)' &gt;= '16.0'" />
-  <UsingTask TaskName="Robocopy"
-             AssemblyFile="$([MSBuild]::ValueOrDefault('$(ArtifactsTaskAssembly)', '$(MSBuildThisFileDirectory)netstandard2.0\Microsoft.Build.Artifacts.dll'))"
-             Condition="'$(MSBuildRuntimeType)' == 'Core'" />
+             AssemblyFile="$([MSBuild]::ValueOrDefault('$(ArtifactsTaskAssembly)', '$(MSBuildThisFileDirectory)netstandard2.0\Microsoft.Build.Artifacts.dll'))" />
 
   <ItemDefinitionGroup>
     <Robocopy>
diff --git a/src/Artifacts/version.json b/src/Artifacts/version.json
index 05408c3a..62468fe8 100644
--- a/src/Artifacts/version.json
+++ b/src/Artifacts/version.json
@@ -1,4 +1,4 @@
 {
   "inherit": true,
-  "version": "5.0"
+  "version": "6.0"
 }