aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/installer
diff options
context:
space:
mode:
authorSimon Rozman <simon@rozman.si>2019-05-07 14:33:52 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-05-08 08:31:00 +0200
commit1864f10a1c4ca37f4b4cc957de45bf1a7ae5672b (patch)
treed699a89bfd6791ddbc8c6ce9b7ec0dded6d3e62d /installer
parentinstaller: silence ICE61 warning (diff)
downloadwireguard-windows-1864f10a1c4ca37f4b4cc957de45bf1a7ae5672b.tar.xz
wireguard-windows-1864f10a1c4ca37f4b4cc957de45bf1a7ae5672b.zip
installer: silence LGHT1056 warning
> warning LGHT1056 : The Property table contains a row with primary key(s) 'MsiHiddenProperties' which cannot be merged from the merge module '.deps\wintun-amd64.msm'. This is likely due to collision of rows with the same primary key(s) (but other different values in other columns) between the database and the merge module. The warning is caused by Wintun MSM and WireGuard MSI both using MsiHiddenProperties property. This property is used by WiX to hide internal data passed to deferred actions from being output to the log. Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'installer')
-rw-r--r--installer/build.bat1
1 files changed, 1 insertions, 0 deletions
diff --git a/installer/build.bat b/installer/build.bat
index 1f67dce3..f8df607c 100644
--- a/installer/build.bat
+++ b/installer/build.bat
@@ -9,6 +9,7 @@ set STARTDIR=%cd%
set OLDWIX=%WIX%
set WIX_CANDLE_FLAGS=-nologo -dWIREGUARD_VERSION="%WIREGUARD_VERSION%"
set WIX_LIGHT_FLAGS=-nologo -spdb
+set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sw1056
set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE30
set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE61