diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-01 22:19:39 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-01 22:19:39 (GMT) |
| commit | c9fda9b903dc85be334e588b4be784e878248905 (patch) | |
| tree | ad8194aa928743c0fb0e0dd72c76fde952ed7a2f /Tools/msi/common.wxs | |
| parent | c4b7600b903aca2fec434801d8d185bd2df65076 (diff) | |
| download | cpython-c9fda9b903dc85be334e588b4be784e878248905.zip cpython-c9fda9b903dc85be334e588b4be784e878248905.tar.gz cpython-c9fda9b903dc85be334e588b4be784e878248905.tar.bz2 | |
Issue #25165: Windows uninstallation should not remove launcher if other versions remain
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> |