Skip to content

Disambiguate icon on Windows for preview builds/installers to use Powershell_av_colors and make daily build use Powershell_avatar instead #7086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
TravisEz13 merged 1 commit into from
Jun 18, 2018
Merged

Disambiguate icon on Windows for preview builds/installers to use Powershell_av_colors and make daily build use Powershell_avatar instead #7086

TravisEz13 merged 1 commit into from
Jun 18, 2018

Conversation

@bergmeister
Copy link
Contributor

@bergmeister bergmeister commented Jun 15, 2018 •
edited
Loading

PR Summary

Closes #6317
Using the preview side-by-side with the RTM version is a pain/confusing due to the icons being the same.
This makes the preview build (i.e. the embedded icon in pwsh.exe) and MSI installer package (shortcut icon and context menu) use the Powershell_av_colors icon
image

Therefore change the icon of the daily build (which used to use the Powershell_av_colors icon) to Powershell_avatar
image
This means that people like me who have a shortcut to pwsh of the daily build pinned to the taskbar, probably need to re-pin it to the taskbar to receive all changes (otherwise one will only get the change in the icon of the window)

Note: The Test-IsPreview method had to be moved to the build module, which is OK because the packaging module has a declared dependency on the build module in its manifest.

PR Checklist

@bergmeister
Disambiguate icon on Windows for preview builds/installers to use Pow…
8b357da 
…ershell_av_colors and make daily build use Powershell_avatar instead
@bergmeister bergmeister changed the title Disambiguate icon on Windows for preview builds/installers to use Powershell_av_colors and make daily build use Powershell_avatar instead WIP: Disambiguate icon on Windows for preview builds/installers to use Powershell_av_colors and make daily build use Powershell_avatar instead Jun 15, 2018
@bergmeister
Copy link
Contributor Author

bergmeister commented Jun 15, 2018 •
edited
Loading

When testing it locally, I found that everything (pwsh.exe, context menu, taskbar menu) worked, except for the StartMenu shortcut that I still need to look into (maybe this was more of a persistency issue) --> It turned out this was a problem of the uninstaller not removing the start menu entry shortcut, we have seen this sometimes, see #2881. But otherwise it works fine on a clean install.

TravisEz13
TravisEz13 reviewed Jun 15, 2018
View reviewed changes
tools/install-powershell.ps1

Write-Verbose "Change icon to disambiguate it from a released installation" -Verbose
& "~/.rcedit/rcedit-x64.exe" "$Destination\pwsh.exe" --set-icon "$Destination\assets\Powershell_av_colors.ico"
& "~/.rcedit/rcedit-x64.exe" "$Destination\pwsh.exe" --set-icon "$Destination\assets\Powershell_avatar.ico"
Copy link
Member

@TravisEz13 TravisEz13 Jun 15, 2018

Choose a reason for hiding this comment

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

why isn't this one of the same icons set during the build?

Copy link
Contributor Author

@bergmeister bergmeister Jun 15, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

This is for the daily build only (which I still want to disambiguate from preview as I have RTM, preview and daily versions pinned to my taskbar), see my summary.

Copy link
Member

@TravisEz13 TravisEz13 Jun 15, 2018

Choose a reason for hiding this comment

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

ok, makes sense.

@bergmeister bergmeister changed the title WIP: Disambiguate icon on Windows for preview builds/installers to use Powershell_av_colors and make daily build use Powershell_avatar instead Disambiguate icon on Windows for preview builds/installers to use Powershell_av_colors and make daily build use Powershell_avatar instead Jun 15, 2018
@bergmeister
Copy link
Contributor Author

bergmeister commented Jun 15, 2018 •
edited
Loading

@TravisEz13 The PR is now fully ready for review, I just had to test the AppVeyor artifacts on a clean VM (locally I had some left-overs and it seems that the Windows search history when typing [Windows key] PowerShell it shows the old icon on my system where a previous version was already installed, but when following the shortcut, the shortcut is correct, therefore this is just an OS issue of the Windows search history caching since that does not happen on a system that never had a preview installed).

@TravisEz13 TravisEz13 merged commit 0487a1b into PowerShell:master Jun 18, 2018
daxian-dbw added a commit that referenced this pull request Jun 19, 2018
@daxian-dbw
Revert "Disambiguate icon on Windows for preview builds/installers to…
71341aa 
… use Powershell_av_colors and make daily build use Powershell_avatar instead (#7086)"

This reverts commit 0487a1b.
@SteveL-MSFT SteveL-MSFT mentioned this pull request Aug 4, 2018
Closed
@thezim thezim mentioned this pull request Aug 4, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TravisEz13 TravisEz13 TravisEz13 approved these changes

@adityapatwardhan adityapatwardhan Awaiting requested review from adityapatwardhan

@anmenaga anmenaga Awaiting requested review from anmenaga

@daxian-dbw daxian-dbw Awaiting requested review from daxian-dbw

@joeyaiello joeyaiello Awaiting requested review from joeyaiello

@SteveL-MSFT SteveL-MSFT Awaiting requested review from SteveL-MSFT

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Preview Releases (and builds?) to have a different icon to help distinguish from production version

2 participants

@bergmeister @TravisEz13