Merge pull request #2443 from hanagasira/nuget_python_fix

nuget python package error fix
premake · Mar 12, 2025 · 6385739 · 6385739
2 parents 62b9bc7 + 116c515
commit 6385739
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/modules/vstudio/tests/vc2010/test_ensure_nuget_imports.lua b/modules/vstudio/tests/vc2010/test_ensure_nuget_imports.lua
@@ -44,7 +44,7 @@
 
 if http ~= nil and _OPTIONS["test-all"] then
 	function suite.structureIsCorrect()
-		nuget { "boost:1.59.0-b1", "sdl2.v140:2.0.3", "sdl2.v140.redist:2.0.3", "WinPixEventRuntime:1.0.220810001", "Microsoft.Direct3D.D3D12:1.608.2" }
+		nuget { "boost:1.59.0-b1", "sdl2.v140:2.0.3", "sdl2.v140.redist:2.0.3", "WinPixEventRuntime:1.0.220810001", "Microsoft.Direct3D.D3D12:1.608.2", "python:3.13.2" }
 		prepare()
 		test.capture [[
 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -57,6 +57,7 @@ if http ~= nil and _OPTIONS["test-all"] then
 	<Error Condition="!Exists('packages\WinPixEventRuntime.1.0.220810001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\WinPixEventRuntime.1.0.220810001\build\WinPixEventRuntime.targets'))" />
 	<Error Condition="!Exists('packages\Microsoft.Direct3D.D3D12.1.608.2\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Direct3D.D3D12.1.608.2\build\native\Microsoft.Direct3D.D3D12.props'))" />
 	<Error Condition="!Exists('packages\Microsoft.Direct3D.D3D12.1.608.2\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Direct3D.D3D12.1.608.2\build\native\Microsoft.Direct3D.D3D12.targets'))" />
+	<Error Condition="!Exists('packages\python.3.13.2\build\native\python.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\python.3.13.2\build\native\python.props'))" />
 </Target>
 		]]
 	end

diff --git a/modules/vstudio/tests/vc2010/test_extension_settings.lua b/modules/vstudio/tests/vc2010/test_extension_settings.lua
@@ -34,11 +34,12 @@
 
 if http ~= nil and _OPTIONS["test-all"] then
 	function suite.importOnlyNugetPackagesWithProps()
-		nuget { "boost:1.59.0-b1", "sdl2.v140:2.0.3", "sdl2.v140.redist:2.0.3", "WinPixEventRuntime:1.0.220810001", "Microsoft.Direct3D.D3D12:1.608.2" }
+		nuget { "boost:1.59.0-b1", "sdl2.v140:2.0.3", "sdl2.v140.redist:2.0.3", "WinPixEventRuntime:1.0.220810001", "Microsoft.Direct3D.D3D12:1.608.2", "python:3.13.2" }
 		prepare()
 	test.capture [[
 <ImportGroup Label="ExtensionSettings">
 	<Import Project="packages\Microsoft.Direct3D.D3D12.1.608.2\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('packages\Microsoft.Direct3D.D3D12.1.608.2\build\native\Microsoft.Direct3D.D3D12.props')" />
+	<Import Project="packages\python.3.13.2\build\native\python.props" Condition="Exists('packages\python.3.13.2\build\native\python.props')" />
 </ImportGroup>
 		]]
 	end

diff --git a/modules/vstudio/tests/vc2010/test_extension_targets.lua b/modules/vstudio/tests/vc2010/test_extension_targets.lua
@@ -65,7 +65,7 @@
 
 if http ~= nil and _OPTIONS["test-all"] then
 	function suite.addsImport_onEachNuGetPackage()
-		nuget { "boost:1.59.0-b1", "sdl2.v140:2.0.3", "sdl2.v140.redist:2.0.3", "WinPixEventRuntime:1.0.220810001", "Microsoft.Direct3D.D3D12:1.608.2" }
+		nuget { "boost:1.59.0-b1", "sdl2.v140:2.0.3", "sdl2.v140.redist:2.0.3", "WinPixEventRuntime:1.0.220810001", "Microsoft.Direct3D.D3D12:1.608.2", "python:3.13.2" }
 		prepare()
 		test.capture [[
 <ImportGroup Label="ExtensionTargets">

diff --git a/modules/vstudio/tests/vc2010/test_nuget_packages_config.lua b/modules/vstudio/tests/vc2010/test_nuget_packages_config.lua
@@ -44,7 +44,7 @@
 --
 
 	function suite.structureIsCorrect()
-		nuget { "boost:1.59.0-b1", "sdl2.v140:2.0.3", "sdl2.v140.redist:2.0.3", "WinPixEventRuntime:1.0.220810001", "Microsoft.Direct3D.D3D12:1.608.2" }
+		nuget { "boost:1.59.0-b1", "sdl2.v140:2.0.3", "sdl2.v140.redist:2.0.3", "WinPixEventRuntime:1.0.220810001", "Microsoft.Direct3D.D3D12:1.608.2", "python:3.13.2" }
 		prepare()
 		test.capture [[
 <?xml version="1.0" encoding="utf-8"?>
@@ -54,6 +54,7 @@
 	<package id="sdl2.v140.redist" version="2.0.3" targetFramework="native" />
 	<package id="WinPixEventRuntime" version="1.0.220810001" targetFramework="native" />
 	<package id="Microsoft.Direct3D.D3D12" version="1.608.2" targetFramework="native" />
+	<package id="python" version="3.13.2" targetFramework="native" />
 </packages>
 		]]
 	end
diff --git a/modules/vstudio/vs2010_nuget.lua b/modules/vstudio/vs2010_nuget.lua
@@ -224,11 +224,30 @@
 
 			for _, page in ipairs(response.items) do
 				if not page.items or #page.items == 0 then
-					p.error("Failed to understand NuGet API response (got a page with no items for package '%s')", id)
-				end
+					local itemResponse, err, code = http.get(page["@id"])
+					if err ~= "OK" then
+						if code == 404 then
+							p.error("NuGet package '%s' for project '%s' couldn't be found in the repository", id, prj.name)
+						else
+							p.error("NuGet API error (%d)\n%s", code, err)
+						end
+					end
 
-				for _, item in ipairs(page.items) do
-					table.insert(items, item)
+					itemResponse, err = json.decode(itemResponse)
+					if not itemResponse then
+						p.error("Failed to decode NuGet API response (%s)", err)
+					end
+					if not itemResponse.items or #itemResponse.items == 0 then
+						p.error("Failed to understand NuGet API response (got a page with no items for package '%s')", id)
+					end
+
+					for _, item in ipairs(itemResponse.items) do
+						table.insert(items, item)
+					end
+				else
+					for _, item in ipairs(page.items) do
+						table.insert(items, item)
+					end
 				end
 			end