add ability to package all of powershell core as a NuGet Package #4363

TravisEz13 · 2017-07-27T19:18:39Z

Example usage

function Update-Powershell 
{
    param([string]$target='~/powershell')

    if(!(Get-PackageSource -Name powershell -ErrorAction SilentlyContinue))
    {
        Register-PackageSource -Name powershell -Location https://powershell.myget.org/F/powershell-core-daily  -ProviderName nuget -Trusted
    }

    if($ismacos){
        $package = 'powershell-osx.10.12-x64'
    }
    elseif($iswindows)
    {
        $package = 'powershell-win-x64-win7-x64'
    }
    elseif($islinux)
    {
        $package = 'powershell-linux-x64'
    }

    if(!(test-path $target))
    {
        md $target
    }

    find-package -Source powershell -AllowPrereleaseVersions -name $package |Install-Package -Destination $target -ExcludeVersion
    if(!$isWindows){
        chmod a+x "$target/$package/content/pwsh"
    }
    &"$target/$package/content/pwsh"
}

daxian-dbw · 2017-07-27T19:28:44Z

tools/packaging/packaging.psm1

+
+    # Setup staging directory so we don't change the original source directory
+    $stagingRoot = New-SubFolder -Path $PSScriptRoot -ChildPath 'nugetStaging' -Clean
+    $toolsFolder = Join-Path -path $stagingRoot -ChildPath 'tools'


Maybe change the name to 'content'

iSazonov · 2017-07-28T03:45:37Z

tools/packaging/project/powershell.nuspec

+  <metadata>
+    <id>powershell-$runtime$</id>
+    <version>$version$</version>
+    <title>PowerShell CLI for $runtime$</title>


It seems we never use "CLI". Maybe <title>PowerShell Core $runtime$</title>.

Or just PowerShell for $runtime$ :)

Update to PowerShell Core

iSazonov · 2017-07-28T03:50:30Z

tools/packaging/project/powershell.nuspec

+    <version>$version$</version>
+    <title>PowerShell CLI for $runtime$</title>
+    <authors>Microsoft PowerShell</authors>
+    <owners>Microsoft PowerShell</owners>


We have #4352 under review - should we use "Microsoft" in community project?

remove microsoft

daxian-dbw · 2017-07-28T06:40:15Z

build.psm1

@@ -4,6 +4,84 @@ $script:TestModulePathSeparator = [System.IO.Path]::PathSeparator

 $dotnetCLIChannel = "preview"
 $dotnetCLIRequiredVersion = "2.0.0-preview2-006502"
+$tagsUpToDate = $false
+function Get-PSTags


Better use the verb Sync, as Get- usually indicates result(s) will be returned while Sync is an action.

daxian-dbw · 2017-07-28T06:54:09Z

build.psm1

+    }
+
+    $lastestTagCommitId = git rev-list --tags --max-count=1
+    return (git --git-dir="$PSScriptRoot/.git" describe $lastestTagCommitId)


How about return (git tag --list --sort=-v:refname | Select-Object -First 1)?

Your proposed implementation depends on version sorting.
The code I wrote gets the latest commit which is a tag, then gets the name.

discussed offline and git describe --abbrev=0 does what you intended.

daxian-dbw · 2017-07-28T07:00:33Z

build.psm1

+    $latestTag = Get-PSLatestTag
+    # Get the last commit id in the current branch
+    $commitId = git log --pretty="%H" -n1   
+    # check in the branch is dirty


typo: in -> if

daxian-dbw · 2017-07-28T07:04:57Z

build.psm1

+    # Get the last commit id in the current branch
+    $commitId = git log --pretty="%H" -n1   
+    # check in the branch is dirty
+    $isDirty = (git describe --dirty) -match '-dirty$'  


git describe --dirty causes git to crash on my machine. No idea why is that.

perhaps it could not find the git-dir. I'll update all the commands to specify it.

daxian-dbw · 2017-07-28T07:15:06Z

tools/packaging/project/powershell.nuspec

+  <metadata>
+    <id>powershell-$runtime$</id>
+    <version>$version$</version>
+    <title>PowerShell CLI for $runtime$</title>


Or just PowerShell for $runtime$ :)

daxian-dbw · 2017-07-28T17:47:21Z

tools/packaging/packaging.psm1

+            if($pscmdlet.ShouldProcess("Create NuPkg Package"))
+            {
+                New-NugetPackage @Arguments
+            }            


nit: there are trailing spaces in this line.

daxian-dbw · 2017-07-28T17:48:20Z

tools/packaging/packaging.psm1

+        [string]$Iteration = "1",
+
+        [Switch]
+        $Force


nit: same here.

daxian-dbw · 2017-07-28T17:55:47Z

tools/packaging/project/package.csproj

+  -->
+  <PropertyGroup>
+    <AssemblyName>NotUsed</AssemblyName>
+    <Description>PowerShell top-level project with .NET CLI host</Description>


This description needs to be updated

daxian-dbw · 2017-07-28T17:58:46Z

tools/packaging/project/powershell.nuspec

+    <licenseUrl>https://github.com/PowerShell/PowerShell/blob/master/LICENSE.txt</licenseUrl>
+    <projectUrl>https://github.com/powershell/powershell</projectUrl>
+    <iconUrl>https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_64.png</iconUrl>
+    <description>This package contains the PowerShell CLI for $runtime$.</description>


