Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
5 changes: 2 additions & 3 deletions src/Layout/redist/targets/GeneratePackagePruneData.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
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