diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/extra.wxs.in | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 183a691ac93..c9242a31dd3 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -860,23 +860,12 @@ </Component> </Feature> - <!-- Extra condition to block the installer if NSIS based installation is detected--> - <Property Id="NSISINSTALLKEY"> - <RegistrySearch Id='NSISKey' Type='raw' - Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\MariaDB' Name='DisplayName' /> - </Property> - <Condition - Message= - 'Previous version of MariaDB was found, that used incompatible installer.
Please remove "[NSISINSTALLKEY]" before you proceed with this installation.' - > - <![CDATA[ NOT(NSISINSTALLKEY << "MariaDB @MAJOR_VERSION@.@MINOR_VERSION@.") OR Installed]]> - </Condition> <Condition Message= 'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'> <![CDATA[ALLUSERS = "1"]]> </Condition> - <Condition Message='This application is only supported on Windows Vista, Windows Server 2008, or higher.'> - <![CDATA[Installed OR (VersionNT >= 600)]]> + <Condition Message='This application is only supported on Windows 10, Windows Server 2016, or higher.'> + <![CDATA[Installed OR (VersionNT >= 603)]]> </Condition> </Fragment> </Wix> |