From d4cb2066e03650115fa89e3c87c7394b3210ca81 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 8 Feb 2021 22:45:10 +0000 Subject: [PATCH 1/5] move wix assets --- .vsts-ci/windows/windows-packaging.yml | 4 ++-- assets/{ => wix}/Product.wxs | 0 assets/{ => wix}/WixUIBannerBmp.png | Bin assets/{ => wix}/WixUIDialogBmp.png | Bin assets/{ => wix}/WixUIInfoIco.png | Bin assets/{ => wix}/files.wxs | 0 assets/{ => wix}/patch-template.wxs | 0 .../powershell/Installer/WindowsInstaller.Tests.ps1 | 2 +- tools/packaging/packaging.psm1 | 10 +++++----- 9 files changed, 8 insertions(+), 8 deletions(-) rename assets/{ => wix}/Product.wxs (100%) rename assets/{ => wix}/WixUIBannerBmp.png (100%) rename assets/{ => wix}/WixUIDialogBmp.png (100%) rename assets/{ => wix}/WixUIInfoIco.png (100%) rename assets/{ => wix}/files.wxs (100%) rename assets/{ => wix}/patch-template.wxs (100%) diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml index e3edb42d4c4..e01e66fe235 100644 --- a/.vsts-ci/windows/windows-packaging.yml +++ b/.vsts-ci/windows/windows-packaging.yml @@ -48,8 +48,8 @@ pr: - /src/powershell-win-core/powershell-win-core.csproj - /tools/ci.psm1 - /tools/packaging/* - - /assets/files.wxs - - /assets/Product.wxs + - /assets/wix/files.wxs + - /assets/wix/Product.wxs variables: - name: GIT_CONFIG_PARAMETERS diff --git a/assets/Product.wxs b/assets/wix/Product.wxs similarity index 100% rename from assets/Product.wxs rename to assets/wix/Product.wxs diff --git a/assets/WixUIBannerBmp.png b/assets/wix/WixUIBannerBmp.png similarity index 100% rename from assets/WixUIBannerBmp.png rename to assets/wix/WixUIBannerBmp.png diff --git a/assets/WixUIDialogBmp.png b/assets/wix/WixUIDialogBmp.png similarity index 100% rename from assets/WixUIDialogBmp.png rename to assets/wix/WixUIDialogBmp.png diff --git a/assets/WixUIInfoIco.png b/assets/wix/WixUIInfoIco.png similarity index 100% rename from assets/WixUIInfoIco.png rename to assets/wix/WixUIInfoIco.png diff --git a/assets/files.wxs b/assets/wix/files.wxs similarity index 100% rename from assets/files.wxs rename to assets/wix/files.wxs diff --git a/assets/patch-template.wxs b/assets/wix/patch-template.wxs similarity index 100% rename from assets/patch-template.wxs rename to assets/wix/patch-template.wxs diff --git a/test/powershell/Installer/WindowsInstaller.Tests.ps1 b/test/powershell/Installer/WindowsInstaller.Tests.ps1 index 76cca8151de..66bd08e74f5 100644 --- a/test/powershell/Installer/WindowsInstaller.Tests.ps1 +++ b/test/powershell/Installer/WindowsInstaller.Tests.ps1 @@ -14,7 +14,7 @@ Describe "Windows Installer" -Tags "Scenario" { } It "WiX (Windows Installer XML) file contains pre-requisites link $preRequisitesLink" -Skip:$skipTest { - $wixProductFile = Join-Path -Path $PSScriptRoot -ChildPath "..\..\..\assets\Product.wxs" + $wixProductFile = Join-Path -Path $PSScriptRoot -ChildPath "..\..\..\assets\wix\Product.wxs" (Get-Content $wixProductFile -Raw).Contains($preRequisitesLink) | Should -BeTrue } diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 0b80193053f..f2733e20689 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -2844,7 +2844,7 @@ function New-MSIPatch [Parameter(HelpMessage='Path to the patch template WXS. Usually you do not need to specify this')] [ValidateNotNullOrEmpty()] [ValidateScript( {Test-Path $_})] - [string] $PatchWxsPath = "$RepoRoot\assets\patch-template.wxs", + [string] $PatchWxsPath = "$RepoRoot\assets\wix\patch-template.wxs", [Parameter(HelpMessage='Produce a delta patch instead of a full patch. Usually not worth it.')] [switch] $Delta @@ -2884,7 +2884,7 @@ function New-MSIPatch Copy-Item -Path $BaselineWixPdbPath -Destination $wixBaselineOriginalPdbPath -Force Copy-Item -Path $PatchWixPdbPath -Destination $wixPatchOriginalPdbPath -Force - [xml] $filesAssetXml = Get-Content -Raw -Path "$RepoRoot\assets\files.wxs" + [xml] $filesAssetXml = Get-Content -Raw -Path "$RepoRoot\assets\wix\files.wxs" [xml] $patchTemplateXml = Get-Content -Raw -Path $PatchWxsPath # Update the patch version @@ -2975,12 +2975,12 @@ function New-MSIPackage # File describing the MSI Package creation semantics [ValidateNotNullOrEmpty()] [ValidateScript( {Test-Path $_})] - [string] $ProductWxsPath = "$RepoRoot\assets\Product.wxs", + [string] $ProductWxsPath = "$RepoRoot\assets\wix\Product.wxs", # File describing the MSI file components [ValidateNotNullOrEmpty()] [ValidateScript( {Test-Path $_})] - [string] $FilesWxsPath = "$RepoRoot\assets\Files.wxs", + [string] $FilesWxsPath = "$RepoRoot\assets\wix\Files.wxs", # Path to Assets folder containing artifacts such as icons, images [ValidateNotNullOrEmpty()] @@ -3331,7 +3331,7 @@ function Test-FileWxs # File describing the MSI file components from the asset folder [ValidateNotNullOrEmpty()] [ValidateScript( {Test-Path $_})] - [string] $FilesWxsPath = "$RepoRoot\assets\Files.wxs", + [string] $FilesWxsPath = "$RepoRoot\assets\wix\Files.wxs", # File describing the MSI file components generated by heat [ValidateNotNullOrEmpty()] From 13a10d12ca5a2c16a245d7b231f4357aea982c6f Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 8 Feb 2021 22:59:04 +0000 Subject: [PATCH 2/5] move png files --- assets/wix/Product.wxs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/wix/Product.wxs b/assets/wix/Product.wxs index a0ab0692706..b4a69fa8e25 100644 --- a/assets/wix/Product.wxs +++ b/assets/wix/Product.wxs @@ -53,9 +53,9 @@ - - - + + + From 32e3bb2343e2bab0c681fc4830451945b9415b59 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 10 Feb 2021 10:23:44 -0800 Subject: [PATCH 3/5] update path filters --- .vsts-ci/windows/windows-packaging.yml | 65 ++++++++++++++------------ 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml index e01e66fe235..1f4cf14927d 100644 --- a/.vsts-ci/windows/windows-packaging.yml +++ b/.vsts-ci/windows/windows-packaging.yml @@ -8,14 +8,17 @@ trigger: - release* - feature* paths: - include: - - /.vsts-ci/templates/windows-packaging.yml - - /.vsts-ci/windows-packaging.yml - - /global.json - - /src/* - - /tools/ci.psm1 - - /tools/packaging/* - - /assets/* + exclude: + - tests/* + - docs/* + - demos/* + - CHANGELOG/* + - .devcontainer/* + - .github/* + - .poshchan/* + - .vscode/* + - code-server/* + - docker/* pr: branches: @@ -27,29 +30,29 @@ pr: # file extension filters are not supported when this was written. # This really should be /src/**/*.csproj include: - - /.vsts-ci/templates/windows-packaging.yml - - /.vsts-ci/windows-packaging.yml - - /global.json - - /src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj - - /src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj - - /src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj - - /src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj - - /src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj - - /src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj - - /src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj - - /src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj - - /src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj - - /src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj - - /src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj - - /src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj - - /src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj - - /src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj - - /src/Modules/PSGalleryModules.csproj - - /src/powershell-win-core/powershell-win-core.csproj - - /tools/ci.psm1 - - /tools/packaging/* - - /assets/wix/files.wxs - - /assets/wix/Product.wxs + - .vsts-ci/windows/* + - assets/wix/* + - global.json + - nuget.config + - PowerShell.Common.props + - src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj + - src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj + - src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj + - src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj + - src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj + - src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj + - src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj + - src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj + - src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj + - src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj + - src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj + - src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj + - src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj + - src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj + - src/Modules/PSGalleryModules.csproj + - src/powershell-win-core/powershell-win-core.csproj + - tools/ci.psm1 + - tools/packaging/* variables: - name: GIT_CONFIG_PARAMETERS From 550fba7f5059f60a611b65ef444df65cc203b692 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 12 Feb 2021 11:53:36 -0800 Subject: [PATCH 4/5] add build.psm1 --- .vsts-ci/windows/windows-packaging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml index 1f4cf14927d..0700c6c2899 100644 --- a/.vsts-ci/windows/windows-packaging.yml +++ b/.vsts-ci/windows/windows-packaging.yml @@ -32,6 +32,7 @@ pr: include: - .vsts-ci/windows/* - assets/wix/* + - build.psm1 - global.json - nuget.config - PowerShell.Common.props From 80581da169f501eef7832035fd112e837097288d Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 12 Feb 2021 11:59:15 -0800 Subject: [PATCH 5/5] remove unused csproj --- .vsts-ci/windows/windows-packaging.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml index 0700c6c2899..f471196d963 100644 --- a/.vsts-ci/windows/windows-packaging.yml +++ b/.vsts-ci/windows/windows-packaging.yml @@ -44,7 +44,6 @@ pr: - src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj - src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj - src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj - - src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj - src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj - src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj - src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj