Restore trimming test projects serially#65668
Merged
Conversation
wtgodbe
added
the
area-infrastructure
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a conditional restore retry in linker trimming tests to work around intermittent NuGet restore races (notably on Windows) when multiple trimming test projects restore shared TestConsoleApps concurrently.
Changes:
- Allows the initial
RestoreMSBuild invocation to continue after failure. - Adds a second
Restoreinvocation that runs only if the first restore failed. - Documents the rationale and links the tracked issue.
BrennanConroy
approved these changes
Mar 5, 2026
Member
Author
|
/backport to release/10.0 |
Contributor
|
Started backporting to |
11 tasks
Member
Author
|
That clearly didn't work. Trying something else |
wtgodbe
changed the title
SamMonoRT
approved these changes
Mar 6, 2026
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
Member
Author
|
/backport to release/10.0 |
Contributor
|
Started backporting to |
Member
Author
|
/backport to release/10.0 |
Contributor
|
Started backporting to |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Should fix the last flavor of #61178. Trimming tests are built by
BuildAfterTargetingPack.csproj, which first callsRestoreserially, then callsTestin parallel. But the trimming test projects were overwritingRestorewith a no-op target, so the actual restoring was happening in parallel, inPublishTrimmedProjects, which gets called in the target chain forTest. If we haveRestoreactually restore, it'll happen serially like we want.