Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 10e6585

Browse files
committed
Removes use of ValueOrDefault function that is not always available on the buildbots.
1 parent 5632aff commit 10e6585

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

PCbuild/pyproject.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ foreach (System.Diagnostics.Process p in System.Diagnostics.Process.GetProcesses
118118
</Code>
119119
</Task>
120120
</UsingTask>
121-
<Target Name="KillPython" BeforeTargets="InitializeBuildStatus" Condition="$([msbuild]::ValueOrDefault($(KillPython), 'false'))">
121+
122+
<Target Name="KillPython" BeforeTargets="InitializeBuildStatus" Condition="'$(KillPython)' == 'true'">
122123
<Message Text="Killing any running python.exe instances..." Importance="high" />
123124
<KillPython FileName="$(OutDir)python$(PyDebugExt).exe" />
124125
</Target>

Tools/buildbot/clean.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if "%1" == "x64" (
1616
call "%pcbuild%\env.bat" %vcvars_target%
1717

1818
echo.Attempting to kill Pythons...
19-
msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform%
19+
msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform% /p:KillPython=true
2020

2121
echo Deleting .pyc/.pyo files ...
2222
del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"

0 commit comments

Comments
 (0)