[automated] Merge branch 'main' => 'release/dnup'#55387
Open
github-actions[bot] wants to merge 12 commits into
Open
[automated] Merge branch 'main' => 'release/dnup'#55387github-actions[bot] wants to merge 12 commits into
github-actions[bot] wants to merge 12 commits into
Conversation
TestAsset.WithSource applied ~14 property/package-version substitutions by calling UpdateProjProperty/ReplacePackageVersionVariable in a loop, each of which reloaded and rewrote every project file in the asset. That meant ~14 XDocument load+save round-trips per project file during the setup of every test that calls WithSource (the standard setup path for hundreds of SDK integration tests). Extract the per-document mutation bodies into private static helpers and apply all substitutions in one WithProjectChanges pass, so each project file is loaded and saved once. Behavior is unchanged: verified byte-identical output across all 352 test-asset csproj files. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: a22eead4-88ca-4142-a6d8-a7199db73289
WithSource copied every source file to the destination and then, in the substitution pass, reloaded and re-saved each project/.xml file with the target-framework, runtime-identifier, and package-version substitutions applied. That meant every project file was written twice: once by File.Copy and again by the substitution save that immediately overwrote it. Skip the File.Copy for files that the substitution pass rewrites; instead load those directly from the source and write the substituted result straight to the destination once. Non-project files are still copied verbatim. Because File.Copy is an exact byte copy, loading from the source is equivalent to loading from the copied destination, so output is unchanged: verified byte-identical across all 257 test assets (1439 files, 0 differences) while eliminating 404 redundant writes (~22% of WithSource's file writes). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: a22eead4-88ca-4142-a6d8-a7199db73289
Address review feedback: use OfType<XAttribute>() to filter out null attributes returned by the LINQ chain instead of a redundant inner null-check. Behavior is unchanged. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: a22eead4-88ca-4142-a6d8-a7199db73289
Acknowledge the reviewed testfx terminal reporter and wire-contract drift without porting testfx-only structured progress or logging abstractions. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7e20f449-2997-4207-9a29-265519e73fd3
Qualify the dotnet test exit-code constants after the shared test framework introduced a conflicting ExitCode type. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7e20f449-2997-4207-9a29-265519e73fd3
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Reset patterns: - CODEOWNERS
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.
I detected changes in the main branch which have not been merged yet to release/dnup. I'm a robot and am configured to help you automatically keep release/dnup up to date, so I've opened this PR.
This PR merges commits made on main by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-release/dnup'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.