[Python-checkins] cpython (3.5): Fixes incorrect path in nuget package build.

Wed Nov 16 19:36:21 EST 2016

https://hg.python.org/cpython/rev/20f62e4a9c2f
changeset: 105165:20f62e4a9c2f
branch: 3.5
parent: 105154:b607f835f170
user: Steve Dower <steve.dower at microsoft.com>
date: Wed Nov 16 16:32:22 2016 -0800
summary:
 Fixes incorrect path in nuget package build.
files:
 Tools/nuget/make_pkg.proj | 3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj
--- a/Tools/nuget/make_pkg.proj
+++ b/Tools/nuget/make_pkg.proj
@@ -14,6 +14,7 @@
 <PropertyGroup>
 <Nuget Condition="$(Nuget) == ''">$(ExternalsDir)\windows-installer\nuget\nuget.exe</Nuget>
 <NuspecVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)</NuspecVersion>
+ <NuspecVersion Condition="$(ReleaseLevelName) != ''">$(NuspecVersion)-$(ReleaseLevelName)</NuspecVersion>
 <SignOutput>false</SignOutput>
 <TargetName>$(OutputName).$(NuspecVersion)</TargetName>
 <TargetExt>.nupkg</TargetExt>
@@ -23,7 +24,7 @@
 <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)"</CleanCommand>
 
 <PythonArguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\..\msi\make_zip.py"</PythonArguments>
- <PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)" -b "$(OutDir.TrimEnd('\'))\.."</PythonArguments>
+ <PythonArguments>$(PythonArguments) -t "$(IntermediateOutputPath)" -b "$(OutDir.TrimEnd('\'))"</PythonArguments>
 
 <PipArguments>"$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()"</PipArguments>
 <PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages)</PackageArguments>
-- 
Repository URL: https://hg.python.org/cpython
