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.

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

bpo-41744: Package NuGet python.props with correct name to be used #22154

Merged
merged 2 commits into from
Sep 14, 2020
Merged

bpo-41744: Package NuGet python.props with correct name to be used #22154

merged 2 commits into from
Sep 14, 2020

Conversation

vslavik
Copy link
Contributor

@vslavik vslavik commented Sep 8, 2020

NuGet automatically includes .props file from the build directory in the target using the package, but only if the file has the correct name: it must be $(id).props. This means that Python's support for this only works correctly in the python nuget packages, but not in pythonx86 and others, because the file is copied as python.props there too.

This PR fixes the problem by renaming the props file appropriately.

https://bugs.python.org/issue41744

NuGet automatically includes .props file from the build directory in the
target using the package, but only if the .props file has the correct
name: it must be $(id).props

Rename python.props correspondingly in all the nuspec variants. Also
keep python.props as it were for backward compatibility.
@zooba
Copy link
Member

zooba commented Sep 10, 2020

Thanks! Just need a NEWS file (click Details next to the failed check for the helper app). Something like "Fixes automatic import of props file when using the Nuget package" would be good.

@zooba zooba merged commit 7c11a9a into python:master Sep 14, 2020
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 14, 2020
…ythonGH-22154)

NuGet automatically includes .props file from the build directory in the
target using the package, but only if the .props file has the correct
name: it must be $(id).props

Rename python.props correspondingly in all the nuspec variants. Also
keep python.props as it were for backward compatibility.
(cherry picked from commit 7c11a9a)

Co-authored-by: Václav Slavík <vaclav@slavik.io>
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 14, 2020
@bedevere-bot
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 14, 2020
…ythonGH-22154)

NuGet automatically includes .props file from the build directory in the
target using the package, but only if the .props file has the correct
name: it must be $(id).props

Rename python.props correspondingly in all the nuspec variants. Also
keep python.props as it were for backward compatibility.
(cherry picked from commit 7c11a9a)

Co-authored-by: Václav Slavík <vaclav@slavik.io>
@bedevere-bot
Copy link

GH-22246 is a backport of this pull request to the 3.8 branch.

miss-islington added a commit that referenced this pull request Sep 14, 2020
…H-22154)

NuGet automatically includes .props file from the build directory in the
target using the package, but only if the .props file has the correct
name: it must be $(id).props

Rename python.props correspondingly in all the nuspec variants. Also
keep python.props as it were for backward compatibility.
(cherry picked from commit 7c11a9a)

Co-authored-by: Václav Slavík <vaclav@slavik.io>
xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
…ythonGH-22154)

NuGet automatically includes .props file from the build directory in the
target using the package, but only if the .props file has the correct
name: it must be $(id).props

Rename python.props correspondingly in all the nuspec variants. Also
keep python.props as it were for backward compatibility.
methane pushed a commit that referenced this pull request Oct 21, 2020
…H-22154)

NuGet automatically includes .props file from the build directory in the
target using the package, but only if the .props file has the correct
name: it must be $(id).props

Rename python.props correspondingly in all the nuspec variants. Also
keep python.props as it were for backward compatibility.
(cherry picked from commit 7c11a9a)

Co-authored-by: Václav Slavík <vaclav@slavik.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants