Add the MSBuild 17.3.4 prebuilt to the reference packages #952
Conversation
This file contains 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
marcpopMSFT
requested review from
MichaelSimons,
mthalman and
oleksandr-didyk
as code owners
mthalman
requested changes
May 6, 2024
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
mthalman
approved these changes
May 7, 2024
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/source-build-reference-packages/actions/runs/9084028237 |
|
@marcpopMSFT backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Add the MSBuild 17.3.4 prebuilt to the reference packages
Using index info to reconstruct a base tree...
M eng/Build.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Build.props
CONFLICT (content): Merge conflict in eng/Build.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add the MSBuild 17.3.4 prebuilt to the reference packages
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@marcpopMSFT an error occurred while backporting to main, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Merged
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Trying to fix the source build here: dotnet/roslyn#73283
Did I run the tooling correctly?