Update Microsoft.Build.Utilities.Core to 17.11.48 #6770
Merged
Conversation
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
nohwnd
approved these changes
Oct 20, 2025
|
/backport to rel/4.0 |
|
Started backporting to rel/4.0: https://github.com/microsoft/testfx/actions/runs/18977467755 |
|
/backport to rel/3.11 |
|
@nohwnd backporting to rel/4.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update Microsoft.Build.Utilities.Core to 17.11.48
Using index info to reconstruct a base tree...
M Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
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 Update Microsoft.Build.Utilities.Core to 17.11.48
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
|
Started backporting to rel/3.11: https://github.com/microsoft/testfx/actions/runs/18977472807 |
|
@nohwnd backporting to rel/3.11 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update Microsoft.Build.Utilities.Core to 17.11.48
Using index info to reconstruct a base tree...
M Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
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 Update Microsoft.Build.Utilities.Core to 17.11.48
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
|
/backport to rel/3.10 |
|
Started backporting to rel/3.10: https://github.com/microsoft/testfx/actions/runs/18978004387 |
|
@nohwnd backporting to rel/3.10 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update Microsoft.Build.Utilities.Core to 17.11.48
Using index info to reconstruct a base tree...
M Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
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 Update Microsoft.Build.Utilities.Core to 17.11.48
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Youssef1313
added a commit
that referenced
this pull request
Nov 1, 2025
…6770 (backport to rel/3.10) (#6848) Co-authored-by: Youssef Victor <[email protected]> Co-authored-by: Jakub Jareš <[email protected]>
Youssef1313
added a commit
that referenced
this pull request
Nov 1, 2025
…6770 (backport to rel/3.11) (#6847) Co-authored-by: Youssef Victor <[email protected]> Co-authored-by: Jakub Jareš <[email protected]>
Youssef1313
added a commit
that referenced
this pull request
Nov 1, 2025
…6770 (backport to rel/4.0) (#6846) Co-authored-by: Youssef Victor <[email protected]> Co-authored-by: Jakub Jareš <[email protected]>
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.
No description provided.