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

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 32038678f1ff284c541a606dbb2aa0d69fea0ec6..1130503c3d17c64b5dd5f6bf8efa75c15c9df23e 100644 (file)
--- 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 39fec01d70b1243dd86f02d3a8b5fc9ac5c851f4..09328bcc9c1e7a51f377af286231ad7a798d7207 100644 (file)
--- 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"