diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 14:55:16 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 14:55:16 -0800 |
| commit | b53654b6dbfce8318a7d4d1cdaddca7a7fec194b (patch) | |
| tree | 204df61b2fb23424603db767732db35a687529c6 /Tools/msi/launcher/launcher.wxs | |
| parent | e1ac7d87afad9c07ec25e5705bb135b71347b581 (diff) | |
| parent | 2296b978597ce62ec2185b78a43811610af2c0ea (diff) | |
| download | cpython-b53654b6dbfce8318a7d4d1cdaddca7a7fec194b.tar.gz | |
Issue #29416: Prevent infinite loop in pathlib.Path.mkdir
Diffstat (limited to 'Tools/msi/launcher/launcher.wxs')
| -rw-r--r-- | Tools/msi/launcher/launcher.wxs | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Tools/msi/launcher/launcher.wxs b/Tools/msi/launcher/launcher.wxs index ebd875cd9a..7de131a3ed 100644 --- a/Tools/msi/launcher/launcher.wxs +++ b/Tools/msi/launcher/launcher.wxs @@ -5,7 +5,10 @@ <MediaTemplate EmbedCab="yes" CompressionLevel="high" /> <Property Id="Suppress_TARGETDIR_Check" Value="1" /> - <PropertyRef Id="ARPPRODUCTICON" /> + <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\icons\launcher.ico" /> + <Property Id="ARPPRODUCTICON" Value="ARPIcon" /> + <Property Id="ARPNOMODIFY" Value="1" /> + <Property Id="DISABLEADVTSHORTCUTS" Value="1" /> <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> <ComponentGroupRef Id="launcher_exe" Primary="yes" /> @@ -26,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> |