Skip to content

Commit 7c11a9a

Browse files
authored
bpo-41744: Package python.props with correct name in NuGet package (pythonGH-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.
1 parent 8f2b991 commit 7c11a9a

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixes automatic import of props file when using the Nuget package.

Tools/nuget/python.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
</metadata>
1414
<files>
1515
<file src="**\*" exclude="python.props" target="tools" />
16-
<file src="python.props" target="build\native" />
16+
<file src="python.props" target="build\native\python.props" />
1717
</files>
1818
</package>

Tools/nuget/pythonarm32.nuspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</metadata>
1515
<files>
1616
<file src="**\*" exclude="python.props" target="tools" />
17-
<file src="python.props" target="build\native" />
17+
<file src="python.props" target="build\native\python.props" />
18+
<file src="python.props" target="build\native\pythonarm32.props" />
1819
</files>
1920
</package>

Tools/nuget/pythondaily.nuspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
</metadata>
1414
<files>
1515
<file src="**\*" exclude="python.props" target="tools" />
16-
<file src="python.props" target="build\native" />
16+
<file src="python.props" target="build\native\python.props" />
17+
<file src="python.props" target="build\native\pythondaily.props" />
1718
</files>
1819
</package>

Tools/nuget/pythonx86.nuspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
</metadata>
1414
<files>
1515
<file src="**\*" exclude="python.props" target="tools" />
16-
<file src="python.props" target="build\native" />
16+
<file src="python.props" target="build\native\python.props" />
17+
<file src="python.props" target="build\native\pythonx86.props" />
1718
</files>
1819
</package>

0 commit comments

Comments
 (0)