fix for include-referenced-projects flag #2753
Conversation
| [if includeReferencedProjects then | ||
| for proj in project.GetAllReferencedProjects(false,projDeps) |> Seq.filter ((<>) project) do | ||
| match proj.FindTemplatesFile() with | ||
| | Some templateFileName when TemplateFile.IsProjectType templateFileName -> | ||
| match TemplateFile.Load(templateFileName, lockFile, None, Seq.empty |> Map.ofSeq).Contents with |
There was a problem hiding this comment.
The idea of this fix is here: we can't just Load template file for referenced project - we must merge it with info from project (we do so in merge method in PackageProcess.fs).
| | None -> true | ||
|
|
||
| Path.GetFullPath projectFile.FileName |> normalizePath,(merged,projectFile,willBePacked)) | ||
| |> Map.ofArray |
There was a problem hiding this comment.
When we pack single template findDependencies still need all project-template info for choose right version of nuget dependencies if flag --include-referenced-projects was provided.
There was a problem hiding this comment.
I'm not really that familiar with that part of the code base as I rarely use paket pack...
Generally if the tests make sense we probably should take it. It looks really well made from the amount of tests, I have noted only one minor personal preference regarding tuples...
| @@ -159,7 +159,7 @@ let addFile (source : string) (target : string) (templateFile : TemplateFile) = | |||
| | IncompleteTemplate -> | |||
| failwith (sprintf "You should only try and add files to template files with complete metadata.%sFile: %s" Environment.NewLine templateFile.FileName) | |||
|
|
|||
| let findDependencies (dependenciesFile : DependenciesFile) config platform (template : TemplateFile) (project : ProjectFile) lockDependencies minimumFromLockFile pinProjectReferences (map : Map<string, TemplateFile * ProjectFile>) includeReferencedProjects (version :SemVerInfo option) specificVersions (projDeps) = | |||
| let findDependencies (dependenciesFile : DependenciesFile) config platform (template : TemplateFile) (project : ProjectFile) lockDependencies minimumFromLockFile pinProjectReferences (projectWithTemplates : Map<string, TemplateFile * ProjectFile * bool>) includeReferencedProjects (version :SemVerInfo option) specificVersions (projDeps) = | |||
There was a problem hiding this comment.
I prefer to introduce records instead of triples..
There was a problem hiding this comment.
i will try to change it next time:)
Try to fix #1848