Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/Layout/redist/targets/GeneratePackagePruneData.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/Tasks/sdk-tasks/sdk-tasks.InTree.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading