aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/wix
diff options
context:
space:
mode:
authorGraham Bloice <graham.bloice@trihedral.com>2018-03-01 23:18:17 +0000
committerGraham Bloice <graham.bloice@trihedral.com>2018-03-02 10:53:29 +0000
commit59b0d22ec00154a6a314a7f988e4b393d1f966ee (patch)
tree8a32545eeef3897e6208c0a4fd8b57ef62c121c5 /packaging/wix
parent13bb4911af9e36d9b95a9db5d6d9e9058b710cff (diff)
Windows: Update target version info
Set the API target level to Win7, along with installer changes to match. Change-Id: Icd93964eadf93018c56218e3efdfed10b9f8959a Reviewed-on: https://code.wireshark.org/review/26218 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'packaging/wix')
-rw-r--r--packaging/wix/Prerequisites.wxi8
1 files changed, 6 insertions, 2 deletions
diff --git a/packaging/wix/Prerequisites.wxi b/packaging/wix/Prerequisites.wxi
index 6298113907..54e8416a9c 100644
--- a/packaging/wix/Prerequisites.wxi
+++ b/packaging/wix/Prerequisites.wxi
@@ -31,8 +31,12 @@
<![CDATA[Installed OR (VersionNT < 502) OR (VersionNT > 502)]]>
</Condition>
- <Condition Message="$(var.WiresharkName)$(var.WiresharkVersion) is only supported on Windows Vista, Windows Server 2008, or higher.">
- <![CDATA[Installed OR (VersionNT >= 600)]]>
+ <Condition Message="Windows Vista and Server 2008 are no longer supported. Please install $(var.WiresharkName) 2.2 instead.">
+ <![CDATA[Installed OR (VersionNT < 600) OR (VersionNT > 600)]]>
+ </Condition>
+
+ <Condition Message="$(var.WiresharkName)$(var.WiresharkVersion) is only supported on Windows 7, Windows Server 2008R2, or higher.">
+ <![CDATA[Installed OR (VersionNT >= 601)]]>
</Condition>
<!--