From a3f3734f09be36c33dcc847012c2c18a4c4d34ef Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Wed, 10 Aug 2016 11:53:12 -0700
Subject: [PATCH 1/7] Include license during build

Rather than including it only at packaging, we should include this
license as part of `dotnet build` and `dotnet publish`.
---
 build.psm1                           | 3 ---
 src/powershell-unix/project.json     | 2 ++
 src/powershell-win-core/project.json | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 88ed070ce..3a8a2b05d 100644
--- a/build.psm1
+++ b/build.psm1
@@ -840,9 +840,6 @@ It consists of a cross-platform command-line shell and associated scripting lang
     $Source = Split-Path -Parent (Get-PSOutput -Options (New-PSOptions -Publish))
     Write-Verbose "Packaging $Source"
 
-    Write-Verbose "Copy license and third party notice to $Source"
-    Copy-Item "$PSScriptRoot\LICENSE.txt" "$Source" -Force -ErrorAction SilentlyContinue
-
     if ($IsWindows) {
         # Product Guid needs to be unique for every PowerShell version to allow SxS install
         $productGuid = [guid]::NewGuid()
diff --git a/src/powershell-unix/project.json b/src/powershell-unix/project.json
index aaf2f5a42..37bd8a903 100644
--- a/src/powershell-unix/project.json
+++ b/src/powershell-unix/project.json
@@ -23,6 +23,7 @@
             "include": [
                 "*.so",
                 "*.dylib",
+                "../../LICENSE.txt",
                 "../../powershell.version"
             ]
         },
@@ -46,6 +47,7 @@
         "include": [
             "*.so",
             "*.dylib",
+            "../../LICENSE.txt",
             "../../powershell.version"
         ]
     },
diff --git a/src/powershell-win-core/project.json b/src/powershell-win-core/project.json
index 6a64140c5..adcfcf850 100644
--- a/src/powershell-win-core/project.json
+++ b/src/powershell-win-core/project.json
@@ -22,6 +22,7 @@
                 }
             },
             "include": [
+            "../../LICENSE.txt",
                 "../../powershell.version"
             ]
         },
@@ -47,6 +48,7 @@
             "pwrshplugin.dll",
             "pwrshplugin.pdb",
             "Install-PowerShellRemoting.ps1",
+            "../../LICENSE.txt",
             "../../powershell.version"
         ]
     },

From 5235fed2c7e3ff175163e3dc4dc4725cd83212d8 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Wed, 10 Aug 2016 12:49:16 -0700
Subject: [PATCH 2/7] Refactor Start-PSPackage

Moved Unix package code into New-UnixPackage, switching on $Types to
call the appropriate function given the list of types.

Also fixed bug with chmod on a symlink; it was unnecessary.
---
 .gitignore                                   |   4 +
 assets/{powershellorig => powershell.1.ronn} |   0
 build.psm1                                   | 169 ++++++++++++-------
 3 files changed, 108 insertions(+), 65 deletions(-)
 rename assets/{powershellorig => powershell.1.ronn} (100%)

diff --git a/.gitignore b/.gitignore
index 92a2b0dbe..5b084185d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,10 @@ powershell.version
 # default location for produced nuget packages
 /nuget-artifacts
 
+# generated man files
+/assets/powershell.1
+/assets/powershell.1.gz
+
 # resgen output
 gen
 
diff --git a/assets/powershellorig b/assets/powershell.1.ronn
similarity index 100%
rename from assets/powershellorig
rename to assets/powershell.1.ronn
diff --git a/build.psm1 b/build.psm1
index 3a8a2b05d..57ecf12b6 100644
--- a/build.psm1
+++ b/build.psm1
@@ -690,7 +690,7 @@ function Start-PSBootstrap {
             brew install $Deps
         }
 
-        # Install [fpm](https://github.com/jordansissel/fpm)
+        # Install [fpm](https://github.com/jordansissel/fpm) and [ronn](https://github.com/rtomayko/ronn)
         if ($Package) {
             gem install fpm ronn
         }
