move rcedit step to build rather than packaging #5404
Conversation
SteveL-MSFT
requested review from
adityapatwardhan and
daxian-dbw
as code owners
build.psm1
Outdated
| throw "RCEdit is required to modify pwsh.exe resources, please run 'Start-PSBootStrap' to install" | ||
| } | ||
|
|
||
| $ProductVersion = (git --git-dir="$PSScriptRoot/.git" describe) -Replace '^v' |
There was a problem hiding this comment.
Use release tag parameter to get version if it was passed it. This is needed for release builds.
build.psm1
Outdated
| throw "RCEdit is required to modify pwsh.exe resources, please run 'Start-PSBootStrap' to install" | ||
| } | ||
|
|
||
| $ProductVersion = (git --git-dir="$PSScriptRoot/.git" describe) -Replace '^v' |
There was a problem hiding this comment.
Please use Get-PSCommitId instead of rewriting this code git --git-dir="$PSScriptRoot/.git" describe
build.psm1
Outdated
| $ProductVersion = (git --git-dir="$PSScriptRoot/.git" describe) -Replace '^v' | ||
| if (!$ReleaseTag) | ||
| { | ||
| $ReleaseTag = Get-PSCommitId |
There was a problem hiding this comment.
you still need to remove the v at the beginning.
Get-PSVersion will do that for you, but I don't have a function to do this for the releasetag.
build.psm1
Outdated
| $ReleaseVersion = "" | ||
| if ($ReleaseTag) | ||
| { | ||
| $ReleaseVersion = $ReleaseTag -replace '^v' |
There was a problem hiding this comment.
$ReleaseTagToUse should already be this value
|
Minor but worth pointing out: The bracing style for if statements is inconsistent. |
|
@bergmeister I think that's a fair point. Will update for the code I added. |
|
The macOS CI was canceled by Travis-CI ... |
|
@TravisEz13 note that even the step is moved to build phase, it's the |
Fix #5403