Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-45931: Prevent Directory.Build.props/targets from leaking from directories above the repo #29854

Merged
merged 1 commit into from Nov 29, 2021
Merged

bpo-45931: Prevent Directory.Build.props/targets from leaking from directories above the repo #29854

merged 1 commit into from Nov 29, 2021

Conversation

dfederm
Copy link
Contributor

@dfederm dfederm commented Nov 29, 2021 •
edited

Prevent Directory.Build.props/targets from leaking from directories above the repo.

Docs on Directory.Build.props/targets: https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2022

https://bugs.python.org/issue45931

@dfederm dfederm requested a review from a team as a code owner November 29, 2021 19:49
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@dfederm

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

dfederm
dfederm commented Nov 29, 2021
View reviewed changes
PCbuild/python.props
<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>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the conditions on MSBuildToolsVersion since as of v16 the MSBuildToolsVersion is always "Current". The VisualStudioVersion does still increase every major version though.

@zooba zooba merged commit 734ed35 into python:main Nov 29, 2021
@miss-islington
Copy link
Contributor

Thanks @dfederm for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 29, 2021
@dfederm @miss-islington
bpo-45931: Prevent Directory.Build.props/targets from leaking from di…
5c216af 
…rectories above the repo when building on Windows (pythonGH-29854)

(cherry picked from commit 734ed35)

Co-authored-by: David Federman <david.federman@outlook.com>
@bedevere-bot
Copy link

GH-29855 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Nov 29, 2021
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 29, 2021
@dfederm @miss-islington
bpo-45931: Prevent Directory.Build.props/targets from leaking from di…
08eeebb 
…rectories above the repo when building on Windows (pythonGH-29854)

(cherry picked from commit 734ed35)

Co-authored-by: David Federman <david.federman@outlook.com>
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Nov 29, 2021
@bedevere-bot
Copy link

GH-29856 is a backport of this pull request to the 3.9 branch.

miss-islington added a commit that referenced this pull request Nov 29, 2021
@miss-islington @dfederm
bpo-45931: Prevent Directory.Build.props/targets from leaking from di…
5a6d9ed 
…rectories above the repo when building on Windows (GH-29854)

(cherry picked from commit 734ed35)

Co-authored-by: David Federman <david.federman@outlook.com>
miss-islington added a commit that referenced this pull request Nov 29, 2021
@miss-islington @dfederm
bpo-45931: Prevent Directory.Build.props/targets from leaking from di…
b91805e 
…rectories above the repo when building on Windows (GH-29854)

(cherry picked from commit 734ed35)

Co-authored-by: David Federman <david.federman@outlook.com>
@dfederm dfederm deleted the fix-issue-45931 branch November 30, 2021 00:15
shihai1991 added a commit to shihai1991/cpython that referenced this pull request Dec 1, 2021
@shihai1991
Merge branch 'main' into bpo_44133
6edb6f5 
* main: (21 commits)
  bpo-45876:  Have stdev() also use decimal specific square root. (pythonGH-29869)
  bpo-45876:  Correctly rounded stdev() and pstdev() for the Decimal case (pythonGH-29828)
  bpo-45711: Change exc_info related APIs to derive type and traceback from the exception instance (pythonGH-29780)
  bpo-30533:Add function inspect.getmembers_static that does not call properties or dynamic properties. (python#20911)
  bpo-45476: Disallow using asdl_seq_GET() as l-value (pythonGH-29866)
  bpo-45476: Add _Py_RVALUE() macro (pythonGH-29860)
  bpo-33381: [doc] strftime's %f option may pad zeros on the left or the right (pythonGH-29801)
  Fix EncodingWarning in Tools/freeze/test/freeze.py (pythonGH-29742)
  no-issue: remove unused import from test_graphlib.py (pythonGH-29853)
  bpo-45931: Prevent Directory.Build.props/targets from leaking from directories above the repo when building on Windows (pythonGH-29854)
  bpo-45653: fix test_embed on windows (pythonGH-29814)
  bpo-45917: Add math.exp2() method - return 2 raised to the power of x (pythonGH-29829)
  bpo-43905: Expand dataclasses.astuple() and asdict() docs (pythonGH-26154)
  bpo-44391: Remove unused argument from a varargs call. (pythonGH-29843)
  bpo-45881: configure --with-freeze-module --with-build-python (pythonGH-29835)
  bpo-45847: PY_STDLIB_MOD_SIMPLE now checks py_stdlib_not_available (pythonGH-29844)
  bpo-45828: Use unraisable exceptions within sqlite3 callbacks (FH-29591)
  bpo-40280: Emscripten systems use .wasm suffix by default (pythonGH-29842)
  bpo-45723: Sort the grand AC_CHECK_HEADERS check (pythonGH-29846)
  bpo-45847: Make socket module conditional (pythonGH-29769)
  ...
shihai1991 added a commit to shihai1991/cpython that referenced this pull request Dec 1, 2021
@shihai1991
Merge branch 'main' into bpo_44133
b71b124 
* main: (21 commits)
  bpo-45876:  Have stdev() also use decimal specific square root. (pythonGH-29869)
  bpo-45876:  Correctly rounded stdev() and pstdev() for the Decimal case (pythonGH-29828)
  bpo-45711: Change exc_info related APIs to derive type and traceback from the exception instance (pythonGH-29780)
  bpo-30533:Add function inspect.getmembers_static that does not call properties or dynamic properties. (python#20911)
  bpo-45476: Disallow using asdl_seq_GET() as l-value (pythonGH-29866)
  bpo-45476: Add _Py_RVALUE() macro (pythonGH-29860)
  bpo-33381: [doc] strftime's %f option may pad zeros on the left or the right (pythonGH-29801)
  Fix EncodingWarning in Tools/freeze/test/freeze.py (pythonGH-29742)
  no-issue: remove unused import from test_graphlib.py (pythonGH-29853)
  bpo-45931: Prevent Directory.Build.props/targets from leaking from directories above the repo when building on Windows (pythonGH-29854)
  bpo-45653: fix test_embed on windows (pythonGH-29814)
  bpo-45917: Add math.exp2() method - return 2 raised to the power of x (pythonGH-29829)
  bpo-43905: Expand dataclasses.astuple() and asdict() docs (pythonGH-26154)
  bpo-44391: Remove unused argument from a varargs call. (pythonGH-29843)
  bpo-45881: configure --with-freeze-module --with-build-python (pythonGH-29835)
  bpo-45847: PY_STDLIB_MOD_SIMPLE now checks py_stdlib_not_available (pythonGH-29844)
  bpo-45828: Use unraisable exceptions within sqlite3 callbacks (FH-29591)
  bpo-40280: Emscripten systems use .wasm suffix by default (pythonGH-29842)
  bpo-45723: Sort the grand AC_CHECK_HEADERS check (pythonGH-29846)
  bpo-45847: Make socket module conditional (pythonGH-29769)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
OS-windows skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dfederm @the-knights-who-say-ni @miss-islington @bedevere-bot @zooba