[release/10.0.1xx] Use backward-compatible GUID generation in Wix 5 #2926
Conversation
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
joeloff
approved these changes
Oct 15, 2025
Member
|
/backport to release/10.0.2xx |
Contributor
Author
|
Started backporting to release/10.0.2xx: https://github.com/dotnet/dotnet/actions/runs/18542164140 |
Contributor
Author
|
@NikolaMilosavljevic backporting to "release/10.0.2xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add support for AdditionalOptions to CreateWixBuildWixpack task
Applying: Add AdditionalOptions support to shared infra
Applying: Add support for AdditionalOptions in sdk and aspnetcore builds
Using index info to reconstruct a base tree...
A src/aspnetcore/src/Installers/Windows/Wix.targets
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/aspnetcore/src/Installers/Windows/Wix.targets deleted in HEAD and modified in Add support for AdditionalOptions in sdk and aspnetcore builds. Version Add support for AdditionalOptions in sdk and aspnetcore builds of src/aspnetcore/src/Installers/Windows/Wix.targets left in tree.
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 0003 Add support for AdditionalOptions in sdk and aspnetcore builds
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Backport of #2794 to release/10.0.1xx
/cc @NikolaMilosavljevic