commit 190dbd9ba20610bfd19b2f3544ec9d9d3fd92b0b
author Steve Dower <steve.dower@microsoft.com> Sat Dec 03 11:18:53 2016 -0800
committer Steve Dower <steve.dower@microsoft.com> Sat Dec 03 11:18:53 2016 -0800
tree 1c1a16cc7207424cf8e1d4431f816537cb6fd2d4
parent 2d397dc44b6023aebdaf0fc44bca66752d3ffb03

Issue #28846: Various installer fixes

Tools/nuget/make_pkg.proj

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>