Skip to content

Conversation

@jjonescz
Copy link
Member

@jjonescz jjonescz commented Nov 14, 2025

Backport of #81128.
Closes #81246.

@jjonescz jjonescz marked this pull request as ready for review November 15, 2025 09:17
@jjonescz jjonescz requested a review from a team as a code owner November 15, 2025 09:17
@jjonescz jjonescz requested a review from a team as a code owner November 15, 2025 10:00
@jjonescz jjonescz merged commit 6319e34 into dotnet:release/dev18.0 Nov 16, 2025
28 checks passed
@jjonescz jjonescz deleted the build-task-tests-18.0 branch November 16, 2025 09:16
@jjonescz
Copy link
Member Author

/backport to release/dev18.3

@github-actions
Copy link
Contributor

Started backporting to release/dev18.3 (link to workflow run)

@github-actions
Copy link
Contributor

@jjonescz backporting to release/dev18.3 failed, the patch most likely resulted in conflicts. Please backport manually!

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

Link to workflow output

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants