diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 19:18:53 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-12-03 19:18:53 (GMT) |
| commit | 190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b (patch) | |
| tree | 1c1a16cc7207424cf8e1d4431f816537cb6fd2d4 /Tools/nuget | |
| parent | 2d397dc44b6023aebdaf0fc44bca66752d3ffb03 (diff) | |
| download | cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.zip cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.tar.gz cpython-190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b.tar.bz2 | |
Issue #28846: Various installer fixes
Diffstat (limited to 'Tools/nuget')
| -rw-r--r-- | Tools/nuget/make_pkg.proj | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj index d1fc649..81b84f9 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -18,13 +18,12 @@ <SignOutput>false</SignOutput> <TargetName>$(OutputName).$(NuspecVersion)</TargetName> <TargetExt>.nupkg</TargetExt> - <TargetPath>$(OutputPath)\$(TargetName)$(TargetExt)</TargetPath> <IntermediateOutputPath>$(IntermediateOutputPath)\nuget_$(ArchName)</IntermediateOutputPath> <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 "$(BuildPath.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> |