Packaging: simplify building an installable package for Windows#5871
Merged
TravisEz13 merged 4 commits intoPowerShell:masterfrom Jan 17, 2018
Merged
Packaging: simplify building an installable package for Windows#5871TravisEz13 merged 4 commits intoPowerShell:masterfrom
TravisEz13 merged 4 commits intoPowerShell:masterfrom
Conversation
… gets a new Guid when being called from `Start-PSPackage` - Add defaults for required files but also add extra path validation attribute - Rename ProductGuid to ProductCode
SteveL-MSFT
requested changes
Jan 12, 2018
build.psm1
Outdated
| This only works on a Windows machine due to the usage of WiX. | ||
| .EXAMPLE | ||
| # This example shows how to produce a Debug-x64 installer for development purposes. | ||
| cd $RootPathOfPowerShellCheckout |
Member
There was a problem hiding this comment.
Is it better to use the term Repo instead of Checkout?
build.psm1
Outdated
| @@ -2070,8 +2080,9 @@ function New-MSIPackage | |||
| [string] $ProductVersion, | |||
|
|
|||
| # Product Guid needs to change for every version to support SxS install | |||
Member
There was a problem hiding this comment.
This comment should probably be changed to: Product Code needs to be different for every version
tools/packaging/packaging.psm1
Outdated
| @@ -243,7 +243,7 @@ function Start-PSPackage { | |||
| AssetsPath = "$PSScriptRoot\..\..\assets" | |||
| LicenseFilePath = "$PSScriptRoot\..\..\assets\license.rtf" | |||
| # Product Guid needs to be unique for every PowerShell version to allow SxS install | |||
Member
There was a problem hiding this comment.
This comment should probably be changed to: Product Code needs to be different for every version
…g in comments) and use the word repo instead of checkout in comment to be more clear.
Contributor
Author
|
@SteveL-MSFT OK, I addressed your comments. |
TravisEz13
reviewed
Jan 13, 2018
build.psm1
Outdated
| [string] $ProductVersion, | ||
|
|
||
| # Product Guid needs to change for every version to support SxS install | ||
| # Product Code needs to change for every version to support SxS install |
Member
There was a problem hiding this comment.
Does this comment make sense any more?
The ProductCode property is a unique identifier for the particular product release
from https://msdn.microsoft.com/en-us/library/windows/desktop/aa370854(v=vs.85).aspx
TravisEz13
reviewed
Jan 13, 2018
tools/packaging/packaging.psm1
Outdated
| LicenseFilePath = "$PSScriptRoot\..\..\assets\license.rtf" | ||
| # Product Guid needs to be unique for every PowerShell version to allow SxS install | ||
| ProductGuid = New-Guid | ||
| # Product Code needs to be unique for every PowerShell version to allow SxS install |
Member
There was a problem hiding this comment.
This is not correct either... but here just remove the to allow SxS install part.
TravisEz13
reviewed
Jan 13, 2018
| <?define ProductName = "$(env.ProductName)" ?> | ||
| <?define ProductGuid = "$(env.ProductGuid)" ?> | ||
| <?define ProductCode = "$(env.ProductCode)" ?> | ||
| <!-- UpgradeCode GUID MUST REMAIN SAME THROUGHOUT ALL VERSIONS, otherwise, updates won't occur. --> |
Member
There was a problem hiding this comment.
This is actually where the comment about SxS should be (in the comment about the UpgradeCode.)
TravisEz13
requested changes
Jan 13, 2018
Member
TravisEz13
left a comment
There was a problem hiding this comment.
I have some comments about the comments
TravisEz13
approved these changes
Jan 16, 2018
SteveL-MSFT
approved these changes
Jan 16, 2018
TravisEz13
pushed a commit
that referenced
this pull request
Mar 15, 2018
This is the continuation of PR 5499 that had to be abandoned due to a fatal merge conflict and I did not want to risk accidentally reverting recent fixes.
Remove unnecessary/unused default for productGuid because it always gets a new Guid when being called from Start-PSPackage
Add defaults for required files but also add extra path validation attribute
Rename ProductGuid to ProductCode
# Conflicts:
# assets/Product.wxs
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
3 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 continuation of PR 5499 that had to be abandoned due to a fatal merge conflict and I did not want to risk accidentally reverting recent fixes.
Start-PSPackagePR 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.