Skip to content

Commit

Permalink
isReferencedProject should not overwrite nuspec.IsDevelopmentDependency
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Jan 27, 2016
1 parent 6b48b17 commit 5783de4
Showing 1 changed file with 13 additions and 15 deletions.
28 changes: 13 additions & 15 deletions src/Paket.Core/PackageMetaData.fs
Original file line number Diff line number Diff line change
Expand Up @@ -253,21 +253,19 @@ let findDependencies (dependencies : DependenciesFile) config platform (template
let deps =
allReferences
|> List.filter (fun (groupName, np, isReferencedProject) ->
if isReferencedProject then true
else
try
// TODO: it would be nice if this data would be in the NuGet OData feed,
// then we would not need to parse every nuspec here
let info =
lockFile.Groups.[groupName].Resolution
|> Map.tryFind np.Name
match info with
| None -> true
| Some rp ->
let nuspec = Nuspec.Load(dependencies.RootPath,groupName,rp.Version,defaultArg rp.Settings.IncludeVersionInPath false,np.Name)
not nuspec.IsDevelopmentDependency
with
| _ -> true)
try
// TODO: it would be nice if this data would be in the NuGet OData feed,
// then we would not need to parse every nuspec here
let info =
lockFile.Groups.[groupName].Resolution
|> Map.tryFind np.Name
match info with
| None -> true
| Some rp ->
let nuspec = Nuspec.Load(dependencies.RootPath,groupName,rp.Version,defaultArg rp.Settings.IncludeVersionInPath false,np.Name)
not nuspec.IsDevelopmentDependency
with
| _ -> true)
|> List.map (fun (groupName,np, isReferencedProject) ->
let dependencyVersionRequirement =
if not lockDependencies then
Expand Down

0 comments on commit 5783de4

Please sign in to comment.