diff options
Diffstat (limited to 'Tools/msi/common.wxs')
| -rw-r--r-- | Tools/msi/common.wxs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs index 9f96bd3..100a013 100644 --- a/Tools/msi/common.wxs +++ b/Tools/msi/common.wxs @@ -22,17 +22,19 @@ </Upgrade> <?if $(var.UpgradeCode)!=$(var.CoreUpgradeCode) ?> + <?ifndef SkipMissingCore ?> <Upgrade Id="$(var.CoreUpgradeCode)"> <UpgradeVersion Property="MISSING_CORE" Minimum="$(var.Version)" IncludeMinimum="yes" Maximum="$(var.Version)" IncludeMaximum="yes" OnlyDetect="yes" /> </Upgrade> + <Condition Message="!(loc.IncorrectCore)">Installed OR NOT MISSING_CORE</Condition> + <?endif ?> <?endif ?> <Condition Message="!(loc.NoDowngrade)">Installed OR NOT DOWNGRADE</Condition> - <Condition Message="!(loc.IncorrectCore)">Installed OR NOT MISSING_CORE</Condition> <Condition Message="!(loc.NoTargetDir)">Installed OR TARGETDIR OR Suppress_TARGETDIR_Check</Condition> <InstallExecuteSequence> - <RemoveExistingProducts After="InstallInitialize">UPGRADE</RemoveExistingProducts> + <RemoveExistingProducts After="InstallInitialize" Overridable="yes">UPGRADE</RemoveExistingProducts> </InstallExecuteSequence> </Fragment> |