Skip to content

Conversation

@ellahathaway
Copy link
Member

@ellahathaway ellahathaway commented Nov 13, 2025

@ellahathaway ellahathaway merged commit a8b9e73 into dotnet:main Nov 21, 2025
10 checks passed
@ellahathaway ellahathaway deleted the microbuild-temp branch November 21, 2025 23:35
@ellahathaway
Copy link
Member Author

/backport to release/10.0

@github-actions
Copy link
Contributor

Started backporting to release/10.0 (link to workflow run)

@github-actions
Copy link
Contributor

@ellahathaway backporting to release/10.0 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: Install MicroBuild in temporary directory
Using index info to reconstruct a base tree...
M	eng/common/core-templates/steps/install-microbuild.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/common/core-templates/steps/install-microbuild.yml
CONFLICT (content): Merge conflict in eng/common/core-templates/steps/install-microbuild.yml
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 0001 Install MicroBuild in temporary directory
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.

[Signing] Avoid installing MicroBuild plugin to sources directory

2 participants