From 061cf4a6a0851ae7d0a6113f6078367984517458 Mon Sep 17 00:00:00 2001 From: "Raghu Shantha [MSFT]" Date: Mon, 6 Jun 2016 13:20:00 -0700 Subject: [PATCH] Moved MSI wxs file to assets ; Renamed MSI package creation function to be compliant with PowerShell verb-noun conventions --- Product.wxs => assets/Product.wxs | 0 build.psm1 | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename Product.wxs => assets/Product.wxs (100%) diff --git a/Product.wxs b/assets/Product.wxs similarity index 100% rename from Product.wxs rename to assets/Product.wxs diff --git a/build.psm1 b/build.psm1 index 5bd162296..17e0d72f7 100644 --- a/build.psm1 +++ b/build.psm1 @@ -443,7 +443,7 @@ Built upon .NET Core, it is also a C# REPL. Write-Verbose "Packaging $Source" if ($IsWindows) { - $msiPackagePath = Create-MSIPackage -ProductSourcePath $Source -ProductVersion $Version -Verbose + $msiPackagePath = New-MSIPackage -ProductSourcePath $Source -ProductVersion $Version -Verbose $appxPackagePath = New-AppxPackage -PackageVersion $Version -SourcePath $Source -AssetsPath "$PSScriptRoot\Assets" -Verbose $packages = @($msiPackagePath, $appxPackagePath) @@ -957,7 +957,7 @@ internal class {0} {{ $body -f $ClassName,$ModuleName,$entries } -function Create-MSIPackage +function New-MSIPackage { [CmdletBinding()] param ( @@ -982,7 +982,7 @@ function Create-MSIPackage # File describing the MSI Package creation semantics [ValidateNotNullOrEmpty()] - [string] $ProductWxsPath = (Join-Path $pwd 'Product.wxs') + [string] $ProductWxsPath = (Join-Path $pwd '\assets\Product.wxs') )