[release/10.0.1xx] Enable CollatePackageDownloads (#51080)

Co-authored-by: Matt Mitchell (.NET) <[email protected]>
Co-authored-by: Viktor Hofer <[email protected]>

Author: 3 people

src/Layout/redist/targets/GeneratePackagePruneData.targets

@@ -30,13 +30,12 @@
     </MSBuild>
   </Target>
 
-  <!-- TODO: Remove conditions from UsingTask and target when a new SDK with the CollatePackageDownload task built-in is consumed. -->
-  <UsingTask TaskName="Microsoft.NET.Build.Tasks.CollatePackageDownloads" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" Condition="'$(MaxNetVersion)' != '$(TargetingPackPruneVersion)'" />
+  <UsingTask TaskName="Microsoft.NET.Build.Tasks.CollatePackageDownloads" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
   <Target Name="AddTargetingPacksForPruneDataAsPackageDownloads"
           BeforeTargets="CollectPackageDownloads"
-          DependsOnTargets="GetTargetingPacksForPruneData"
-          Condition="'$(MaxNetVersion)' != '$(TargetingPackPruneVersion)'">
-    <CollatePackageDownloads Packages="@(TargetingPackForPruneData->Metadata('PackageName'))">
+          DependsOnTargets="GetTargetingPacksForPruneData">
+    <CollatePackageDownloads Packages="@(TargetingPackForPruneData->Metadata('PackageName'))"
+                             Condition="'@(TargetingPackForPruneData)' != ''">
       <Output TaskParameter="PackageDownloads" ItemName="PackageDownload" />
     </CollatePackageDownloads>
   </Target>

src/Tasks/sdk-tasks/sdk-tasks.InTree.targets

@@ -13,7 +13,6 @@
   <UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="CalculateTemplateVersions" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
-  <UsingTask TaskName="CollatePackageDownloads" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="Crossgen" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="ExtractArchiveToDirectory" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="GenerateDefaultRuntimeFrameworkVersion" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />