Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

Upgrade WiX packaging to Toolset v5

Juan Denis866c8376981c
diff --git a/.github/workflows/agent-release.yml b/.github/workflows/agent-release.yml
index cd9079da..6e722481 100644
--- a/.github/workflows/agent-release.yml
+++ b/.github/workflows/agent-release.yml
@@ -247,6 +247,10 @@ jobs:
run: |
dotnet tool install --global wix --version 5.0.2
+ - name: Install WiX Util extension
+ run: |
+ wix extension add --global WixToolset.Util.wixext
+
- name: Download binary
uses: actions/download-artifact@v4
with:
diff --git a/agent/packaging/msi/Product.wxs b/agent/packaging/msi/Product.wxs
index 42b53923..4dcc1e16 100644
--- a/agent/packaging/msi/Product.wxs
+++ b/agent/packaging/msi/Product.wxs
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
ServerKit Agent - Windows MSI Installer
- Built with WiX Toolset v4
+ Built with WiX Toolset v5
Build instructions:
- 1. Install WiX Toolset v4
- 2. Run: wix build Product.wxs -o serverkit-agent.msi -define Version=1.0.0
+ 1. Install WiX Toolset v5
+ 2. Install the Util extension: wix extension add --global WixToolset.Util.wixext
+ 3. Run: wix build Product.wxs -ext WixToolset.Util.wixext -o serverkit-agent.msi -define Version=1.0.0
-->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
diff --git a/agent/packaging/msi/build.ps1 b/agent/packaging/msi/build.ps1
index 3e160f55..f2719c92 100644
--- a/agent/packaging/msi/build.ps1
+++ b/agent/packaging/msi/build.ps1
@@ -128,14 +128,22 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\par
try {
Write-Host "Running WiX build..."
wix build -arch $Arch Product.wxs -ext WixToolset.Util.wixext -o "$absOutputDir\serverkit-agent-$Version-$Arch.msi" -define Version=$Version
+ if ($LASTEXITCODE -ne 0) {
+ throw "WiX build failed with exit code $LASTEXITCODE"
+ }
}
finally {
Pop-Location
}
+ $msiPath = "$absOutputDir\serverkit-agent-$Version-$Arch.msi"
+ if (-not (Test-Path $msiPath)) {
+ throw "MSI output not found at $msiPath"
+ }
+
Write-Host ""
Write-Host "MSI built successfully!"
- Write-Host "Output: $absOutputDir\serverkit-agent-$Version-$Arch.msi"
+ Write-Host "Output: $msiPath"
}
finally {
# Cleanup