diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-11-23 02:20:37 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-11-23 02:20:37 (GMT) |
| commit | 9450f6b437987bd9cc07d53c352ab5abaadd8c51 (patch) | |
| tree | b9765379d3803cf28e2a35f2d4a2a00fcc4e659c | |
| parent | da43ee4316a508d031c2c68aeb0f7797294d09ff (diff) | |
| parent | 21cecb904f80a53a23dc972c95cb0c4c997afbe1 (diff) | |
| download | cpython-9450f6b437987bd9cc07d53c352ab5abaadd8c51.zip cpython-9450f6b437987bd9cc07d53c352ab5abaadd8c51.tar.gz cpython-9450f6b437987bd9cc07d53c352ab5abaadd8c51.tar.bz2 | |
Merge from 3.5
| -rw-r--r-- | Tools/msi/bundle/bundle.targets | 2 | ||||
| -rw-r--r-- | Tools/msi/uploadrelease.proj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index 57ca1dc..aeeff3b 100644 --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -18,7 +18,7 @@ <!-- See Tools/msi/buildrelease.bat for help on configuring the download URL --> <DownloadUrl Condition="'$(DownloadUrl)' == '' and '$(DownloadUrlBase)' != ''">$(DownloadUrlBase.TrimEnd(`/`))/{version}/{arch}{releasename}/{msi}</DownloadUrl> - <DefineConstants Condition="'$(DownloadUrl)' != ''">$(DefineConstants);DownloadUrl=$(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseName)`).Replace(`{msi}`, `{2}`))</DefineConstants> + <DefineConstants Condition="'$(DownloadUrl)' != ''">$(DefineConstants);DownloadUrl=$(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseLevelName)`).Replace(`{msi}`, `{2}`))</DefineConstants> <DefineConstants Condition="'$(DownloadUrl)' == ''">$(DefineConstants);DownloadUrl={2}</DefineConstants> </PropertyGroup> diff --git a/Tools/msi/uploadrelease.proj b/Tools/msi/uploadrelease.proj index ec4ede5..0d472de 100644 --- a/Tools/msi/uploadrelease.proj +++ b/Tools/msi/uploadrelease.proj @@ -16,7 +16,7 @@ <PropertyGroup> <EXETarget>$(DownloadUrlBase.TrimEnd(`/`))/$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)</EXETarget> - <MSITarget>$(DownloadUrl.TrimEnd(`/`))</MSITarget> + <MSITarget>$(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseLevelName)`).Replace(`{msi}`, ``).TrimEnd(`/`))</MSITarget> </PropertyGroup> <ItemGroup> |