Skip to content

Refactor MSI CI #14753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 5 commits into from
Feb 12, 2021
Merged

Refactor MSI CI #14753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4cb206
move wix assets
TravisEz13 Feb 8, 2021
13a10d1
move png files
TravisEz13 Feb 8, 2021
32e3bb2
update path filters
TravisEz13 Feb 10, 2021
550fba7
add build.psm1
TravisEz13 Feb 12, 2021
80581da
remove unused csproj
TravisEz13 Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 34 additions & 31 deletions .vsts-ci/windows/windows-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/files.wxs
- /assets/Product.wxs
- .vsts-ci/windows/*
- assets/wix/*
- build.psm1
- 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.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
Expand Down
6 changes: 3 additions & 3 deletions assets/Product.wxs → assets/wix/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
<!-- Set properties for add/remove programs -->
<Property Id="ARPHELPLINK" Value="$(var.InfoURL)" />
<!-- custom images -->
<WixVariable Id="WixUIBannerBmp" Value="assets\WixUIBannerBmp.png" />
<WixVariable Id="WixUIDialogBmp" Value="assets\WixUIDialogBmp.png" />
<WixVariable Id="WixUIExclamationIco" Value="assets\WixUIInfoIco.png" />
<WixVariable Id="WixUIBannerBmp" Value="assets\wix\WixUIBannerBmp.png" />
<WixVariable Id="WixUIDialogBmp" Value="assets\wix\WixUIDialogBmp.png" />
<WixVariable Id="WixUIExclamationIco" Value="assets\wix\WixUIInfoIco.png" />
<WixVariable Id="WixUIInfoIco" Value="assets\ps_black_32x32.ico" />
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Open $(var.ProductName)" />
<!-- Default value of Checkbox of starting PowerShell after installation -->
Expand Down
0 assets/WixUIBannerBmp.png → assets/wix/WixUIBannerBmp.png
View file
Open in desktop
File renamed without changes
0 assets/WixUIDialogBmp.png → assets/wix/WixUIDialogBmp.png
View file
Open in desktop
File renamed without changes
0 assets/WixUIInfoIco.png → assets/wix/WixUIInfoIco.png
View file
Open in desktop
File renamed without changes
0 assets/files.wxs → assets/wix/files.wxs
View file
Open in desktop
File renamed without changes.
0 assets/patch-template.wxs → assets/wix/patch-template.wxs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/powershell/Installer/WindowsInstaller.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
10 changes: 5 additions & 5 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()]
Expand Down Expand Up @@ -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()]
Expand Down