Skip to content

Add ability to package non-release packages #4509

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
daxian-dbw merged 3 commits into from
Aug 9, 2017
Merged

Add ability to package non-release packages #4509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dd67a5
Make package name a parameter to the project
TravisEz13 Aug 5, 2017
3bfa807
Add -IncludeSymbols to start-pspackaging
TravisEz13 Aug 8, 2017
b72aadf
Align the comment with other comments
daxian-dbw Aug 8, 2017
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
46 changes: 42 additions & 4 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ function Start-PSPackage {
[ValidateScript({$Environment.IsWindows})]
[string]$WindowsDownLevel,

[Switch] $Force
[Switch] $Force,

[Switch] $IncludeSymbols
)

# Runtime and Configuration settings required by the package
Expand All @@ -40,9 +42,17 @@ function Start-PSPackage {

$Script:Options = Get-PSOptions

$crossGenCorrect = $false
if(-not $IncludeSymbols.IsPresent -and $Script:Options.CrossGen) {
$crossGenCorrect = $true
}
elseif ($IncludeSymbols.IsPresent -and -not $Script:Options.CrossGen) {
$crossGenCorrect = $true
}

# Make sure the most recent build satisfies the package requirement
if (-not $Script:Options -or ## Start-PSBuild hasn't been executed yet
-not $Script:Options.CrossGen -or ## Last build didn't specify -CrossGen
-not $crossGenCorrect -or ## Last build didn't specify '-CrossGen' correctly
$Script:Options.Runtime -ne $Runtime -or ## Last build wasn't for the required RID
$Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release'
$Script:Options.Framework -ne "netcoreapp2.0") ## Last build wasn't for CoreCLR
Expand All @@ -60,7 +70,15 @@ function Start-PSPackage {
# This check serves as a simple gate to ensure that the user knows what he is doing, and
# also ensure `Start-PSPackage` does what the user asks/expects, because once packages
# are generated, it'll be hard to verify if they were built from the correct content.
throw "Please ensure you have run 'Start-PSBuild -Clean -CrossGen -Runtime $Runtime -Configuration $Configuration'!"
$params = @('-Clean')
if(-not $IncludeSymbols.IsPresent)
{
$params += '-CrossGen'
}
$params += '-Runtime', $Runtime
$params += '-Configuration', $Configuration

throw "Please ensure you have run 'Start-PSBuild $params'!"
}

# If ReleaseTag is specified, use the given tag to calculate Vesrion
Expand Down Expand Up @@ -106,6 +124,15 @@ function Start-PSPackage {
}
}

# Add the symbols to the suffix
# if symbols are specified to be included
if($IncludeSymbols.IsPresent -and $NameSuffix) {
$NameSuffix = "symbols-$NameSuffix"
}
elseif ($IncludeSymbols.IsPresent) {
$NameSuffix = "symbols"
}

switch ($Type) {
"zip" {
$Arguments = @{
Expand Down Expand Up @@ -145,6 +172,11 @@ function Start-PSPackage {
}
}
"AppImage" {
if($IncludeSymbols.IsPresent)
{
throw "AppImage does not support packaging '-IncludeSymbols'"
}

if ($Environment.IsUbuntu14) {
$null = Start-NativeExecution { bash -iex "$PSScriptRoot/../appimage.sh" }
$appImage = Get-Item PowerShell-*.AppImage
Expand Down Expand Up @@ -605,7 +637,7 @@ function New-NugetPackage

# Name of the Product
[ValidateNotNullOrEmpty()]
[string] $PackageName = 'PowerShell',
[string] $PackageName = 'powershell',

# Suffix of the Name
[string] $PackageNameSuffix,
Expand Down Expand Up @@ -641,6 +673,11 @@ function New-NugetPackage

$nugetFolder = New-SubFolder -Path $PSScriptRoot -ChildPath 'nugetOutput' -Clean

$nuspecPackageName = $PackageName
if($PackageNameSuffix)
{
$nuspecPackageName += '-' + $PackageNameSuffix
}

# Setup staging directory so we don't change the original source directory
$stagingRoot = New-SubFolder -Path $PSScriptRoot -ChildPath 'nugetStaging' -Clean
Expand All @@ -658,6 +695,7 @@ function New-NugetPackage
$arguments += "/p:StagingPath=$stagingRoot"
$arguments += "/p:RID=$PackageRuntime"
$arguments += "/p:SemVer=$nugetSemanticVersion"
$arguments += "/p:PackageName=$nuspecPackageName"
$arguments += $projectFolder

log "Running dotnet $arguments"
Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/project/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AssemblyName>NotUsed</AssemblyName>
<Description>PowerShell Core nuget package with .NET CLI host including everything needed to run it.</Description>
<NuspecFile>powershell.nuspec</NuspecFile>
<NuspecProperties>runtime=$(RID);version=$(SemVer)</NuspecProperties>
<NuspecProperties>runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)</NuspecProperties>
<NuspecBasePath>$(StagingPath)</NuspecBasePath>
<IsTool>True</IsTool>
<TargetFramework>netcoreapp2.0</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/project/powershell.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>powershell-$runtime$</id>
<id>$PackageName$-$runtime$</id>
<version>$version$</version>
<title>PowerShell Core for $runtime$</title>
<authors>PowerShell</authors>
Expand Down