Skip to content

Disable parallel restore for linker tests#65372

Merged
wtgodbe merged 6 commits intomainfrom
wtgodbe/linkparallel
Feb 10, 2026
Merged

Disable parallel restore for linker tests#65372
wtgodbe merged 6 commits intomainfrom
wtgodbe/linkparallel

Conversation

@wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Feb 9, 2026

All remaining instances of #61178 are in the linker tests. This workaround has fixed all the other instances of it, so we should add it here too.

@wtgodbe wtgodbe requested a review from a team as a code owner February 9, 2026 17:53
Copilot AI review requested due to automatic review settings February 9, 2026 17:53
@github-actions github-actions bot added the needs-area-label Used by the dotnet-issue-labeler to label those issues which couldn't be triaged automatically label Feb 9, 2026
Copy link
Contributor

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 applies an existing workaround to the linker/trimming test project template to mitigate intermittent restore-time file contention failures (tracked in aspnetcore#61178).

Changes:

  • Disable NuGet parallel restore for generated linker test projects by setting RestoreDisableParallel=true.
  • Add an inline comment documenting the rationale for disabling parallel restore.

@wtgodbe
Copy link
Member Author

wtgodbe commented Feb 9, 2026

/backport to release/10.0

@wtgodbe
Copy link
Member Author

wtgodbe commented Feb 9, 2026

/backport to release/9.0

@wtgodbe
Copy link
Member Author

wtgodbe commented Feb 9, 2026

/backport to release/8.0

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2026

Started backporting to release/10.0 (link to workflow run)

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2026

Started backporting to release/9.0 (link to workflow run)

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2026

Started backporting to release/8.0 (link to workflow run)

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2026

@wtgodbe backporting to release/8.0 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Disable parallel restore for linker tests
Using index info to reconstruct a base tree...
M	eng/testing/linker/project.csproj.template
Falling back to patching base and 3-way merge...
Auto-merging eng/testing/linker/project.csproj.template
CONFLICT (content): Merge conflict in eng/testing/linker/project.csproj.template
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 Disable parallel restore for linker tests
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

Added a property group to disable parallel restore for trimming test projects to mitigate a specific issue.
@wtgodbe
Copy link
Member Author

wtgodbe commented Feb 9, 2026

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@wtgodbe
Copy link
Member Author

wtgodbe commented Feb 9, 2026

Test failures are dotnet/dnceng#4756

@wtgodbe wtgodbe merged commit a218afe into main Feb 10, 2026
21 of 25 checks passed
@wtgodbe wtgodbe deleted the wtgodbe/linkparallel branch February 10, 2026 00:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-area-label Used by the dotnet-issue-labeler to label those issues which couldn't be triaged automatically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants