Skip to content

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Sep 30, 2025

I came across an error in the .NET 11 branding update PR and saw the comment.

I came across an error in the .NET 11 branding update PR and saw the comment.
@Copilot Copilot AI review requested due to automatic review settings September 30, 2025 23:02
Copy link
Contributor

This PR is targeting main, which is now for .NET 11-facing work. If you intended to target .NET 10, either retarget this PR to release/10.0.1xx or make sure you backport the change to release/10.0.1xx after merging. See #50394 for more details.

@mmitche mmitche requested review from ViktorHofer and removed request for Copilot September 30, 2025 23:02
@mmitche
Copy link
Member Author

mmitche commented Sep 30, 2025

@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?

@Copilot Copilot AI review requested due to automatic review settings September 30, 2025 23:20
Copy link
Contributor

@Copilot Copilot AI left a 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.
@ViktorHofer ViktorHofer enabled auto-merge (squash) October 1, 2025 11:51
@ViktorHofer ViktorHofer merged commit 0c1e1fc into dotnet:main Oct 1, 2025
27 checks passed
@mmitche
Copy link
Member Author

mmitche commented Oct 1, 2025

/backport to main

Copy link
Contributor

github-actions bot commented Oct 1, 2025

Started backporting to main: https://github.com/dotnet/sdk/actions/runs/18165275140

Copy link
Contributor

github-actions bot commented Oct 1, 2025

@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!

@mmitche
Copy link
Member Author

mmitche commented Oct 1, 2025

/backport to release/10.0.1xx

Copy link
Contributor

github-actions bot commented Oct 1, 2025

Started backporting to release/10.0.1xx: https://github.com/dotnet/sdk/actions/runs/18166638861

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants