diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-09 20:19:09 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-09 20:19:09 (GMT) |
| commit | fa526bd19c25a134582b0dec08cbda13e48cd6b4 (patch) | |
| tree | 9d3a841bacc359360fd81417b8d6f61955d895f1 /Tools | |
| parent | c45599d0d12b1006deed41c97c7839d646dea62c (diff) | |
| download | cpython-fa526bd19c25a134582b0dec08cbda13e48cd6b4.zip cpython-fa526bd19c25a134582b0dec08cbda13e48cd6b4.tar.gz cpython-fa526bd19c25a134582b0dec08cbda13e48cd6b4.tar.bz2 | |
Closes #27314: Fixes launcher installer upgrade table.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/common.wxs | 2 | ||||
| -rw-r--r-- | Tools/msi/launcher/launcher.wixproj | 2 | ||||
| -rw-r--r-- | Tools/msi/launcher/launcher.wxs | 11 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs index c894eb8..1949e81 100644 --- a/Tools/msi/common.wxs +++ b/Tools/msi/common.wxs @@ -20,10 +20,12 @@ <Fragment> <Property Id="UpgradeTable" Value="1" /> + <?ifndef SuppressUpgradeTable ?> <Upgrade Id="$(var.UpgradeCode)"> <UpgradeVersion Property="DOWNGRADE" Minimum="$(var.Version)" IncludeMinimum="no" OnlyDetect="yes" /> <UpgradeVersion Property="UPGRADE" Minimum="$(var.UpgradeMinimumVersion)" IncludeMinimum="yes" Maximum="$(var.Version)" IncludeMaximum="no" /> </Upgrade> + <?endif ?> <?ifdef CoreUpgradeCode ?> <?if $(var.UpgradeCode)!=$(var.CoreUpgradeCode) ?> diff --git a/Tools/msi/launcher/launcher.wixproj b/Tools/msi/launcher/launcher.wixproj index 01a9dcb..8935ce8 100644 --- a/Tools/msi/launcher/launcher.wixproj +++ b/Tools/msi/launcher/launcher.wixproj @@ -5,7 +5,7 @@ <SchemaVersion>2.0</SchemaVersion> <OutputName>launcher</OutputName> <OutputType>Package</OutputType> - <DefineConstants>UpgradeCode=1B68A0EC-4DD3-5134-840E-73854B0863F1;$(DefineConstants)</DefineConstants> + <DefineConstants>UpgradeCode=1B68A0EC-4DD3-5134-840E-73854B0863F1;SuppressUpgradeTable=1;$(DefineConstants)</DefineConstants> <IgnoreCommonWxlTemplates>true</IgnoreCommonWxlTemplates> <SuppressICEs>ICE80</SuppressICEs> </PropertyGroup> diff --git a/Tools/msi/launcher/launcher.wxs b/Tools/msi/launcher/launcher.wxs index c0ff51a..7de131a 100644 --- a/Tools/msi/launcher/launcher.wxs +++ b/Tools/msi/launcher/launcher.wxs @@ -29,18 +29,21 @@ <Custom Before="SetLauncherInstallDirectoryLM" Action="SetLauncherInstallDirectoryCU">NOT Installed AND NOT ALLUSERS=1</Custom> <Custom Before="CostFinalize" Action="SetLauncherInstallDirectoryLM">NOT Installed AND ALLUSERS=1</Custom> - <RemoveExistingProducts After="InstallValidate">UPGRADE or REMOVE_350_LAUNCHER</RemoveExistingProducts> + <RemoveExistingProducts After="InstallValidate">UPGRADE or REMOVE_350_LAUNCHER or REMOVE_360A1_LAUNCHER</RemoveExistingProducts> </InstallExecuteSequence> + <!-- Upgrade all versions of the launcher --> + <Upgrade Id="$(var.UpgradeCode)"> + <UpgradeVersion Property="DOWNGRADE" Minimum="$(var.Version)" IncludeMinimum="no" OnlyDetect="yes" /> + <UpgradeVersion Property="UPGRADE" Minimum="0.0.0.0" IncludeMinimum="yes" Maximum="$(var.Version)" IncludeMaximum="no" /> + </Upgrade> <!-- Python 3.5.0 shipped with a different UpgradeCode --> <Upgrade Id="A71530B9-E89D-53DB-9C2D-C6D7551876D8"> <UpgradeVersion Minimum="0.0.0.0" Property="REMOVE_350_LAUNCHER" /> </Upgrade> <!-- Python 3.6.0a1 shipped with a different UpgradeCode --> <Upgrade Id="394750C0-7880-5A8F-999F-933965FBCFB4"> - <UpgradeVersion Maximum="$(var.Version)" Property="REMOVE_360A1_LAUNCHER" /> - <UpgradeVersion Minimum="$(var.Version)" Property="BLOCK_360A1_LAUNCHER" /> + <UpgradeVersion Minimum="0.0.0.0" Property="REMOVE_360A1_LAUNCHER" /> </Upgrade> - <Condition Message="!(loc.NoDowngrade)">Installed OR NOT BLOCK_360A1_LAUNCHER</Condition> </Product> </Wix> |