From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 12 Dec 2014 20:18:11 +0000 (-0800)
Subject: Removes use of ValueOrDefault function that is not always available on the buildbots.
X-Git-Tag: v3.5.0a1~329
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10e65856a38f888108f1063970b2fa3077af01f8;p=python

Removes use of ValueOrDefault function that is not always available on the buildbots.
---

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 32038678f1..1130503c3d 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -118,7 +118,8 @@ foreach (System.Diagnostics.Process p in System.Diagnostics.Process.GetProcesses
       </Code>
     </Task>
   </UsingTask>
-  <Target Name="KillPython" BeforeTargets="InitializeBuildStatus" Condition="$([msbuild]::ValueOrDefault($(KillPython), 'false'))">
+  
+  <Target Name="KillPython" BeforeTargets="InitializeBuildStatus" Condition="'$(KillPython)' == 'true'">
     <Message Text="Killing any running python.exe instances..." Importance="high" />
     <KillPython FileName="$(OutDir)python$(PyDebugExt).exe" />
   </Target>
diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 39fec01d70..09328bcc9c 100644
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -16,7 +16,7 @@ if "%1" == "x64" (
 call "%pcbuild%\env.bat" %vcvars_target%
 
 echo.Attempting to kill Pythons...
-msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform%
+msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform% /p:KillPython=true
 
 echo Deleting .pyc/.pyo files ...
 del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"