[Python-checkins] bpo-45931: Prevent Directory.Build.props/targets from leaking from directories above the repo when building on Windows (GH-29854)

zooba webhook-mailer at python.org
Mon Nov 29 17:40:42 EST 2021


https://github.com/python/cpython/commit/734ed3538314c9651ae64d5e2e0e98aae3aec17b
commit: 734ed3538314c9651ae64d5e2e0e98aae3aec17b
branch: main
author: David Federman <david.federman at outlook.com>
committer: zooba <steve.dower at microsoft.com>
date: 2021-11-29T22:40:34Z
summary:

bpo-45931: Prevent Directory.Build.props/targets from leaking from directories above the repo when building on Windows (GH-29854)

files:
A PCbuild/Directory.Build.props
A PCbuild/Directory.Build.targets
M PCbuild/python.props

diff --git a/PCbuild/Directory.Build.props b/PCbuild/Directory.Build.props
new file mode 100644
index 0000000000000..3d2fe55078450
--- /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 0000000000000..3d2fe55078450
--- /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 b739e417fbaa5..c608fb9ee7187 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>



More information about the Python-checkins mailing list