diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-03-08 22:29:39 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-08 22:29:39 (GMT) |
| commit | c49de355850dd4c68a1a0b1f2aa19869d20d62fe (patch) | |
| tree | 9172eef1936e25a6d665ff9688f097ed28624ba3 /Tools/msi/msi.props | |
| parent | 1872f93fd128161a7ebebf1a479dc31a6b5eb434 (diff) | |
| download | cpython-c49de355850dd4c68a1a0b1f2aa19869d20d62fe.zip cpython-c49de355850dd4c68a1a0b1f2aa19869d20d62fe.tar.gz cpython-c49de355850dd4c68a1a0b1f2aa19869d20d62fe.tar.bz2 | |
Issue #23612: Fixes upgrade code and version for Windows installer.
Diffstat (limited to 'Tools/msi/msi.props')
| -rw-r--r-- | Tools/msi/msi.props | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index cbaa6b1..9fa80f3 100644 --- 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> |