From 3c9347b3bb969a3c06e3f481a122dba67c224eab Mon Sep 17 00:00:00 2001 From: "Raghu Shantha [MSFT]" Date: Mon, 27 Jun 2016 11:39:49 -0700 Subject: [PATCH 1/2] MSI Installer enhancements Part 1 --- assets/Powershell_256.ico | Bin 0 -> 370070 bytes assets/Product.wxs | 21 ++++++++++++++------- build.psm1 | 35 ++++++++++++++++++++++++++--------- 3 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 assets/Powershell_256.ico diff --git a/assets/Powershell_256.ico b/assets/Powershell_256.ico new file mode 100644 index 0000000000000000000000000000000000000000..dfecd8de807e0c7dc94d42dcedcb62ac7e1d52e5 GIT binary patch literal 370070 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 literal 0 HcmV?d00001 diff --git a/assets/Product.wxs b/assets/Product.wxs index 1a0b0e44e..ea1b7f3a7 100644 --- a/assets/Product.wxs +++ b/assets/Product.wxs @@ -14,9 +14,15 @@ - + - + + + + + + + @@ -25,7 +31,7 @@ - + @@ -37,7 +43,7 @@ - + @@ -48,7 +54,7 @@ - + @@ -59,11 +65,12 @@ - + WorkingDirectory="$(var.ProductVersionWithName)" + Icon = "PowerShellExe.ico" /> diff --git a/build.psm1 b/build.psm1 index b61915a2f..ae9951eaf 100644 --- a/build.psm1 +++ b/build.psm1 @@ -1348,7 +1348,7 @@ function New-MSIPackage # Name of the Product [ValidateNotNullOrEmpty()] - [string] $ProductName = 'OpenPowerShell', + [string] $ProductName = 'PowerShell', # Version of the Product [Parameter(Mandatory = $true)] @@ -1366,7 +1366,12 @@ function New-MSIPackage # File describing the MSI Package creation semantics [ValidateNotNullOrEmpty()] - [string] $ProductWxsPath = (Join-Path $pwd '\assets\Product.wxs') + [string] $ProductWxsPath = (Join-Path $pwd '\assets\Product.wxs'), + + # Path to Assets folder containing artifacts such as icons, images + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + [string] $AssetsPath ) @@ -1382,9 +1387,21 @@ function New-MSIPackage $wixHeatExePath = Join-Path $wixToolsetBinPath "Heat.exe" $wixCandleExePath = Join-Path $wixToolsetBinPath "Candle.exe" $wixLightExePath = Join-Path $wixToolsetBinPath "Light.exe" + + Write-Verbose "Extract the version in the form of a.b.c.d for $ProductVersion" + $ProductVersionTokens = $ProductVersion.Split('-') + $ProductVersion = ([regex]::matches($ProductVersion, "\d+(\.\d+)+"))[0].value + + # Need to add the last version field for makeappx + $ProductVersion = $ProductVersion + '.' + $ProductVersionTokens[1] - # Wix tooling does not like hyphen in the foldername - $ProductVersion = $ProductVersion.Replace('-', '_') + $assetsInSourcePath = "$ProductSourcePath" + '\assets' + New-Item $assetsInSourcePath -type directory -Force | Write-Verbose + + $assetsInSourcePath = Join-Path $ProductSourcePath 'assets' + + Write-Verbose "Place dependencies such as icons to $assetsInSourcePath" + Copy-Item "$AssetsPath\*.ico" $assetsInSourcePath -Force $productVersionWithName = $ProductName + "_" + $ProductVersion Write-Verbose "Create MSI for Product $productVersionWithName" @@ -1420,7 +1437,7 @@ function New-AppxPackage # Name of the Package [ValidateNotNullOrEmpty()] - [string] $PackageName = 'OpenPowerShell', + [string] $PackageName = 'PowerShell', # Version of the Package [Parameter(Mandatory = $true)] @@ -1471,9 +1488,9 @@ function New-AppxPackage $appxManifest = @" - + - OpenPowerShell + PowerShell Microsoft Corporation #LOGO# @@ -1488,8 +1505,8 @@ function New-AppxPackage - - + + From e8145e056db924ae57c53dc20e1dffefce7c3894 Mon Sep 17 00:00:00 2001 From: "Raghu Shantha [MSFT]" Date: Mon, 27 Jun 2016 11:50:14 -0700 Subject: [PATCH 2/2] Added Assets path to New-MSIPackage invocation --- build.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.psm1 b/build.psm1 index ae9951eaf..e6b414955 100644 --- a/build.psm1 +++ b/build.psm1 @@ -504,7 +504,7 @@ Built upon .NET Core, it is also a C# REPL. Write-Verbose "Packaging $Source" if ($IsWindows) { - $msiPackagePath = New-MSIPackage -ProductSourcePath $Source -ProductVersion $Version -Verbose + $msiPackagePath = New-MSIPackage -ProductSourcePath $Source -ProductVersion $Version -AssetsPath "$PSScriptRoot\Assets" -Verbose $appxPackagePath = New-AppxPackage -PackageVersion $Version -SourcePath $Source -AssetsPath "$PSScriptRoot\Assets" -Verbose $packages = @($msiPackagePath, $appxPackagePath)