From 08e8d00cbeef15ac9dcd5799251406080b2e8da1 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Tue, 30 Sep 2025 16:00:51 -0700
Subject: [PATCH 1/3] Enable CollatePackageDownloads I came across an error in
 the .NET 11 branding update PR and saw the comment.

---
 src/Layout/redist/targets/GeneratePackagePruneData.targets | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Layout/redist/targets/GeneratePackagePruneData.targets b/src/Layout/redist/targets/GeneratePackagePruneData.targets
index 157eeabd5cd4..2293cfe4647f 100644
--- a/src/Layout/redist/targets/GeneratePackagePruneData.targets
+++ b/src/Layout/redist/targets/GeneratePackagePruneData.targets
@@ -31,11 +31,10 @@
   </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)'">
+          DependsOnTargets="GetTargetingPacksForPruneData">
     <CollatePackageDownloads Packages="@(TargetingPackForPruneData->Metadata('PackageName'))">
       <Output TaskParameter="PackageDownloads" ItemName="PackageDownload" />
     </CollatePackageDownloads>

From 97dab4da30a2f923abb806d29e604db605a92849 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Tue, 30 Sep 2025 16:20:40 -0700
Subject: [PATCH 2/3] Do not use in-tree CollatePackageDownloads

---
 src/Tasks/sdk-tasks/sdk-tasks.InTree.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Tasks/sdk-tasks/sdk-tasks.InTree.targets b/src/Tasks/sdk-tasks/sdk-tasks.InTree.targets
index 2176f30216f7..547f8ccd7595 100644
--- a/src/Tasks/sdk-tasks/sdk-tasks.InTree.targets
+++ b/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" />

From 56cfa3103c5d59f8bf09a896c8ef52125f2e97c4 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 1 Oct 2025 13:50:02 +0200
Subject: [PATCH 3/3] Add condition to CollatePackageDownloads task

Add condition to CollatePackageDownloads task for targeting packs.
---
 src/Layout/redist/targets/GeneratePackagePruneData.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Layout/redist/targets/GeneratePackagePruneData.targets b/src/Layout/redist/targets/GeneratePackagePruneData.targets
index 2293cfe4647f..f414f6582c75 100644
--- a/src/Layout/redist/targets/GeneratePackagePruneData.targets
+++ b/src/Layout/redist/targets/GeneratePackagePruneData.targets
@@ -30,12 +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)" />
   <Target Name="AddTargetingPacksForPruneDataAsPackageDownloads"
           BeforeTargets="CollectPackageDownloads"
           DependsOnTargets="GetTargetingPacksForPruneData">
-    <CollatePackageDownloads Packages="@(TargetingPackForPruneData->Metadata('PackageName'))">
+    <CollatePackageDownloads Packages="@(TargetingPackForPruneData->Metadata('PackageName'))"
+                             Condition="'@(TargetingPackForPruneData)' != ''">
       <Output TaskParameter="PackageDownloads" ItemName="PackageDownload" />
     </CollatePackageDownloads>
   </Target>