Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Remove rcedit dependency, move daily ico dependency to props file#13123

Merged
rjmholt merged 6 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
TylerLeonhardt:move-rcedit-logicTylerLeonhardt/PowerShell:move-rcedit-logicCopy head branch name to clipboard
Jul 21, 2020
Merged

Remove rcedit dependency, move daily ico dependency to props file#13123
rjmholt merged 6 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
TylerLeonhardt:move-rcedit-logicTylerLeonhardt/PowerShell:move-rcedit-logicCopy head branch name to clipboard

Conversation

@TylerLeonhardt

Copy link
Copy Markdown
Member

PR Summary

Move rcedit logic to the packaging script so that rcedit is run at packing time instead of during the installation.

PR Context

Currently rcedit (which sets the icon to the PowerShell avatar ico file) both:

  • doesn't work because the ico file is not included in the assets
  • is downloaded and ran on the client which doesn't make sense

This PR moves that logic from install-powershell.ps1 to packaging.psm1

This also includes a launch config that was used to debug the packaging script.

I did verify that the icon changed at package time.

PR Checklist

Comment thread .vscode/launch.json Outdated
Comment thread tools/packaging/packaging.psm1 Outdated
Comment thread tools/packaging/packaging.psm1 Outdated
Comment thread tools/packaging/packaging.psm1 Outdated
Co-authored-by: Robert Holt <rjmholt@gmail.com>
@rjmholt rjmholt added WG-Maintainers-Build specific to affecting the build CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log labels Jul 7, 2020
@iSazonov

iSazonov commented Jul 8, 2020

Copy link
Copy Markdown
Collaborator

Sorry for being late, but I wonder why do we need a special path if we can add new line here:

<ApplicationIcon Condition="$(ProductVersion.Contains('preview'))">..\..\assets\Powershell_av_colors.ico</ApplicationIcon>
<ApplicationIcon Condition="!$(ProductVersion.Contains('preview'))">..\..\assets\Powershell_black.ico</ApplicationIcon>

We could simple check an environment variable in the condition.

@TylerLeonhardt

Copy link
Copy Markdown
Member Author

wow nice find @iSazonov! That did the trick!

Comment thread PowerShell.Common.props
@iSazonov

iSazonov commented Jul 9, 2020

Copy link
Copy Markdown
Collaborator

@TravisEz13 @rjmholt Please review the PR again.

@iSazonov iSazonov requested review from TravisEz13 and rjmholt July 9, 2020 15:06

@rjmholt rjmholt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think we should remove the debug configuration to make commit picking easier

@ghost ghost added the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label Jul 13, 2020
@ghost ghost removed the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label Jul 13, 2020
@TylerLeonhardt

Copy link
Copy Markdown
Member Author

done

@iSazonov

Copy link
Copy Markdown
Collaborator

It seems CI-install fail is related #13163.

@ghost ghost added the Review - Needed The PR is being reviewed label Jul 21, 2020
@ghost

ghost commented Jul 21, 2020

Copy link
Copy Markdown

This pull request has been automatically marked as Review Needed because it has been there has not been any activity for 7 days.
Maintainer, please provide feedback and/or mark it as Waiting on Author

@rjmholt rjmholt changed the title Move rcedit logic to packaging script Remove rcedit dependency, move preview ico dependency to props file Jul 21, 2020
@rjmholt rjmholt changed the title Remove rcedit dependency, move preview ico dependency to props file Remove rcedit dependency, move daily ico dependency to props file Jul 21, 2020
@rjmholt rjmholt merged commit 8bea610 into PowerShell:master Jul 21, 2020
@iSazonov iSazonov removed the Review - Needed The PR is being reviewed label Jul 21, 2020
@iSazonov iSazonov added this to the 7.1.0-preview.7 milestone Jul 21, 2020
@TravisEz13 TravisEz13 modified the milestones: 7.1.0-preview.7, 7.1.0-preview.6 Aug 5, 2020
@ghost

ghost commented Aug 17, 2020

Copy link
Copy Markdown

🎉v7.1.0-preview.6 has been released which incorporates this pull request.:tada:

Handy links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log WG-Maintainers-Build specific to affecting the build

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.