-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Update stage 0 to fix cppcli tests #42806
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
@marcpopMSFT some failures in TestBuild: windows |
|
and a lot of looks like it fixed the Windows SDK problem though. |
|
/backport to release/9.0.1xx |
|
Started backporting to release/9.0.1xx: https://github.com/dotnet/sdk/actions/runs/10444207357 |
|
@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! |
|
@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. |
No description provided.