From 11f3c81f555e92b999e06b8b5b22095323ed9626 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Sat, 13 Apr 2024 22:31:56 +0300 Subject: [PATCH] Use WIX 5 IB-8024 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 4 +- cmake | 2 +- idupdater.wxs | 81 +++++++++++++------------------------ 3 files changed, 32 insertions(+), 55 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f9984e..99cf42a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,8 +59,8 @@ jobs: arch: x64 - name: Install WiX run: | - dotnet tool install --global wix - wix extension -g add WixToolset.UI.wixext/4.0.4 + dotnet tool install -g wix --version 5.0.0 + wix extension -g add WixToolset.UI.wixext/5.0.0 - name: Build run: | cmake -S . -B build ` diff --git a/cmake b/cmake index da3cafb..8c8d235 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit da3cafb0712eac8fbfddd7d37343016430b65b44 +Subproject commit 8c8d235e061e0e01bd95e150e273950c224557ea diff --git a/idupdater.wxs b/idupdater.wxs index b094d28..c43984a 100644 --- a/idupdater.wxs +++ b/idupdater.wxs @@ -20,7 +20,6 @@ xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> - @@ -31,71 +30,49 @@ - - + + + Name="Installed" Value="[INSTALLFOLDER]" Type="string" /> + Name="Installed" Value="[INSTALLFOLDER]" Type="string" /> - - - - - + + + + + - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + - - - - + + - - - - + + - - - - + + - - - - - - - - - - -