Skip to content

make sure all references to the Pkg ID for previews packages is powershell-preview #7066

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

Merged
TravisEz13 merged 3 commits into from
Jun 14, 2018
Merged

make sure all references to the Pkg ID for previews packages is powershell-preview #7066

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a123321
make sure all references to the Pkg ID for previews are com.microsoft…
TravisEz13 Jun 14, 2018
c8cb985
fix issue with replacement
TravisEz13 Jun 14, 2018
faeeccb
make the replace regex stricter and add a comment
TravisEz13 Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ function New-UnixPackage {
$IsPreview = Test-IsPreview -Version $Version

# Preview versions have preview in the name
$Name = if ($IsPreview -and $Environment.IsLinux) { "powershell-preview" } else { "powershell" }
$Name = if ($IsPreview) { "powershell-preview" } else { "powershell" }

# Verify dependencies are installed and in the path
Test-Dependencies
Expand Down Expand Up @@ -804,7 +804,9 @@ function New-MacOsDistributionPackage

# Add the OS information to the macOS package file name.
$packageExt = [System.IO.Path]::GetExtension($FpmPackage.Name)
$packageNameWithoutExt = [System.IO.Path]::GetFileNameWithoutExtension($FpmPackage.Name)

# get the package name from fpm without the extension, but replace powershell-preview at the beginning of the name with powershell.
$packageNameWithoutExt = [System.IO.Path]::GetFileNameWithoutExtension($FpmPackage.Name) -replace '^powershell\-preview' , 'powershell'

$newPackageName = "{0}-{1}{2}" -f $packageNameWithoutExt, $script:Options.Runtime, $packageExt
$newPackagePath = Join-Path $FpmPackage.DirectoryName $newPackageName
Expand Down