diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-07-09 03:18:44 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-09 03:18:44 (GMT) |
| commit | 494374922c909bfb7c833032a686cc173762d988 (patch) | |
| tree | 4824dbeaca517af7abab41a9c1714be71b23d975 /Tools/msi/bundle/packagegroups/core.wxs | |
| parent | 9e7a0468ef12dc68a7efc397511ef06407aa835c (diff) | |
| download | cpython-494374922c909bfb7c833032a686cc173762d988.zip cpython-494374922c909bfb7c833032a686cc173762d988.tar.gz cpython-494374922c909bfb7c833032a686cc173762d988.tar.bz2 | |
Issue #24585: Enables build-to-build upgrades that preserve settings.
Rather than using Burn "Persisted" variables we now add registry keys for each added feature. These can be detected by the installer regardless of which version installed them, and we use this for Modify and Upgrade. In particular, Upgrades can't access the Persisted variables, but can find well-known registry keys.
There are also some changes to the bootstrap app to properly handle upgrades.
Finally, a few minor improvements to the Windows build to keep things tidier.
Diffstat (limited to 'Tools/msi/bundle/packagegroups/core.wxs')
| -rw-r--r-- | Tools/msi/bundle/packagegroups/core.wxs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Tools/msi/bundle/packagegroups/core.wxs b/Tools/msi/bundle/packagegroups/core.wxs index 9df6b79..a789585 100644 --- a/Tools/msi/bundle/packagegroups/core.wxs +++ b/Tools/msi/bundle/packagegroups/core.wxs @@ -9,6 +9,7 @@ ForcePerMachine="yes" InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip)"> <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" /> </MsiPackage> <MsiPackage Id="core_AllUsers_pdb" SourceFile="core_pdb.msi" @@ -17,6 +18,7 @@ ForcePerMachine="yes" InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_symbols"> <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" /> </MsiPackage> <MsiPackage Id="core_AllUsers_d" SourceFile="core_d.msi" @@ -25,6 +27,7 @@ ForcePerMachine="yes" InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_debug"> <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" /> </MsiPackage> <MsiPackage Id="core_JustForMe" @@ -34,6 +37,7 @@ ForcePerMachine="no" InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip)"> <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" /> </MsiPackage> <MsiPackage Id="core_JustForMe_pdb" SourceFile="core_pdb.msi" @@ -42,6 +46,7 @@ ForcePerMachine="no" InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_symbols"> <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" /> </MsiPackage> <MsiPackage Id="core_JustForMe_d" SourceFile="core_d.msi" @@ -50,6 +55,7 @@ ForcePerMachine="no" InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_debug"> <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" /> </MsiPackage> </PackageGroup> </Fragment> |