Issue #23612: Fixes upgrade code and version for Windows installer.

diff --git a/Tools/msi/bundle/Default.thm b/Tools/msi/bundle/Default.thm
index 3d7523a04548f0bd055e6a7f484adf2d10724a6f..d165e2b515aeb38ddcdaaa9aced7260d160c51be 100644 (file)
--- a/Tools/msi/bundle/Default.thm
+++ b/Tools/msi/bundle/Default.thm
@@ -115,7 +115,7 @@
         <Image X="0" Y="0" Width="162" Height="352" ImageFile="SideBar.png"/>
 
         <Hypertext Name="FailureLogFileLink" X="185" Y="71" Width="-11" Height="60" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-        <Hypertext Name="FailureMessageText" X="185" Y="-100" Width="-11" Height="34" FontId="3" TabStop="yes" HideWhenDisabled="yes">Failure Message</Hypertext>
+        <Hypertext Name="FailureMessageText" X="185" Y="-100" Width="-11" Height="60" FontId="3" TabStop="yes" HideWhenDisabled="yes"></Hypertext>
         <Text Name="FailureRestartText" X="185" Y="-40" Width="-11" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
         <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
         <Button Name="FailureCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.CloseButton)</Button>

diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
index 4892ebb8387ba094abbe4770a4faa9a832039959..ef9ed13f5860c5cc00e39cd64dd298d199077496 100644 (file)
--- a/Tools/msi/bundle/bundle.wxs
+++ b/Tools/msi/bundle/bundle.wxs
@@ -2,11 +2,11 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
   <Bundle Name="!(loc.FullProductName)"
-          UpgradeCode="$(var.UpgradeCode)"
+          UpgradeCode="$(var.CoreUpgradeCode)"
           Version="$(var.Version)"
           IconSourceFile="bundle.ico"
           Manufacturer="!(loc.Manufacturer)"
-          UpdateUrl="http://www.python.org/"
+          AboutUrl="http://www.python.org/"
           DisableModify="button"
           Compressed="no">
     <BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)">

diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index cbaa6b145611f8a1cc439f75bc4082075c418815..9fa80f3684e7cfbd055f8cddf14d8e59bcb604bd 100644 (file)
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -62,7 +62,7 @@
         <Bitness Condition="$(Platform) == 'x64'">64-bit</Bitness>
         <DefineConstants>
             $(DefineConstants);
-            Version=$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber).$(RevisionNumber);
+            Version=$(MajorVersionNumber).$(MinorVersionNumber).$(Field3Value).0;
             ShortVersion=$(MajorVersionNumber).$(MinorVersionNumber);
             LongVersion=$(PythonVersion);
             MajorVersionNumber=$(MajorVersionNumber);
@@ -142,7 +142,7 @@
     </ItemGroup>
     <Target Name="_GenerateGuids" AfterTargets="PrepareForBuild">
         <PropertyGroup>
-            <_Uuids>@(_Uuid->'("%(Identity)", "%(Uri)")',',')</_Uuids>
+            <_Uuids>@(_Uuid->'("%(Identity)", "$(MajorVersionNumber).$(MinorVersionNumber)/%(Uri)")',',')</_Uuids>
             <_GenerateCommand>import uuid; print('\n'.join('{}={}'.format(i, uuid.uuid5(uuid.UUID('c8d9733e-a70c-43ff-ab0c-e26456f11083'), '$(ReleaseUri)' + j)) for i,j in [$(_Uuids.Replace(`"`,`'`))]))</_GenerateCommand>
         </PropertyGroup>