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.
diff --git a/Misc/NEWS.d/next/Windows/2020-09-11-17-59-33.bpo-41744.e_ugDQ.rst b/Misc/NEWS.d/next/Windows/2020-09-11-17-59-33.bpo-41744.e_ugDQ.rst
new file mode 100644
index 0000000..6106d66
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2020-09-11-17-59-33.bpo-41744.e_ugDQ.rst
@@ -0,0 +1 @@
+Fixes automatic import of props file when using the Nuget package.
\ No newline at end of file
diff --git a/Tools/nuget/python.nuspec b/Tools/nuget/python.nuspec
index 8f98e80..2da5f20 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 273d79a..2d19793 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 5cf5580..7df1983 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 27ef67e..ea878ba 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>