From d75eea074d81c366db27575c678452726192764b Mon Sep 17 00:00:00 2001
From: A13501350 <18516149786@163.com>
Date: Sun, 21 Sep 2025 02:33:02 +0800
Subject: [PATCH] untest
---
.github/workflows/test-ci-windows.yml | 41 +-
iis/installer.wxs | 519 +++++---------------------
2 files changed, 127 insertions(+), 433 deletions(-)
diff --git a/.github/workflows/test-ci-windows.yml b/.github/workflows/test-ci-windows.yml
index 7d4f9bf5..7fec6392 100644
--- a/.github/workflows/test-ci-windows.yml
+++ b/.github/workflows/test-ci-windows.yml
@@ -123,30 +123,43 @@ jobs:
- name: Checkout code
uses: actions/checkout@v5
+ - name: Download x64 artifacts
+ uses: actions/download-artifact@v4
+ with:
+ name: iis-module-x64
+ path: iis/release/amd64/
+
- name: Download x86 artifacts
uses: actions/download-artifact@v4
with:
name: iis-module-x86
path: iis/release/x86/
-
- - name: Download x64 artifacts
- uses: actions/download-artifact@v4
- with:
- name: iis-module-x64
- path: iis/release/amd64/
-
- - name: Package IIS Module with WiX
+ - name: Generate wxs files
shell: pwsh
run: |
- $CURRENT_DIR = "${{ github.workspace }}\iis\"
- candle.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wxs" -out "$CURRENT_DIR\installer.wixobj" -arch x64
- light.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wixobj" -out "$CURRENT_DIR\installer\modsecurityiis-x64.msi"
- candle.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wxs" -out "$CURRENT_DIR\installer.wixobj" -arch x86
- light.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wixobj" -out "$CURRENT_DIR\installer\modsecurityiis-x86.msi"
+ heat dir "iis\release\amd64" -cg ModSec64Components -dr inetsrv64 -gg -sreg -srd -var var.ModSecurityIISRelease64 -out "iis\ModSec64.wxs"
+ heat dir "iis\release\x86" -cg ModSec32Components -dr inetsrv32 -gg -sreg -srd -var var.ModSecurityIISRelease32 -out "iis\ModSec32.wxs"
+
+ - name: Compile wxs files
+ shell: pwsh
+ run: |
+ candle.exe -ext WixUtilExtension -ext WixUIExtension "iis\installer.wxs" "iis\ModSec64.wxs" -arch x64 -dModSecurityIISRelease64="iis\release\amd64\"
+ candle.exe -ext WixUtilExtension -ext WixUIExtension "iis\ModSec32.wxs" -arch x86 -dModSecurityIISRelease32="iis\release\x86\"
+
+ - name: Link wixobj files into MSI
+ shell: pwsh
+ run: |
+ light.exe -ext WixUtilExtension -ext WixUIExtension "iis\installer.wixobj" "iis\ModSec32.wixobj" "iis\ModSec64.wixobj" -out "iis\modsecurityiis.msi"
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: modsecurityiis-installers
- path: iis/installer/*.msi
+ path: iis/installer/modsecurityiis.msi
+
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v4
+ with:
+ name: modsecurityiis-installers
+ path: iis/installer/modsecurityiis.msi
diff --git a/iis/installer.wxs b/iis/installer.wxs
index 9197a733..7f134bea 100644
--- a/iis/installer.wxs
+++ b/iis/installer.wxs
@@ -17,17 +17,19 @@
-
+
-
+
+
+
@@ -87,24 +89,28 @@
+
+
+
-
- VersionNT64
-
- NOT VersionNT64
-
-
-
-
-
+
+
+ VersionNT64
+
+ NOT VersionNT64
+
+
+
+
+
@@ -121,7 +127,7 @@
-
+
@@ -129,437 +135,112 @@
-
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
-
+
+
-
+