Skip to content

Fix start menu folder clash of shortcut when both x86 and x64 are installed - #5826

Merged
Travis Plunk (TravisEz13) merged 2 commits into
PowerShell:masterfrom
bergmeister:StartMenuFix_ArchitectureSpecific
Jan 11, 2018
Merged

Fix start menu folder clash of shortcut when both x86 and x64 are installed#5826
Travis Plunk (TravisEz13) merged 2 commits into
PowerShell:masterfrom
bergmeister:StartMenuFix_ArchitectureSpecific

Conversation

@bergmeister

@bergmeister Christoph Bergmeister (bergmeister) commented Jan 8, 2018

Copy link
Copy Markdown
Contributor

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. Steve Lee (@SteveL-MSFT) Travis Plunk (@TravisEz13)

fixes #5825

Here is how it looks with the fix

image

PR Checklist

Note: Please mark anything not applicable to this PR NA.

…talled by appending " (x86)" for x86 to the .
Comment thread 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))"?>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

@bergmeister Christoph Bergmeister (bergmeister) Jan 8, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 Steve Lee (SteveL-MSFT) added this to the 6.1.0-MQ milestone Jan 8, 2018
@bergmeister

Copy link
Copy Markdown
Contributor Author

Steve Lee (@SteveL-MSFT) Do we need to document this minor issue for 6.0.0?

@bergmeister Christoph Bergmeister (bergmeister) changed the title Fix start menu folder clash of shortcut when both x86 and x64 are installed WIP (need to resolve merge conflict) Fix start menu folder clash of shortcut when both x86 and x64 are installed Jan 10, 2018
@SteveL-MSFT

Copy link
Copy Markdown
Member

cc Joey Aiello (@joeyaiello) to determine if it's worth calling out for 6.0.0

@TravisEz13 Travis Plunk (TravisEz13) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@bergmeister Christoph Bergmeister (bergmeister) changed the title WIP (need to resolve merge conflict) Fix start menu folder clash of shortcut when both x86 and x64 are installed Fix start menu folder clash of shortcut when both x86 and x64 are installed Jan 11, 2018
@bergmeister

Christoph Bergmeister (bergmeister) commented Jan 11, 2018

Copy link
Copy Markdown
Contributor Author

Conflict resolution was trivial by taking the old and new change. But I made one small change: instead of the short cut saying PowerShell-6.x.y I replaced the dash with a space because PowerShell 6.x.y looks better to me.

@TravisEz13

Copy link
Copy Markdown
Member

Joey Aiello (@joeyaiello) FYI

@TravisEz13
Travis Plunk (TravisEz13) merged commit bb09b88 into PowerShell:master Jan 11, 2018
Thatgfsj (Thatgfsj) pushed a commit to Thatgfsj-contribs/PowerShell that referenced this pull request Aug 6, 2026
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.

Windows installer: Start menu shortcuts are not architecture specific

3 participants