Skip to content

Restore trimming test projects serially #65668

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.

Sign up for GitHub

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

Merged
wtgodbe merged 4 commits into from
Mar 6, 2026
Merged

Restore trimming test projects serially #65668

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49f5e8b
Retry restore in linker tests if first one fails
wtgodbe Mar 5, 2026
b374645
Fixup
wtgodbe Mar 5, 2026
87b9742
New approach
wtgodbe Mar 6, 2026
3f69570
Merge branch 'main' into wtgodbe/FixAlreadyExists
wtgodbe Mar 6, 2026
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
11 changes: 11 additions & 0 deletions eng/testing/linker/trimmingTests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,20 @@
<MSBuild Projects="@(TestConsoleApps)"
BuildInParallel="false"
Targets="Restore"
ContinueOnError="ErrorAndContinue"
Condition="'$(SkipTrimmingProjectsRestore)' != 'true'"
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());Configuration=$(Configuration);RestoreDisableParallel=true" />

<!-- Retry restore if the first attempt failed due to a concurrent NuGet file-move race on Windows (https://github.com/dotnet/aspnetcore/issues/61178).
Multiple trimming-test .proj files restore in parallel; their static-graph restores can race when
committing project.assets.json for shared ProjectReference targets. The retry succeeds because the
competing restore has finished by then, and already-restored projects are quick no-ops. -->
<MSBuild Projects="@(TestConsoleApps)"
BuildInParallel="false"
Targets="Restore"
Condition="'$(SkipTrimmingProjectsRestore)' != 'true' and '$(MSBuildLastTaskResult)' != 'true'"
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());Configuration=$(Configuration);RestoreDisableParallel=true" />

<MSBuild Projects="@(TestConsoleApps)"
Targets="Publish"
Properties="Configuration=$(Configuration);BuildProjectReferences=false" />
Expand Down
Loading