@@ -814,24 +814,15 @@ function Start-PSPackage {
     [CmdletBinding()]param(
         # PowerShell packages use Semantic Versioning http://semver.org/
         [string]$Version,
-        # Package iteration version (rarely changed)
-        [int]$Iteration = 1,
-        # Ubuntu, CentOS, and OS X packages are supported
-        [ValidateSet("deb", "osxpkg", "rpm")]
-        [string]$Type
+
+        # Package name
+        [string]$Name = "powershell",
+
+        # Ubuntu, CentOS, and OS X, and Windows packages are supported
+        [ValidateSet("deb", "osxpkg", "rpm", "msi", "appx")]
+        [string[]]$Types
     )
 
-    $Description = @"
-PowerShell is an automation and configuration management platform. 
-It consists of a cross-platform command-line shell and associated scripting language.
-"@
-
-    #runn ronn to convert man page to roff 
-    $manorigfile = $PSScriptRoot + "/assets/powershellorig"
-    $mantxtfile = $PSScriptRoot + "/assets/powershell"
-    $manronnfile = $PSScriptRoot + "/assets/powershell.1"
-    $gzipmanfile = $PSScriptRoot + "/assets/powershell.1.gz"
-
     # Use Git tag if not given a version
     if (-not $Version) {
         $Version = (git --git-dir="$PSScriptRoot/.git" describe) -Replace '^v'
@@ -840,37 +831,87 @@ It consists of a cross-platform command-line shell and associated scripting lang
     $Source = Split-Path -Parent (Get-PSOutput -Options (New-PSOptions -Publish))
     Write-Verbose "Packaging $Source"
 
-    if ($IsWindows) {
-        # Product Guid needs to be unique for every PowerShell version to allow SxS install
-        $productGuid = [guid]::NewGuid()
-                $msiPackagePath = New-MSIPackage -ProductSourcePath $Source -ProductVersion $Version -AssetsPath "$PSScriptRoot\assets" -LicenseFilePath "$PSScriptRoot\assets\license.rtf" -ProductGuid $productGuid
-        $appxPackagePath = New-AppxPackage -PackageVersion $Version -SourcePath $Source -AssetsPath "$PSScriptRoot\Assets"
-
-        $packages = @($msiPackagePath, $appxPackagePath)
-
-        return $packages
-    }
-
-    if (-not (Get-Command "fpm" -ErrorAction SilentlyContinue)) {
-        throw "Build dependency 'fpm' not found in PATH! See: https://github.com/jordansissel/fpm"
-    }
-
     # Decide package output type
-    if (-not $Type) {
-        $Type = if ($IsLinux) {
-            if ($LinuxInfo.ID -match 'ubuntu') {
+    if (-not $Types) {
+        $Types = if ($IsLinux) {
+            if ($LinuxInfo.ID -match "ubuntu") {
                 "deb"
-            } elseif ($LinuxInfo.ID -match 'centos') {
+            } elseif ($LinuxInfo.ID -match "centos") {
                 "rpm"
             } else {
                 throw "Building packages for $($LinuxInfo.PRETTY_NAME) is unsupported!"
             }
         } elseif ($IsOSX) {
-            'osxpkg'
+            "osxpkg"
+        } elseif ($IsWindows) {
+            "msi", "appx"
         }
-        Write-Warning "-Type was not specified, continuing with $Type"
+        Write-Warning "-Types was not specified, continuing with $Types"
     }
 
+    switch ($Types) {
+        "msi" {
+            $Arguments = @{
+                ProductSourcePath = $Source;
+                ProductVersion = $Version;
+                AssetsPath = "$PSScriptRoot\assets";
+                LicenseFilePath = "$PSScriptRoot\assets\license.rtf";
+                # Product Guid needs to be unique for every PowerShell version to allow SxS install
+                ProductGuid = [Guid]::NewGuid()
+            }
+            New-MSIPackage @Arguments
+        }
+        "appx" {
+            $Arguments = @{
+                PackageVersion = $Version;
+                SourcePath = $Source;
+                AssetsPath = "$PSScriptRoot\assets"
+            }
+            New-AppxPackage @Arguments
+        }
+        default {
+            $Arguments = @{
+                Type = $_;
+                Source = $Source;
+                Name = $Name;
+                Version = $Version
+            }
+            New-UnixPackage @Arguments
+        }
+    }
+}
+
+
+function New-UnixPackage {
+    [CmdletBinding()]param(
+        [Parameter(Mandatory)]
+        [ValidateSet("deb", "osxpkg", "rpm")]
+        [string]$Type,
+
+        [Parameter(Mandatory)]
+        [string]$Source,
+
+        [Parameter(Mandatory)]
+        [string]$Name,
+
+        [Parameter(Mandatory)]
+        [string]$Version,
+
+        # Package iteration version (rarely changed)
+        [int]$Iteration = 1
+    )
+
+    foreach ($Dependency in "fpm", "ronn") {
+        if (!(precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Publish")) {
+            throw "Dependency precheck failed!"
+        }
+    }
+
+    $Description = @"
+PowerShell is an automation and configuration management platform.
+It consists of a cross-platform command-line shell and associated scripting language.
+"@
+
     # Follow the Filesystem Hierarchy Standard for Linux and OS X
     $Destination = if ($IsLinux) {
         "/opt/microsoft/powershell"
@@ -887,35 +928,33 @@ It consists of a cross-platform command-line shell and associated scripting lang
 
     New-Item -Force -ItemType SymbolicLink -Path /tmp/powershell -Target $Destination/powershell >$null
 
-    # there is a weired bug in fpm
+    # there is a weird bug in fpm
     # if the target of the powershell symlink exists, `fpm` aborts
     # with a `utime` error on OS X.
     # so we move it to make symlink broken
     $symlink_dest = "$Destination/powershell"
     $hack_dest = "./_fpm_symlink_hack_powershell"
-    if ($IsOSX)
-    {
-        if (Test-Path $symlink_dest)
-        {
+    if ($IsOSX) {
+        if (Test-Path $symlink_dest) {
             Write-Warning "Move $symlink_dest to $hack_dest (fpm utime bug)"
             Move-Item $symlink_dest $hack_dest
         }
     }
 
-    #copy backup to new file 
-    cp $manorigfile $mantxtfile
-    
-    #run ronn on assets file 
-    ronn $mantxtfile 
+    # run ronn to convert man page to roff
+    $RoffFile = Join-Path $PSScriptRoot "/assets/powershell.1"
+    $RonnFile = "$RoffFile.ronn"
+    $GzipFile = "$RoffFile.gz"
+    $ManFile = Join-Path "/usr/local/share/man/man1" (Split-Path -Leaf $GzipFile)
 
-    #rename ronn file 
-    mv $mantxtfile $manronnfile 
+    # Run ronn on assets file
+    Start-NativeExecution { ronn --roff $RonnFile }
 
-    #gzip in assets directory 
-    gzip -f $manronnfile 
+    # gzip in assets directory
+    Start-NativeExecution { gzip -f $RoffFile }
 
     # Change permissions for packaging
-    chmod -R go=u $Source /tmp/powershell
+    Start-NativeExecution { chmod -R go=u $Source $GzipFile }
 
     $libunwind = switch ($Type) {
         "deb" { "libunwind8" }
@@ -927,10 +966,9 @@ It consists of a cross-platform command-line shell and associated scripting lang
         "rpm" { "libicu" }
     }
 
-
     $Arguments = @(
         "--force", "--verbose",
-        "--name", "powershell",
+        "--name", $Name,
         "--version", $Version,
         "--iteration", $Iteration,
         "--maintainer", "PowerShell Team <PowerShellTeam@hotmail.com>",
@@ -948,24 +986,25 @@ It consists of a cross-platform command-line shell and associated scripting lang
         "-t", $Type,
         "-s", "dir",
         "$Source/=$Destination/",
-	"assets/powershell.1.gz=/usr/local/share/man/man1/powershell.1.gz",
+        "$GzipFile=$ManFile",
         "/tmp/powershell=$Link"
     )
 
     # Build package
-    fpm $Arguments
-
-    if ($IsOSX)
-    {
-        # this is continuation of a fpm hack for a weired bug
-        if (Test-Path $hack_dest)
-        {
-            Write-Warning "Move $hack_dest to $symlink_dest (fpm utime bug)"
-            Move-Item $hack_dest $symlink_dest
+    try {
+        Start-NativeExecution { fpm $Arguments }
+    } finally {
+        if ($IsOSX) {
+            # this is continuation of a fpm hack for a weird bug
+            if (Test-Path $hack_dest) {
+                Write-Warning "Move $hack_dest to $symlink_dest (fpm utime bug)"
+                Move-Item $hack_dest $symlink_dest
+            }
         }
     }
 }
 
+
 function Publish-NuGetFeed
 {
     param(

From c0aac111d3476ad1ae33d69e59973ea3081a0e31 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Wed, 10 Aug 2016 16:21:25 -0700
Subject: [PATCH 3/7] Enable side-by-side Unix packages

---
 .gitignore |  8 +++----
 build.psm1 | 64 ++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b084185d..317f6535d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
 bin/
 obj/
-debug/
-Packages/
 project.lock.json
 *-tests.xml
+/debug/
+/staging/
+/Packages/
 
 # dotnet cli install/uninstall scripts
 dotnet-install.ps1
@@ -44,8 +45,7 @@ powershell.version
 /nuget-artifacts
 
 # generated man files
-/assets/powershell.1
-/assets/powershell.1.gz
+/assets/powershell.1*
 
 # resgen output
 gen
diff --git a/build.psm1 b/build.psm1
index 57ecf12b6..a31a812a1 100644
--- a/build.psm1
+++ b/build.psm1
@@ -816,6 +816,7 @@ function Start-PSPackage {
         [string]$Version,
 
         # Package name
+        [ValidatePattern("^powershell")]
         [string]$Name = "powershell",
 
         # Ubuntu, CentOS, and OS X, and Windows packages are supported
@@ -828,6 +829,8 @@ function Start-PSPackage {
         $Version = (git --git-dir="$PSScriptRoot/.git" describe) -Replace '^v'
     }
 
+    Write-Warning "Please ensure you have previously run Start-PSBuild -Clean -CrossGen!"
+
     $Source = Split-Path -Parent (Get-PSOutput -Options (New-PSOptions -Publish))
     Write-Verbose "Packaging $Source"
 
@@ -891,7 +894,9 @@ function New-UnixPackage {
         [Parameter(Mandatory)]
         [string]$Source,
 
+        # Must start with 'powershell' but may have any suffix
         [Parameter(Mandatory)]
+        [ValidatePattern("^powershell")]
         [string]$Name,
 
         [Parameter(Mandatory)]
@@ -912,11 +917,38 @@ PowerShell is an automation and configuration management platform.
 It consists of a cross-platform command-line shell and associated scripting language.
 "@
 
+    # Suffix is used for side-by-side package installation
+    $Suffix = $Name -replace "^powershell"
+    if (!$Suffix) {
+        Write-Warning "Suffix not given, building primary PowerShell package!"
+        $Suffix = $Version
+    }
+
+    # Setup staging directory so we don't change the original source directory
+    $Staging = "$PSScriptRoot/staging"
+    Remove-Item -Recurse -Force -ErrorAction SilentlyContinue $Staging
+    Copy-Item -Recurse $Source $Staging
+
+    # Rename files to given name if not "powershell"
+    if ($Name -ne "powershell") {
+        $Files = @("powershell",
+                   "powershell.dll",
+                   "powershell.deps.json",
+                   "powershell.pdb",
+                   "powershell.runtimeconfig.json",
+                   "powershell.xml")
+
+        foreach ($File in $Files) {
+            $NewName = $File -replace "^powershell", $Name
+            Move-Item "$Staging/$File" "$Staging/$NewName"
+        }
+    }
+
     # Follow the Filesystem Hierarchy Standard for Linux and OS X
     $Destination = if ($IsLinux) {
-        "/opt/microsoft/powershell"
+        "/opt/microsoft/powershell/$Suffix"
     } elseif ($IsOSX) {
-        "/usr/local/microsoft/powershell"
+        "/usr/local/microsoft/powershell/$Suffix"
     }
 
     # Destination for symlink to powershell executable
@@ -926,13 +958,13 @@ It consists of a cross-platform command-line shell and associated scripting lang
         "/usr/local/bin"
     }
 
-    New-Item -Force -ItemType SymbolicLink -Path /tmp/powershell -Target $Destination/powershell >$null
+    New-Item -Force -ItemType SymbolicLink -Path "/tmp/$Name" -Target "$Destination/$Name" >$null
 
     # there is a weird bug in fpm
     # if the target of the powershell symlink exists, `fpm` aborts
     # with a `utime` error on OS X.
     # so we move it to make symlink broken
-    $symlink_dest = "$Destination/powershell"
+    $symlink_dest = "$Destination/$Name"
     $hack_dest = "./_fpm_symlink_hack_powershell"
     if ($IsOSX) {
         if (Test-Path $symlink_dest) {
@@ -942,19 +974,27 @@ It consists of a cross-platform command-line shell and associated scripting lang
     }
 
     # run ronn to convert man page to roff
-    $RoffFile = Join-Path $PSScriptRoot "/assets/powershell.1"
-    $RonnFile = "$RoffFile.ronn"
-    $GzipFile = "$RoffFile.gz"
-    $ManFile = Join-Path "/usr/local/share/man/man1" (Split-Path -Leaf $GzipFile)
+    $RonnFile = Join-Path $PSScriptRoot "/assets/powershell.1.ronn"
+    $RoffFile = $RonnFile -replace "\.ronn$"
 
     # Run ronn on assets file
+    # Run does not play well with files named powershell6.0.1, so we generate and then rename
     Start-NativeExecution { ronn --roff $RonnFile }
 
+    # Setup for side-by-side man pages (noop if primary package)
+    $FixedRoffFile = $RoffFile -replace "powershell.1$", "$Name.1"
+    if ($Name -ne "powershell") {
+        Move-Item $RoffFile $FixedRoffFile
+    }
+
     # gzip in assets directory
-    Start-NativeExecution { gzip -f $RoffFile }
+    $GzipFile = "$FixedRoffFile.gz"
+    Start-NativeExecution { gzip -f $FixedRoffFile }
+
+    $ManFile = Join-Path "/usr/local/share/man/man1" (Split-Path -Leaf $GzipFile)
 
     # Change permissions for packaging
-    Start-NativeExecution { chmod -R go=u $Source $GzipFile }
+    Start-NativeExecution { chmod -R go=u $Staging $GzipFile }
 
     $libunwind = switch ($Type) {
         "deb" { "libunwind8" }
@@ -985,9 +1025,9 @@ It consists of a cross-platform command-line shell and associated scripting lang
         "--deb-build-depends", "g++",
         "-t", $Type,
         "-s", "dir",
-        "$Source/=$Destination/",
+        "$Staging/=$Destination/",
         "$GzipFile=$ManFile",
-        "/tmp/powershell=$Link"
+        "/tmp/$Name=$Link"
     )
 
     # Build package

From 49d297c4109783eecdc5e715baa81b8fefb4930f Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 11 Aug 2016 11:34:58 -0700
Subject: [PATCH 4/7] Fix permissions of package files

The DLLs should not be marked executable on Unix.

Also remove deb-build-depends as the `dotnet` package is not yet
universally available.
---
 build.psm1 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.psm1 b/build.psm1
index a31a812a1..041b4672a 100644
--- a/build.psm1
+++ b/build.psm1
@@ -994,7 +994,12 @@ It consists of a cross-platform command-line shell and associated scripting lang
     $ManFile = Join-Path "/usr/local/share/man/man1" (Split-Path -Leaf $GzipFile)
 
     # Change permissions for packaging
-    Start-NativeExecution { chmod -R go=u $Staging $GzipFile }
+    Start-NativeExecution {
+        find $Staging -type d | xargs chmod 755
+        find $Staging -type f | xargs chmod 644
+        chmod 644 $GzipFile
+        chmod 755 "$Staging/$Name" # only the executable should be executable
+    }
 
     $libunwind = switch ($Type) {
         "deb" { "libunwind8" }
@@ -1020,9 +1025,6 @@ It consists of a cross-platform command-line shell and associated scripting lang
         "--rpm-os", "linux",
         "--depends", $libunwind,
         "--depends", $libicu,
-        "--deb-build-depends", "dotnet",
-        "--deb-build-depends", "cmake",
-        "--deb-build-depends", "g++",
         "-t", $Type,
         "-s", "dir",
         "$Staging/=$Destination/",

From 39184852d9978f06d0f5c4d8ec6ed7a00e53d737 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 11 Aug 2016 13:16:47 -0700
Subject: [PATCH 5/7] Add logic to rename package with runtime suffixed

---
 build.psm1 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index 041b4672a..34a47325e 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1034,7 +1034,7 @@ It consists of a cross-platform command-line shell and associated scripting lang
 
     # Build package
     try {
-        Start-NativeExecution { fpm $Arguments }
+        $Output = Start-NativeExecution { fpm $Arguments }
     } finally {
         if ($IsOSX) {
             # this is continuation of a fpm hack for a weird bug
@@ -1044,6 +1044,19 @@ It consists of a cross-platform command-line shell and associated scripting lang
             }
         }
     }
+
+    # Magic to get path output
+    $Package = Get-Item (Join-Path $PSScriptRoot (($Output[-1] -split ":path=>")[-1] -replace '["{}]'))
+
+    # Add runtime-identifier to package name.
+    # This information cannot be part of the package,
+    # but without a repository to host these,
+    # we need to differentiate distributions by the package's filename.
+    $PackageWithRuntime = "$($Package.BaseName)-$((New-PSOptions).Runtime)$($Package.Extension)"
+
+    Move-Item -Force $Package $PackageWithRuntime
+
+    return $PackageWithRuntime
 }
 
 

From 349491be84a69547f289ba77c4a0809bf7ccb951 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 11 Aug 2016 13:38:35 -0700
Subject: [PATCH 6/7] Support building Ubuntu 16.04 packages

---
 build.psm1 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 34a47325e..2f0cffedb 100644
--- a/build.psm1
+++ b/build.psm1
@@ -22,7 +22,9 @@ try {
 if ($IsLinux) {
     $LinuxInfo = Get-Content /etc/os-release | ConvertFrom-StringData
 
-    $IsUbuntu = $LinuxInfo.ID -match 'ubuntu' -and $LinuxInfo.VERSION_ID -match '14.04'
+    $IsUbuntu = $LinuxInfo.ID -match 'ubuntu'
+    $IsUbuntu14 = $IsUbuntu -and $LinuxInfo.VERSION_ID -match '14.04'
+    $IsUbuntu16 = $IsUbuntu -and $LinuxInfo.VERSION_ID -match '16.04'
     $IsCentOS = $LinuxInfo.ID -match 'centos' -and $LinuxInfo.VERSION_ID -match '7'
 }
 
@@ -218,6 +220,7 @@ function Start-PSBuild {
         if ($IsOSX) {
             # This is the restored library used to build
             # This is allowed to fail since the user may have already restored
+            Write-Warning ".NET Core links the incorrect OpenSSL, correcting NuGet package libraries..."
             find $env:HOME/.nuget -name System.Security.Cryptography.Native.dylib | xargs sudo install_name_tool -add_rpath /usr/local/opt/openssl/lib
         }
     }
@@ -665,27 +668,38 @@ function Start-PSBootstrap {
         if ($IsUbuntu) {
             # Build tools
             $Deps += "curl", "g++", "cmake", "make"
+
             # .NET Core required runtime libraries
-            $Deps += "libicu52", "libunwind8"
+            $Deps += "libunwind8"
+            if ($IsUbuntu14) { $Deps += "libicu52" }
+            elseif ($IsUbuntu16) { $Deps += "libicu55" }
+
             # Packaging tools
             if ($Package) { $Deps += "ruby-dev" }
+
             # Install dependencies
             sudo apt-get install -y -qq $Deps
-        } elseif ($IsCentos) {
+        } elseif ($IsCentOS) {
             # Build tools
             $Deps += "curl", "gcc-c++", "cmake", "make"
+
             # .NET Core required runtime libraries
             $Deps += "libicu", "libunwind"
+
             # Packaging tools
             if ($Package) { $Deps += "ruby-devel", "rpmbuild" }
+
             # Install dependencies
             sudo yum install -y -q $Deps
         } elseif ($IsOSX) {
             precheck 'brew' "Bootstrap dependency 'brew' not found, must install Homebrew! See http://brew.sh/"
+
             # Build tools
             $Deps += "curl", "cmake"
+
             # .NET Core required runtime libraries
             $Deps += "openssl"
+
             # Install dependencies
             brew install $Deps
         }
@@ -724,6 +738,7 @@ function Start-PSBootstrap {
             if ($IsOSX) {
                 # This is the library shipped with .NET Core
                 # This is allowed to fail as the user may have installed other versions of dotnet
+                Write-Warning ".NET Core links the incorrect OpenSSL, correcting .NET CLI libraries..."
                 find $env:HOME/.dotnet -name System.Security.Cryptography.Native.dylib | xargs sudo install_name_tool -add_rpath /usr/local/opt/openssl/lib
             }
         }
@@ -849,7 +864,7 @@ function Start-PSPackage {
         } elseif ($IsWindows) {
             "msi", "appx"
         }
-        Write-Warning "-Types was not specified, continuing with $Types"
+        Write-Warning "-Types was not specified, continuing with $Types!"
     }
 
     switch ($Types) {
@@ -906,6 +921,31 @@ function New-UnixPackage {
         [int]$Iteration = 1
     )
 
+    # Validate platform
+    $ErrorMessage = "Must be on {0} to build '$Type' packages!"
+    switch ($Type) {
+        "deb" {
+            $WarningMessage = "Building for Ubuntu {0}.04!"
+            if (!$IsUbuntu) {
+                    throw ($ErrorMessage -f "Ubuntu")
+                } elseif ($IsUbuntu14) {
+                    Write-Warning ($WarningMessage -f "14")
+                } elseif ($IsUbuntu16) {
+                    Write-Warning ($WarningMessage -f "16")
+                }
+        }
+        "rpm" {
+            if (!$IsCentOS) {
+                throw ($ErrorMessage -f "CentOS")
+            }
+        }
+        "osxpkg" {
+            if (!$IsOSX) {
+                throw ($ErrorMessage -f "OS X")
+            }
+        }
+    }
+
     foreach ($Dependency in "fpm", "ronn") {
         if (!(precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Publish")) {
             throw "Dependency precheck failed!"
@@ -1007,7 +1047,10 @@ It consists of a cross-platform command-line shell and associated scripting lang
     }
 
     $libicu = switch ($Type) {
-        "deb" { "libicu52" }
+        "deb" {
+            if ($IsUbuntu14) { "libicu52" }
+            elseif ($IsUbuntu16) { "libicu55" }
+        }
         "rpm" { "libicu" }
     }
 

From 5b48acb1cbbeab4c175bfdfffb3c337045cd5764 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 11 Aug 2016 14:42:37 -0700
Subject: [PATCH 7/7] Update releasing documentation

---
 docs/maintainers/releasing.md | 94 +++++++++++++++++++++++++++++------
 1 file changed, 80 insertions(+), 14 deletions(-)

diff --git a/docs/maintainers/releasing.md b/docs/maintainers/releasing.md
index 710434b60..fb1994157 100644
--- a/docs/maintainers/releasing.md
+++ b/docs/maintainers/releasing.md
@@ -15,6 +15,11 @@ Our convention is to prepend the `v` to the semantic version.
 The summary (first line) of the annotated tag message should be the full release title, 
 e.g. 'v6.0.0-alpha.7 release of PowerShell'.
 
+While creating a release, it is advised to make a new branch such that
+necessary documentation updates and hot fixes can be made,
+without having to include all changes made to master.
+This release branch can be reviewed by the normal PR process.
+
 When the annotated tag is finalized, push it with `git push --tags`. 
 GitHub will see the tag and present it as an option when creating a new [release][]. 
 Start the release, use the annotated tag's summary as the title, 
@@ -24,9 +29,11 @@ Just as important as creating the release is updating the links on our readme,
 and the package names in the installation instructions.
 The AppVeyor build number should also be incremented.
 
-While it is not a big concern for developer previews,
-the official releases should be created on dedicated machines
-such that the debug symbols do not contain personal machine paths.
+When creating the packages, please ensure that the file path does not contain user names.
+That is, clone to `/PowerShell` on Unix, and `C:\PowerShell` for Windows.
+The debug symbols include the absolute path to the sources when built,
+so it should appear `/PowerShell/src/powershell/System.Management.Automation`,
+not `/home/username/src/PowerShell/...`.
 
 [semver]: http://semver.org/
 [tag]: https://git-scm.com/book/en/v2/Git-Basics-Tagging
@@ -35,30 +42,89 @@ such that the debug symbols do not contain personal machine paths.
 Building Packages
 =================
 
+The `build.psm1` module contains a `Start-PSPackage` function to build packages.
+It **requires** that `Start-PSBuild -CrossGen` has been run.
+
 Linux / OS X
 ------------
 
-The `build.psm1` module contains a `Start-PSPackage` function to build Linux packages. 
-It requires that `Start-PSBuild -Publish` has been run. 
-The output *must* be published so that it includes the runtime. 
-This function will automatically deduce the correct version from the most recent annotated tag (using `git describe`), 
-and if not specified, will build a package for the current platform.
+The `Start-PSBuild` function delegates to `New-UnixPackage`.
+This function will automatically deduce the correct version from the most recent annotated tag (using `git describe`).
 
 At this time, each package must be made on the corresponding platform.
+The packages each have the .NET Core runtime-identifier appended to their filename.
+This is necessary to differentiate the Ubuntu 14.04 and 16.04 packages,
+which must be separate due to having different dependencies.
+
 The `Start-PSBuild` function relies on the [Effing Package Management][fpm] project,
 which makes building packages for any (non-Windows) platform a breeze.
-Follow their readme to install FPM.
+Similarly, the PowerShell man-page is generated from the Markdown-like file
+[`assets/powershell.1.ronn`][man] using [Ronn][].
+The function `Start-PSBootstrap -Publish` will install both these tools.
 
-To modify any property of the packages, edit the `Start-PSPackage` function.
-Please also refer to the function for details on the package properties (such as the description, 
-maintainer, vendor, URL, license, category, dependencies, and file layout).
+To modify any property of the packages, edit the `New-UnixPckage` function.
+Please also refer to the function for details on the package properties
+(such as the description, maintainer, vendor, URL,
+license, category, dependencies, and file layout).
+
+> Note that the only configuration on Linux and OS X is `Linux`,
+> which is release (i.e. not debug) configuration.
+
+### Side-By-Side Design
+
+To support side-by-side Unix packages, we use the following design:
+
+We will maintain a `powershell` package
+which owns the `/usr/bin/powershell` symlink,
+is the latest version, and is upgradeable.
+This is the only package named `powershell`
+and similarly is the only package owning any symlinks,
+executables, or man-pages named `powershell`.
+Until we have a package repository,
+this package will contain actual PowerShell bits
+(i.e. it is not a meta-package).
+These bits are installed to `/opt/microsoft/powershell/6.0.0-alpha.8/`,
+where the version will change with each update
+(and is the pre-release version).
+On OS X, the prefix is `/usr/local`,
+instead of `/opt/microsoft` because it is derived from BSD.
+
+> When we have access to package repositories where dependencies can be properly resolved,
+> this `powershell` package can become a meta-package which auto-installs the latest package,
+> and so only owns the symlink.
+
+For explicitly versioned packages, say for PowerShell 6.0,
+we will maintain separate packages named in the form `powershell6.0`,
+which owns the binary `powershell6.0`, the symlink `powershell6.0`,
+the man-page `powershell6.0`,
+and is installed to `/opt/microsoft/powershell/6.0/`.
+Specifically this package owns nothing named `powershell`,
+as only the `powershell` package owns those files.
+This package is upgradeable, but should only be updated with hot-fixes.
+This is a necessary consequence of Unix package managers,
+as files among packages *cannot* conflict.
+From a user-experience perspective,
+if the user requires a specific version of PowerShell,
+they should not be required to use an absolute path,
+and instead should be given a binary with the version in the name.
+This pattern is followed by many other languages
+(Python being the most obvious example).
+This same pattern can be followed for versions 6.1, 7.0, etc.,
+and can be used for patch version (e.g. 6.0.1).
+Use `Start-PSPackage -Name powershell6.0` to generate
+the versioned `powershell6.0` package.
+Without `-Name` specified, the primary `powershell`
+package will instead be created.
 
 [fpm]: https://github.com/jordansissel/fpm
+[man]: ../../assets/powershell.1.ronn
+[ronn]: https://github.com/rtomayko/ronn
 
 Windows
 -------
 
-The `Start-PSBuild` function delegates to `New-MSIPackage` which creates a Windows Installer Package of PowerShell. 
+The `Start-PSBuild` function delegates to `New-MSIPackage` which creates a Windows Installer Package of PowerShell.
+The packages *must* be published in release mode, so use `Start-PSBuild -CrossGen -Configuration Release`.
 It uses the Windows Installer XML Toolset (WiX) to generate a `PowerShell_<version>.msi`, 
 which installs a self-contained copy of the current version (commit) of PowerShell. 
 It copies the output of the published PowerShell application to a version-specific folder in Program Files, 
@@ -66,4 +132,4 @@ and installs a shortcut in the Start Menu.
 It can be uninstalled through Programs and Features.
 
 Note that PowerShell is always self-contained, thus using it does not require installing it. 
-The output of `Start-PSBuild -Publish` includes a `powershell.exe` executable which can simply be launched.
+The output of `Start-PSBuild` includes a `powershell.exe` executable which can simply be launched.