actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-17 23:28:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Add WiX to VS on Windows-2022 (#4895)

Browse Source 
* [Windows] Add wix to VS on Windows-2022

* [Windows] Move WiX in toolset on windows 16, 19
This commit is contained in:
V-Zabayrachny
2022-01-21 18:40:37 +03:00
committed by GitHub
parent e2ebfcd1e9
commit df0e83c8f7
5 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
images/win/scripts/Installers/Install-Wix.ps1
View File

@@ -5,23 +5,4 @@
Choco-Install -PackageName wixtoolset -ArgumentList "--force" Choco-Install -PackageName wixtoolset -ArgumentList "--force"
if (Test-IsWin19)
{
$extensionUrl = "https://wixtoolset.gallerycdn.vsassets.io/extensions/wixtoolset/wixtoolsetvisualstudio2019extension/1.0.0.4/1563296438961/Votive2019.vsix"
$VSver = "2019"
}
elseif (Test-IsWin16)
{
$extensionUrl = "https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix"
$VSver = "2017"
}
if (-not (Test-IsWin22))
{
$extensionName = "Votive$VSver.vsix"
#Installing VS extension 'Wix Toolset Visual Studio Extension'
Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver
}
Invoke-PesterTests -TestFile "Wix" Invoke-PesterTests -TestFile "Wix"

12
images/win/scripts/Tests/Wix.Tests.ps1
View File

@@ -8,16 +8,4 @@ Describe "Wix" {
It "Wix Toolset version from registry" { It "Wix Toolset version from registry" {
$version | Should -Not -BeNullOrEmpty $version | Should -Not -BeNullOrEmpty
} }
It "Wix Toolset version from system" -Skip:(Test-IsWin22) {
if (Test-IsWin19)
{
$exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16"
}
else
{
$exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev15"
}
$exVersion | Should -Not -BeNullOrEmpty
}
} }

1
images/win/toolsets/toolset-2016.json
View File

@@ -343,6 +343,7 @@
"Microsoft.VisualStudio.Workload.Office" "Microsoft.VisualStudio.Workload.Office"
], ],
"vsix": [ "vsix": [
"WixToolset.WixToolsetVisualStudio2017Extension"
] ]
}, },
"docker": { "docker": {

3
images/win/toolsets/toolset-2019.json
View File

@@ -377,7 +377,8 @@
"SSIS.SqlServerIntegrationServicesProjects", "SSIS.SqlServerIntegrationServicesProjects",
"ProBITools.MicrosoftReportProjectsforVisualStudio", "ProBITools.MicrosoftReportProjectsforVisualStudio",
"VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects", "VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects",
"ms-biztalk.BizTalk" "ms-biztalk.BizTalk",
"WixToolset.WixToolsetVisualStudio2019Extension"
] ]
}, },
"docker": { "docker": {

3
images/win/toolsets/toolset-2022.json
View File

@@ -247,7 +247,8 @@
"wasm.tools" "wasm.tools"
], ],
"vsix": [ "vsix": [
"VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects" "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects",
"WixToolset.WixToolsetVisualStudio2022Extension"
] ]
}, },
"docker": { "docker": {