[release/dev18.0] Fix build task integration tests#81245
Merged
jjonescz merged 3 commits intodotnet:release/dev18.0from Nov 16, 2025
Merged
[release/dev18.0] Fix build task integration tests#81245jjonescz merged 3 commits intodotnet:release/dev18.0from
jjonescz merged 3 commits intodotnet:release/dev18.0from
Conversation
JoeRobich
approved these changes
Nov 15, 2025
Member
Author
|
/backport to release/dev18.3 |
Contributor
|
Started backporting to |
Contributor
|
@jjonescz backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: [release/dev18.0] Fix build task integration tests
Applying: Unskip tests
Using index info to reconstruct a base tree...
M src/Compilers/Core/MSBuildTaskTests/TestUtilities/IntegrationTestBase.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Compilers/Core/MSBuildTaskTests/TestUtilities/IntegrationTestBase.cs
CONFLICT (content): Merge conflict in src/Compilers/Core/MSBuildTaskTests/TestUtilities/IntegrationTestBase.cs
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 0002 Unskip tests
Error: The process '/usr/bin/git' failed with exit code 128 |
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
2 participants
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.
Backport of #81128.
Closes #81246.