diff options
| author | David Federman <david.federman@outlook.com> | 2021-11-29 22:40:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 22:40:34 (GMT) |
| commit | 734ed3538314c9651ae64d5e2e0e98aae3aec17b (patch) | |
| tree | 13527b6e2e2832c752e94d6e2f6c9201decb405b | |
| parent | 02b5ac6091ada0c2df99c4e1eae37ddccbcd91f0 (diff) | |
| download | cpython-734ed3538314c9651ae64d5e2e0e98aae3aec17b.zip cpython-734ed3538314c9651ae64d5e2e0e98aae3aec17b.tar.gz cpython-734ed3538314c9651ae64d5e2e0e98aae3aec17b.tar.bz2 | |
bpo-45931: Prevent Directory.Build.props/targets from leaking from directories above the repo when building on Windows (GH-29854)
| -rw-r--r-- | PCbuild/Directory.Build.props | 4 | ||||
| -rw-r--r-- | PCbuild/Directory.Build.targets | 4 | ||||
| -rw-r--r-- | PCbuild/python.props | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/PCbuild/Directory.Build.props b/PCbuild/Directory.Build.props new file mode 100644 index 0000000..3d2fe55 --- /dev/null +++ b/PCbuild/Directory.Build.props @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <!-- This is intentionally left blank but exists to avoid being imported from some directory above --> +</Project> diff --git a/PCbuild/Directory.Build.targets b/PCbuild/Directory.Build.targets new file mode 100644 index 0000000..3d2fe55 --- /dev/null +++ b/PCbuild/Directory.Build.targets @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <!-- This is intentionally left blank but exists to avoid being imported from some directory above --> +</Project> diff --git a/PCbuild/python.props b/PCbuild/python.props index b739e41..c608fb9 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -11,8 +11,8 @@ We set BasePlatformToolset for ICC's benefit, it's otherwise ignored. --> - <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '17.0' or '$(VisualStudioVersion)' == '17.0')">v142</BasePlatformToolset> - <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '16.0' or '$(VisualStudioVersion)' == '16.0')">v142</BasePlatformToolset> + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VisualStudioVersion)' == '17.0'">v142</BasePlatformToolset> + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VisualStudioVersion)' == '16.0'">v142</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')">v141</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120</BasePlatformToolset> |