-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Enable CollatePackageDownloads #51072
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable CollatePackageDownloads #51072
Conversation
I came across an error in the .NET 11 branding update PR and saw the comment.
This PR is targeting |
@ViktorHofer It looks like the CollatePackageDownloads task is being used during restore, before the sdk tasks are built. Similar issue in the net11 upgrade PR. I'm thinking that the in-tree task usage is not correct here and maybe the issue? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR enables the CollatePackageDownloads
task by removing conditional logic that was preventing its use. The change removes a temporary condition that was checking if MaxNetVersion
differs from TargetingPackPruneVersion
, which was likely put in place as a workaround while waiting for SDK updates.
- Removes conditional usage of
CollatePackageDownloads
task - Removes unnecessary
UsingTask
declaration from sdk-tasks targets - Enables unconditional execution of targeting pack collection for prune data
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
File | Description |
---|---|
src/Tasks/sdk-tasks/sdk-tasks.InTree.targets | Removes duplicate UsingTask declaration for CollatePackageDownloads |
src/Layout/redist/targets/GeneratePackagePruneData.targets | Removes conditions from UsingTask and target to enable CollatePackageDownloads unconditionally |
Add condition to CollatePackageDownloads task for targeting packs.
/backport to main |
Started backporting to main: https://github.com/dotnet/sdk/actions/runs/18165275140 |
@mmitche backporting to "main" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Enable CollatePackageDownloads I came across an error in the .NET 11 branding update PR and saw the comment.
Using index info to reconstruct a base tree...
M src/Layout/redist/targets/GeneratePackagePruneData.targets
Falling back to patching base and 3-way merge...
Auto-merging src/Layout/redist/targets/GeneratePackagePruneData.targets
CONFLICT (content): Merge conflict in src/Layout/redist/targets/GeneratePackagePruneData.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Enable CollatePackageDownloads I came across an error in the .NET 11 branding update PR and saw the comment.
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
/backport to release/10.0.1xx |
Started backporting to release/10.0.1xx: https://github.com/dotnet/sdk/actions/runs/18166638861 |
I came across an error in the .NET 11 branding update PR and saw the comment.