PowerShell CLI

Maybe just PowerShell

Changed to PowerShell Core

daxian-dbw · 2017-07-28T18:17:10Z

build.psm1

+        $commitId+='-dirty'
+    }
+
+    return "$latestTag-x-g$commitId"


Maybe we continue to use git describe to get the commit id. It should work as long as we merge the release branch.

…I build

… place

iSazonov · 2017-07-30T18:52:07Z

build.psm1

+    }
+    elseif(!$upstreamRemote)
+    {
+        Write-Error "Please add a remote to PowerShell\PowerShell.  Example:  git remote add $upstreamRemoteDefaultName $PowerShellRemoteUrl" -ErrorAction Stop


Can we continue to execute the script after the error?

You should not continue executing the script unless you have a remote to PowerShell as the error indicates. The script has always assumed you can fetch the tags. This is just adding a verification.

This should only occur when someone manually runs the function and it cannot complete the action. So, returning an error and stopping is the correct thing to do.

iSazonov · 2017-07-30T18:58:55Z

tools/packaging/project/package.csproj

+  -->
+  <PropertyGroup>
+    <AssemblyName>NotUsed</AssemblyName>
+    <Description>PowerShell Core nuget packag with .NET CLI host including everything needed to run it.</Description>


Typo - "packag".

daxian-dbw

LGTM except for a minor comment.

daxian-dbw · 2017-08-01T19:02:31Z

build.psm1

@@ -4,6 +4,79 @@ $script:TestModulePathSeparator = [System.IO.Path]::PathSeparator

 $dotnetCLIChannel = "preview"
 $dotnetCLIRequiredVersion = "2.0.0-preview2-006502"
+$tagsUpToDate = $false
+
+function Sync-PSTags


Can you please add a comment to explain why we need to run Sync-PSTags before getting the version (tag) and commit ID? It will help people to understand.

msftclas added the cla-already-signed label Jul 27, 2017

TravisEz13 assigned daxian-dbw Jul 27, 2017

daxian-dbw reviewed Jul 27, 2017

View reviewed changes

TravisEz13 requested a review from adityapatwardhan July 27, 2017 22:44

iSazonov reviewed Jul 28, 2017

View reviewed changes

daxian-dbw reviewed Jul 28, 2017

View reviewed changes

TravisEz13 force-pushed the AddNugetPackagingV2 branch from 3ab8281 to 4bf60fd Compare July 28, 2017 19:16

TravisEz13 added 16 commits July 28, 2017 13:19

ignore staging folders

34aa196

Add csproj for package of entire CLI

6d249a6

add nuspec for package of entire CLI

f8bedca

ignore nupkg packages

3bfe9e6

Move Get-PackageSemanticVersion to packaging.psm1

8d5b5ee

Add ability to package full PowerShell core using nuget

d2b561b

change folder in nupkg with PowerShell from tools to content

7976494

Add publishing to daily NuGet feed

6ca45e6

Give the packages a meaningful version that can be tied back to the C…

b47a933

…I build

make sure the CI systems always have the latest tags

8b9a81f

Add code to get the various forms of commitId and tag from the proper…

1122f6b

… place

update travis to use the build.psm1 code to get the lastest

8b620e6

add newline to end of file

de8218b

address PR feedback

4ce585b

make get-psLatestTag Get latest tag for the current branch

b7902a7

make appveyor version consistent with travis-ci

ac6c62a

TravisEz13 force-pushed the AddNugetPackagingV2 branch from 4bf60fd to ac6c62a Compare July 28, 2017 20:20

TravisEz13 added 2 commits July 29, 2017 13:07

Address PR Feedback

f65f48d

make sure errors are handled correctly for git commands

bfdece5

iSazonov reviewed Jul 30, 2017

View reviewed changes

fix typo in package

eeaad46

daxian-dbw approved these changes Aug 1, 2017

View reviewed changes

add comments for new functions

a9a29db

daxian-dbw merged commit e829053 into PowerShell:master Aug 1, 2017

TravisEz13 deleted the AddNugetPackagingV2 branch August 4, 2017 16:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add ability to package all of powershell core as a NuGet Package #4363

add ability to package all of powershell core as a NuGet Package #4363

TravisEz13 commented Jul 27, 2017 •

edited

Loading

daxian-dbw Jul 27, 2017

iSazonov Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

iSazonov Jul 28, 2017

TravisEz13 Jul 28, 2017

daxian-dbw Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

TravisEz13 Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

daxian-dbw Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

daxian-dbw Jul 28, 2017

TravisEz13 Jul 28, 2017

iSazonov Jul 30, 2017

TravisEz13 Aug 1, 2017

TravisEz13 Aug 1, 2017

iSazonov Jul 30, 2017

daxian-dbw left a comment

daxian-dbw Aug 1, 2017

add ability to package all of powershell core as a NuGet Package #4363

add ability to package all of powershell core as a NuGet Package #4363

Conversation

TravisEz13 commented Jul 27, 2017 • edited Loading

Example usage

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

daxian-dbw left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TravisEz13 commented Jul 27, 2017 •

edited

Loading