diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-11-29 23:08:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 23:08:33 (GMT) |
| commit | 5a6d9ed700ecc6984387e0533b11d81692c40469 (patch) | |
| tree | 3942d2620beda927dc0d7b14f198eae17e22e3fe /PCbuild | |
| parent | 32f1491a9770b7f2989507ecf8f13ef35dd95b0b (diff) | |
| download | cpython-5a6d9ed700ecc6984387e0533b11d81692c40469.zip cpython-5a6d9ed700ecc6984387e0533b11d81692c40469.tar.gz cpython-5a6d9ed700ecc6984387e0533b11d81692c40469.tar.bz2 | |
bpo-45931: Prevent Directory.Build.props/targets from leaking from directories above the repo when building on Windows (GH-29854)
(cherry picked from commit 734ed3538314c9651ae64d5e2e0e98aae3aec17b)
Co-authored-by: David Federman <david.federman@outlook.com>
Diffstat (limited to 'PCbuild')
| -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 42c67de..2ef290c 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> |