Skip to content

Conversation

@marcpopMSFT
Copy link
Member

No description provided.

@ghost ghost added Area-Workloads untriaged Request triage from a team member labels Aug 16, 2024
@lewing lewing enabled auto-merge (squash) August 16, 2024 22:57
@lewing
Copy link
Member

lewing commented Aug 16, 2024

@marcpopMSFT some failures in TestBuild: windows

@lewing
Copy link
Member

lewing commented Aug 16, 2024

and a lot of error NU1102: Unable to find package Microsoft.Net.Sdk.Compilers.Toolset with version (= 9.0.100-ci)

looks like it fixed the Windows SDK problem though.

@lewing lewing merged commit 562992c into main Aug 18, 2024
@lewing lewing deleted the marcpopMSFT-fixcpp branch August 18, 2024 21:11
@lewing
Copy link
Member

lewing commented Aug 18, 2024

/backport to release/9.0.1xx

@github-actions
Copy link
Contributor

Started backporting to release/9.0.1xx: https://github.com/dotnet/sdk/actions/runs/10444207357

@github-actions
Copy link
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 128

Please backport manually!

@github-actions
Copy link
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.

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

Labels

Area-Workloads untriaged Request triage from a team member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants