6.0.0: Fix x86 installer bug: it gets installed as an x64 component and has the same UpgradeCode as the x64 installer leading to an uninstallation of an x64 installation (and vice versa)#5822
Closed
bergmeister wants to merge 2 commits intoPowerShell:6.0.0from
Conversation
…of them: -Make x86 installer to be installed as a x86 component (-arch argument to candle.exe) -Make the UpgradeCode unique per platform Additionally, the architecture was appended to the package name to be able to distinguish the installations. Simplified architecture variable use to have only 1 variable for it.
Member
|
Closing this PR. Maintainers will submit PR merging #5812 from master to |
Contributor
Author
|
OK. What I have seen locally, is that it merges fine with 6.0.0 except for a whitespace conflict that tortoise-git auto-merged for me. |
Member
|
PR #5828 is open to merge the equivalent to |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
PR Summary
This is the PR for 6.0.0, which is based on the 6.0.0 branch with the cherry-picked commit fix.
It fixes bug #5597: x86/x64 installer are uninstalling each other when installing either of them:
-Make x86 installer to be installed as a x86 component (-arch argument to candle.exe, which sets the
sys.BUILDARCHvariable)-Make the UpgradeCode unique per platform
Replace
var.ProductTargetArchitecturevariable with sys.BUILDARCH use to have only 1 variable for the architectureAdditionally, the architecture was appended to the package name to be able to distinguish the installations.
Windows installer PRs usually got reviewed by @SteveL-MSFT in the past.
PR Checklist
Note: Please mark anything not applicable to this PR
NA.[feature]if the change is significant or affectes feature testsWIP:to the beginning of the title and remove the prefix when the PR is ready.