diff options
| author |   Václav Slavík <vaclav@slavik.io> | 2020-09-14 21:30:15 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-09-14 20:30:15 +0100 |
| commit | 7c11a9accabe3720940f334eb1226bb7bb9179c7 (patch) | |
| tree | efcf1d9b26ef35ad4881358b49a0d71a8ddd4da7 /Tools | |
| parent | bpo-41646: Mention path-like objects support in the docs for shutil.copy() (G... (diff) | |
| download | cpython-7c11a9accabe3720940f334eb1226bb7bb9179c7.tar.gz cpython-7c11a9accabe3720940f334eb1226bb7bb9179c7.tar.bz2 cpython-7c11a9accabe3720940f334eb1226bb7bb9179c7.zip | |
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.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/nuget/python.nuspec | 2 | ||||
| -rw-r--r-- | Tools/nuget/pythonarm32.nuspec | 3 | ||||
| -rw-r--r-- | Tools/nuget/pythondaily.nuspec | 3 | ||||
| -rw-r--r-- | Tools/nuget/pythonx86.nuspec | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Tools/nuget/python.nuspec b/Tools/nuget/python.nuspec index 8f98e80891..2da5f2037e 100644 --- a/Tools/nuget/python.nuspec +++ b/Tools/nuget/python.nuspec @@ -13,6 +13,6 @@ </metadata> <files> <file src="**\*" exclude="python.props" target="tools" /> - <file src="python.props" target="build\native" /> + <file src="python.props" target="build\native\python.props" /> </files> </package> diff --git a/Tools/nuget/pythonarm32.nuspec b/Tools/nuget/pythonarm32.nuspec index 273d79a031..2d197931ed 100644 --- a/Tools/nuget/pythonarm32.nuspec +++ b/Tools/nuget/pythonarm32.nuspec @@ -14,6 +14,7 @@ </metadata> <files> <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> </package> diff --git a/Tools/nuget/pythondaily.nuspec b/Tools/nuget/pythondaily.nuspec index 5cf55806dd..7df1983f42 100644 --- a/Tools/nuget/pythondaily.nuspec +++ b/Tools/nuget/pythondaily.nuspec @@ -13,6 +13,7 @@ </metadata> <files> <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> </package> diff --git a/Tools/nuget/pythonx86.nuspec b/Tools/nuget/pythonx86.nuspec index 27ef67e7f5..ea878ba0bf 100644 --- a/Tools/nuget/pythonx86.nuspec +++ b/Tools/nuget/pythonx86.nuspec @@ -13,6 +13,7 @@ </metadata> <files> <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> </package> |