Conversation
ghost
added
lewing
approved these changes
Aug 16, 2024
Member
|
@marcpopMSFT some failures in TestBuild: windows |
Member
|
and a lot of looks like it fixed the Windows SDK problem though. |
Member
|
/backport to release/9.0.1xx |
Contributor
|
Started backporting to release/9.0.1xx: https://github.com/dotnet/sdk/actions/runs/10444207357 |
Contributor
|
@lewing backporting to release/9.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update stage 0 to fix cppcli tests
Applying: The windows sdk changes made it into preview 7 so switching to that.
Applying: disable the framework hosted compiler package as it doesn't work in PR builds
Applying: Correctly set empty env variable
Using index info to reconstruct a base tree...
M test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs
Falling back to patching base and 3-way merge...
Auto-merging test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs
CONFLICT (content): Merge conflict in test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.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 advice.mergeConflict false"
Patch failed at 0004 Correctly set empty env variable
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@lewing an error occurred while backporting to release/9.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
marcpopMSFT
added a commit
that referenced
this pull request
Aug 18, 2024
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.
No description provided.