commit 328612353266d86c248950a910efa869c8c9c087
author Steve Dower <steve.dower@microsoft.com> Thu Mar 16 10:19:18 2017 -0700
committer GitHub <noreply@github.com> Thu Mar 16 10:19:18 2017 -0700
tree b62fcf92f18b05cff568bc16c5b887a81f8e1d8f
parent bd583ef9857d99f9145ad0bb2c4424cc0baa63fc

Takes vcruntime140.dll from the correct source. (#679)

Tools/nuget/make_pkg.proj

diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj
index d7e932c..464ef04 100644
--- a/Tools/nuget/make_pkg.proj
+++ b/Tools/nuget/make_pkg.proj
@@ -34,9 +34,8 @@
         <NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments>
         <NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments>
         
-        <Environment>setlocal
-set DOC_FILENAME=python$(PythonVersion).chm
-set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment>
+        <Environment>set DOC_FILENAME=python$(PythonVersion).chm</Environment>
+        <Environment Condition="Exists($(CRTRedist))">$(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform)</Environment>
     </PropertyGroup>
 
     <Target Name="_NugetMissing" BeforeTargets="_Build" Condition="!Exists($(Nuget))">
@@ -45,8 +44,7 @@
 
     <Target Name="_Build">
         <Exec Command="$(CleanCommand)" />
-        <Exec Command="$(Environment)
-$(PythonArguments)" />
+        <Exec Command="setlocal%0D%0A$(Environment)%0D%0A$(PythonArguments)" />
         <Exec Command="$(PipArguments)" />
         <Exec Command="$(PackageArguments)" Condition="$(PackageArguments) != ''" />
         <Exec Command="$(NugetArguments)" />