diff options
| author |   Simon Rozman <simon@rozman.si> | 2019-04-17 13:25:55 +0200 |
|---|---|---|
| committer | Simon Rozman <simon@rozman.si> | 2019-04-17 15:39:51 +0200 |
| commit | bfa3b3f6cc113724744bcf198665d2585a8ee254 (patch) | |
| tree | e922a2729ea749e96ed6066f3e7026736e908858 /wintun.wxs | |
| parent | MSM: Mark package as read-only (diff) | |
| download | wintun-bfa3b3f6cc113724744bcf198665d2585a8ee254.tar.xz wintun-bfa3b3f6cc113724744bcf198665d2585a8ee254.zip | |
MSM: Explicitly version driver files
wintun.inf and wintun.cat have no version resource. WiX linker cannot
determine their versions and the MSM will use file sizes and hashes for
update logic. By setting explicit file version and language, the version
will always be used to determine which version is newer on updates.
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'wintun.wxs')
| -rw-r--r-- | wintun.wxs | 23 |
1 files changed, 19 insertions, 4 deletions
@@ -8,7 +8,7 @@ xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:diffx="http://schemas.microsoft.com/wix/DifxAppExtension" xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension"> - <Module Id="wintun" Language="0" Version="$(var.WINTUN_VERSION_MAJ).$(var.WINTUN_VERSION_MIN).$(var.WINTUN_VERSION_REV).$(var.WINTUN_VERSION_BUILD)"> + <Module Id="wintun" Language="0" Version="$(var.WINTUN_VERSION)"> <Package Id="c28309d9-1954-4f2d-a7d1-228850092460" Description="Wintun Userspace Tunnel" @@ -23,7 +23,12 @@ <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="MergeRedirectFolder"> <Component Id="wintun.cat" Guid="41fbe711-a1af-4b83-8b5d-fc1b112969c1"> - <File Id="wintun.cat" Name="wintun.cat" Source="!(bindpath.output_dir)wintun\wintun.cat"/> + <File + Id="wintun.cat" + Name="wintun.cat" + Source="!(bindpath.output_dir)wintun\wintun.cat" + DefaultVersion="$(var.WINTUN_VERSION)" + DefaultLanguage="0"/> <iis:Certificate Id="wintun.cer" Name="WireGuard LLC" @@ -36,10 +41,20 @@ PlugAndPlayPrompt="no"/> </Component> <Component Id="wintun.inf" Guid="c58122b3-c7ba-4207-b68d-a236e371f9ed"> - <File Id="wintun.inf" Name="wintun.inf" Source="!(bindpath.output_dir)wintun\wintun.inf"/> + <File + Id="wintun.inf" + Name="wintun.inf" + Source="!(bindpath.output_dir)wintun\wintun.inf" + DefaultVersion="$(var.WINTUN_VERSION)" + DefaultLanguage="0"/> </Component> <Component Id="wintun.sys" Guid="d0fde4a4-d228-4803-b57e-76bd8b16cf42"> - <File Id="wintun.sys" Name="wintun.sys" Source="!(bindpath.output_dir)wintun\wintun.sys"/> + <File + Id="wintun.sys" + Name="wintun.sys" + Source="!(bindpath.output_dir)wintun\wintun.sys" + DefaultVersion="$(var.WINTUN_VERSION)" + DefaultLanguage="0"/> </Component> </Directory> </Directory> |