diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-11-17 00:32:22 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-11-17 00:32:22 (GMT) |
| commit | c851817aaa0b1b5e1de6eff7c3c238a49bc970c0 (patch) | |
| tree | ca278aceffd6439591263f3dc032080516f557a3 /Tools/nuget | |
| parent | 292dd1b2ad51285e793f23af4157251780c9a638 (diff) | |
| download | cpython-c851817aaa0b1b5e1de6eff7c3c238a49bc970c0.zip cpython-c851817aaa0b1b5e1de6eff7c3c238a49bc970c0.tar.gz cpython-c851817aaa0b1b5e1de6eff7c3c238a49bc970c0.tar.bz2 | |
Fixes incorrect path in nuget package build.
Diffstat (limited to 'Tools/nuget')
| -rw-r--r-- | 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 index 96f54dc..d1fc649 100644 --- 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> |