[release/6.0] Update signed wix version for arm64 fixes #60008
Merged
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
|
Tagging subscribers to this area: @Anipik, @safern, @ViktorHofer Issue DetailsTell mode packaging related tooling upadate. Fixes the mono workload side of #60003
|
lewing
added
packaging
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsTell mode packaging related tooling update. Fixes the mono workload side of #60003
|
lewing
changed the title
joeloff
approved these changes
Oct 5, 2021
lewing
added
Servicing-approved
|
tell mode email sent, can someone please merge |
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/runtime/actions/runs/1310345085 |
|
@ericstj backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update signed wix version to 1.0.0-v3.14.0.5722
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.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 Update signed wix version to 1.0.0-v3.14.0.5722
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! |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Tell mode packaging related tooling update.
Updated WiX build that contains changes to better support x64 emulation on arm64. This is needed for 6.0.
Fixes the mono workload side of #60003