Fix start menu folder clash of shortcut when both x86 and x64 are installed#5826
Conversation
…talled by appending " (x86)" for x86 to the .
assets/Product.wxs
Outdated
| <?define ProductSemanticVersionWithNameAndOptionalArchitecture = "$(var.ProductName)-$(env.ProductSemanticVersion)"?> | ||
| <?else?> | ||
| <?define UpgradeCode = "1d00683b-0f84-4db8-a64f-2f98ad42fe06" ?> | ||
| <?define ProductSemanticVersionWithNameAndOptionalArchitecture = "$(var.ProductName)-$(env.ProductSemanticVersion) ($(sys.BUILDARCH))"?> |
There was a problem hiding this comment.
Any reason we are using a - and a _ in ProductVersionWithName?
If not, could we define ProductVersionWithName before this and use it instead of composing this from the components?
There was a problem hiding this comment.
I don't know. ProductVersionWithName was like that since 2016 if you do a blame on it. One would need to look at all usages and analyse them if one could change it. But to me it seems unrelated to the bug fix. But we can clean up the installer in a separate PR later?
|
@SteveL-MSFT Do we need to document this minor issue for 6.0.0? |
|
cc @joeyaiello to determine if it's worth calling out for 6.0.0 |
TravisEz13
left a comment
There was a problem hiding this comment.
It should be reviewed again after merge conflict is resolved.
…o StartMenuFix_ArchitectureSpecific Conflict resolution by taking both and made one small change: replaceed dash with space between product name and version in short cut name # Conflicts: # assets/Product.wxs
|
Conflict resolution was trivial by taking the old and new change. But I made one small change: instead of the short cut saying |
|
@joeyaiello FYI |
PR Summary
Fix clash of start menu shortcuts when x86 and x64 are both installed by appending " (x86)" for x86. This bug would affect 6.0.0. as well but is less severe. @SteveL-MSFT @TravisEz13
fixes #5825
Here is how it looks with the fix
PR Checklist
Note: Please mark anything not applicable to this PR
NA.[feature]if the change is significant or affects feature testsWIP:to the beginning of the title and remove the prefix when the PR is ready.