bpo-41744: Package python.props with correct name in NuGet package (GH-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 7c11a9acca)

Co-authored-by: Václav Slavík <vaclav@slavik.io>
This commit is contained in:
Miss Skeleton (bot) 2020-10-20 22:15:18 -07:00 committed by GitHub
parent a1296ed60b
commit d0bfce992c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions

View file

@ -0,0 +1 @@
Fixes automatic import of props file when using the Nuget package.

View file

@ -13,6 +13,6 @@
</metadata> </metadata>
<files> <files>
<file src="**\*" exclude="python.props" target="tools" /> <file src="**\*" exclude="python.props" target="tools" />
<file src="python.props" target="build\native" /> <file src="python.props" target="build\native\python.props" />
</files> </files>
</package> </package>

View file

@ -14,6 +14,7 @@
</metadata> </metadata>
<files> <files>
<file src="**\*" exclude="python.props" target="tools" /> <file src="**\*" exclude="python.props" target="tools" />
<file src="python.props" target="build\native" /> <file src="python.props" target="build\native\python.props" />
<file src="python.props" target="build\native\pythonarm32.props" />
</files> </files>
</package> </package>

View file

@ -13,6 +13,7 @@
</metadata> </metadata>
<files> <files>
<file src="**\*" exclude="python.props" target="tools" /> <file src="**\*" exclude="python.props" target="tools" />
<file src="python.props" target="build\native" /> <file src="python.props" target="build\native\python.props" />
<file src="python.props" target="build\native\pythondaily.props" />
</files> </files>
</package> </package>

View file

@ -13,6 +13,7 @@
</metadata> </metadata>
<files> <files>
<file src="**\*" exclude="python.props" target="tools" /> <file src="**\*" exclude="python.props" target="tools" />
<file src="python.props" target="build\native" /> <file src="python.props" target="build\native\python.props" />
<file src="python.props" target="build\native\pythonx86.props" />
</files> </files>
</package> </package>