diff options
| -rw-r--r-- | Misc/NEWS.d/next/Build/2020-04-03-17-54-33.bpo-40158.MWUTs4.rst | 1 | ||||
| -rw-r--r-- | PC/layout/support/props.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Build/2020-04-03-17-54-33.bpo-40158.MWUTs4.rst b/Misc/NEWS.d/next/Build/2020-04-03-17-54-33.bpo-40158.MWUTs4.rst new file mode 100644 index 0000000..a81548c --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-04-03-17-54-33.bpo-40158.MWUTs4.rst @@ -0,0 +1 @@ +Fix CPython MSBuild Properties in NuGet Package (build/native/python.props)
\ No newline at end of file diff --git a/PC/layout/support/props.py b/PC/layout/support/props.py index b1560b5..1eb9b7c 100644 --- a/PC/layout/support/props.py +++ b/PC/layout/support/props.py @@ -29,8 +29,7 @@ PROPS_DATA["PYTHON_TARGET"] = "_GetPythonRuntimeFilesDependsOn{}{}_{}".format( PROPS_TEMPLATE = r"""<?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="$(Platform) == '{PYTHON_PLATFORM}'"> - <PythonHome Condition="$(Configuration) == 'Debug'">$([msbuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), "python_d.exe")</PythonHome> - <PythonHome Condition="$(PythonHome) == ''">$([msbuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), "python.exe")</PythonHome> + <PythonHome Condition="$(PythonHome) == ''">$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)\..\..\tools"))</PythonHome> <PythonInclude>$(PythonHome)\include</PythonInclude> <PythonLibs>$(PythonHome)\libs</PythonLibs> <PythonTag>{PYTHON_TAG}</PythonTag> |