Skip to content

Commit 0bf6541

Browse files
committed
try to allow wix 7 build by accepting eula, see https://docs.firegiant.com/wix/osmf/
1 parent 5b25ac3 commit 0bf6541

5 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/CI_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ jobs:
4848
$env:PYTHONBUILDDIR_X64='${{ github.workspace }}\packages\python.3.14.7\tools'
4949
$env:PYTHONBUILDDIR='${{ github.workspace }}\packages\pythonx86.3.14.7\tools'
5050
Rename-Item -Path ".\buildPaths.bat.orig" -NewName "buildPaths.bat"
51-
dotnet tool install --global wix --version 6.0.2
51+
dotnet tool install --global wix --version 7.0.0
5252
.\buildAll.bat ${{ matrix.build_platform }}

PythonScript/project/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="python" version="3.14.7" targetFramework="native" />
44
<package id="pythonarm64" version="3.14.7" targetFramework="native" />
55
<package id="pythonx86" version="3.14.7" targetFramework="native" />
6-
<package id="WixToolset.UI.wixext" version="6.0.2" targetFramework="native" />
6+
<package id="WixToolset.UI.wixext" version="7.0.0" targetFramework="native" />
77
</packages>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="WixToolset.UI.wixext" version="6.0.2" targetFramework="native" />
3+
<package id="WixToolset.UI.wixext" version="7.0.0" targetFramework="native" />
44
</packages>

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ after_build:
4545
- if "%configuration%"=="Release" make.bat html
4646

4747
- cd "%APPVEYOR_BUILD_FOLDER%"\installer
48-
- dotnet tool install --global wix --version 6.0.2
48+
- dotnet tool install --global wix --version 7.0.0
4949
- SET PYTHONBUILDDIR_ARM64="%APPVEYOR_BUILD_FOLDER%"\packages\pythonarm64.3.14.7\tools
5050
- SET PYTHONBUILDDIR_X64="%APPVEYOR_BUILD_FOLDER%"\packages\python.3.14.7\tools
5151
- SET PYTHONBUILDDIR="%APPVEYOR_BUILD_FOLDER%"\packages\pythonx86.3.14.7\tools

installer/buildInstaller.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ SET /p PYTHONSCRIPTVERSION= < %INST_TEMP_DIR%\version.txt
5151

5252
cd ..\packages
5353
echo add UI extension globally
54-
wix extension add -g WixToolset.UI.wixext/6.0.2
54+
wix eula accept wix7
55+
wix extension add -g WixToolset.UI.wixext/7.0.0
5556
wix extension list -g
5657
cd ..\installer
5758

0 commit comments

Comments
 (0)