Pack deps without template - fixes #1429

fsprojects · Jan 25, 2016 · 6991539 · 6991539
1 parent e20488e
commit 6991539
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/integrationtests/Paket.IntegrationTests/PackSpecs.fs b/integrationtests/Paket.IntegrationTests/PackSpecs.fs
@@ -79,7 +79,7 @@ let ``#1429 pack deps from template``() =
         |> Async.RunSynchronously
 
     details.Dependencies |> List.map (fun (x,_,_) -> x) |> shouldContain (PackageName "MySql.Data")
-    details.Dependencies |> List.map (fun (x,_,_) -> x) |> shouldContain (PackageName "PaketBug2")
+    details.Dependencies |> List.map (fun (x,_,_) -> x) |> shouldNotContain (PackageName "PaketBug2") // it's not packed in same round
     details.Dependencies |> List.map (fun (x,_,_) -> x) |> shouldNotContain (PackageName "PaketBug")
 
     File.Delete(Path.Combine(scenarioTempPath "i001429-pack-deps","PaketBug","paket.template"))

diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs
@@ -136,18 +136,10 @@ let findDependencies (dependencies : DependenciesFile) config platform (template
         | None -> PreReleaseStatus.No
         | _ -> PreReleaseStatus.All
 
-    let getProjects =
-        seq {
-            if includeReferencedProjects then
-                yield! project.GetAllInterProjectDependenciesWithoutProjectTemplates
-            else
-                yield project
-        }
-
     let deps, files = 
-        getProjects
-        |> Seq.filter (fun proj -> proj <> project)
-        |> Seq.fold (fun (deps, files) p -> 
+        project.GetAllInterProjectDependenciesWithProjectTemplates |> Seq.toList
+        |> List.filter (fun proj -> proj <> project)
+        |> List.fold (fun (deps, files) p -> 
             match Map.tryFind p.FileName map with
             | Some packagedRef -> packagedRef :: deps, files
             | None -> 
@@ -161,8 +153,9 @@ let findDependencies (dependencies : DependenciesFile) config platform (template
     // Add the assembly + pdb + dll from this project
     let templateWithOutput =
         let additionalFiles = 
-            let assemblyNames = getProjects
-                                |> Seq.map (fun proj -> proj.GetAssemblyName())
+            let assemblyNames = 
+                if includeReferencedProjects then project.GetAllInterProjectDependenciesWithoutProjectTemplates |> Seq.toList else [ project ]
+                |> List.map (fun proj -> proj.GetAssemblyName())
 
             assemblyNames
             |> Seq.collect (fun assemblyFileName -> 

diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -1140,6 +1140,17 @@ module ProjectFile =
                 | None -> true
         )
 
+    let projectsWithTemplates this projects =
+        projects
+        |> Seq.filter(fun proj ->
+            if proj = this then true
+            else
+                let templateFilename = findTemplatesFile (FileInfo proj.FileName)
+                match templateFilename with
+                | Some tfn -> TemplateFile.IsProjectType tfn
+                | None -> false
+        )
+
 
     let getOutputDirectory buildConfiguration buildPlatform (project:ProjectFile) =
         let platforms =
@@ -1281,8 +1292,9 @@ type ProjectFile with
 
     member this.GetRecursiveInterProjectDependencies =  ProjectFile.getAllReferencedProjects this
 
-    member this.GetAllInterProjectDependenciesWithoutProjectTemplates =  ProjectFile.getAllReferencedProjects this |> ProjectFile.projectsWithoutTemplates this
+    member this.GetAllInterProjectDependenciesWithoutProjectTemplates = ProjectFile.getAllReferencedProjects this |> ProjectFile.projectsWithoutTemplates this
 
+    member this.GetAllInterProjectDependenciesWithProjectTemplates = ProjectFile.getAllReferencedProjects this |> ProjectFile.projectsWithTemplates this
 
     member this.ReplaceNuGetPackagesFile () = ProjectFile.removeNuGetTargetsEntries this