fixes to dotnetbase code for C++ nuget support.

This commit is contained in:
Tom van Dijck 2017-10-06 12:32:11 -07:00 committed by Tom van Dijck
parent 116b1c2c80
commit 472523d59d
2 changed files with 84 additions and 85 deletions

View File

@ -6,4 +6,3 @@ indent_size = 4
tab_width = 4
trim_trailing_whitespace = true
insert_final_newline = true
charset = utf-8

View File

@ -398,7 +398,7 @@
--
function dotnetbase.nuGetReferences(prj)
if _ACTION >= "vs2010" and _ACTION < "vs2017" then
if _ACTION >= "vs2010" and not vstudio.nuget2010.supportsPackageReferences(prj) then
for _, package in ipairs(prj.nuget) do
local id = vstudio.nuget2010.packageId(package)
local packageAPIInfo = vstudio.nuget2010.packageAPIInfo(prj, package)
@ -501,7 +501,7 @@
-- Write the list of package dependencies.
--
function dotnetbase.packageReferences(prj)
if _ACTION >= "vs2017" then
if vstudio.nuget2010.supportsPackageReferences(prj) then
local hasNuget = prj.nuget and #prj.nuget>0
for cfg in project.eachconfig(prj) do
if cfg.nuget and #cfg.nuget>0 then