changeset:   105165:20f62e4a9c2f
branch:      3.5
parent:      105154:b607f835f170
user:        Steve Dower <steve.dower@microsoft.com>
date:        Wed Nov 16 16:32:22 2016 -0800
files:       Tools/nuget/make_pkg.proj
description:
Fixes incorrect path in nuget package build.


diff -r b607f835f170 -r 20f62e4a9c2f Tools/nuget/make_pkg.proj
--- a/Tools/nuget/make_pkg.proj	Wed Nov 16 16:12:34 2016 +0200
+++ b/Tools/nuget/make_pkg.proj	Wed Nov 16 16:32:22 2016 -0800
@@ -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>