Wrong paket ProjectRefences name causes incorrect packaging - fixes #…

…1113
fsprojects · Oct 7, 2015 · 6192424 · 6192424
1 parent 7e9bcfa
commit 6192424
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 18 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.9.1 - 07.10.2015
+* BUGFIX: Wrong paket ProjectRefences name causes incorrect packaging - https://github.com/fsprojects/Paket/issues/1113
+
 #### 2.9.0 - 05.10.2015
 * Allow to use GitHub tokens to access GitHub files - http://fsprojects.github.io/Paket/paket-config.html
 * Allow to update a single group

diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs
@@ -148,7 +148,7 @@ let findDependencies (dependencies : DependenciesFile) config (template : Templa
     let deps, files = 
         project.GetInterProjectDependencies() 
         |> Seq.fold (fun (deps, files) p -> 
-            match Map.tryFind p.Name map with
+            match Map.tryFind p.Path map with
             | Some packagedRef -> packagedRef :: deps, files
             | None -> 
                 let p = 
@@ -172,7 +172,7 @@ let findDependencies (dependencies : DependenciesFile) config (template : Templa
                     [".xml"; ".dll"; ".exe"; ".pdb"; ".mdb"] 
                     |> List.exists ((=) (f.Extension.ToLower()))
 
-                isSameFileName && isValidExtension)        
+                isSameFileName && isValidExtension)
         additionalFiles
         |> Array.fold (fun template file -> addFile file.FullName targetDir template) template
 
@@ -214,7 +214,7 @@ let findDependencies (dependencies : DependenciesFile) config (template : Templa
         |> Seq.map (fun kv -> kv.Value.NugetPackages |> List.map (fun p -> kv.Key,p))
         |> List.concat
         |> List.filter (fun (groupName,np) ->
-            try            
+            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 =
@@ -228,7 +228,7 @@ let findDependencies (dependencies : DependenciesFile) config (template : Templa
             with
             | _ -> true)
         |> List.map (fun (groupName,np) ->
-                let dependencyVersionRequirement =                    
+                let dependencyVersionRequirement =
                     if not lockDependencies then
                         match dependencies.Groups |> Map.tryFind groupName with
                         | None -> None
@@ -249,8 +249,7 @@ let findDependencies (dependencies : DependenciesFile) config (template : Templa
                                         // to current locked version
                                         group.Resolution
                                         |> Map.tryFind np.Name
-                                        |> Option.map (fun transient -> transient.Version)
-                                        |> Option.map (fun v -> VersionRequirement(Minimum v, PreReleaseStatus.No))
+                                        |> Option.map (fun transient -> VersionRequirement(Minimum transient.Version, PreReleaseStatus.No))
                         else
                             match lockFile.Groups |> Map.tryFind groupName with
                             | None -> None

diff --git a/src/Paket.Core/PackageProcess.fs b/src/Paket.Core/PackageProcess.fs
@@ -90,13 +90,7 @@ let Pack(workingDir,dependencies : DependenciesFile, packageOutputPath, buildCon
                 allTemplateFiles.Remove(templateFile.FileName) |> ignore
 
                 let merged = merge buildConfig version projectFile templateFile
-
-                let id = 
-                    match merged.Contents with
-                    | CompleteInfo _ -> projectFile.NameWithoutExtension
-                    | x -> failwithf "unexpected failure while merging meta data: %A" x
-
-                id,(merged,projectFile))
+                Path.GetFullPath projectFile.FileName,(merged,projectFile))
             |> Map.ofArray
 
     // add dependencies

diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -566,14 +566,18 @@ type ProjectFile =
         with
         | _ -> Guid.Empty
 
-    member this.GetInterProjectDependencies() =  
+    member this.GetInterProjectDependencies() =
         let forceGetInnerText node name =
             match node |> getNode name with 
             | Some n -> n.InnerText
             | None -> failwithf "unable to parse %s" node.Name
 
         [for node in this.Document |> getDescendants "ProjectReference" -> 
-            { Path = node.Attributes.["Include"].Value
+            { Path = 
+                let p = node.Attributes.["Include"].Value
+                if Path.IsPathRooted p then Path.GetFullPath p else 
+                let di = FileInfo(this.FileName).Directory
+                Path.Combine(di.FullName,p) |> Path.GetFullPath
               Name = forceGetInnerText node "Name"
               GUID =  forceGetInnerText node "Project" |> Guid.Parse }]
 

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -35,11 +35,13 @@
     <StartWorkingDirectory>D:\code\Pakettest</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Paketkopie</StartWorkingDirectory>
     <StartArguments>update group Build</StartArguments>
+    <StartArguments>pack output D:\code\paketbug\output</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
     <StartWorkingDirectory>C:\Temp\paket_test\</StartWorkingDirectory>
     <StartWorkingDirectory>d:\code\paketkopie</StartWorkingDirectory>
+    <StartWorkingDirectory>d:\code\paketbug</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/tests/Paket.Tests/ProjectFile/InterProjectDependencySpecs.fs b/tests/Paket.Tests/ProjectFile/InterProjectDependencySpecs.fs
@@ -24,9 +24,12 @@ let ``should detect Paket and Paket.Core dependency in Project2 proj file``() =
 
 [<Test>]
 let ``should detect path for dependencies in Project2 proj file``() =
-    ProjectFile.Load("./ProjectFile/TestData/Project2.fsprojtest").Value.GetInterProjectDependencies()
-    |> List.map (fun p -> p.Path)
-    |> shouldEqual ["..\..\src\Paket\Paket.fsproj"; "..\Paket.Core\Paket.Core.fsproj"]
+    let paths =
+        ProjectFile.Load("./ProjectFile/TestData/Project2.fsprojtest").Value.GetInterProjectDependencies()
+        |> List.map (fun p -> normalizePath p.Path)
+
+    paths.[0].EndsWith(normalizePath "src/Paket/Paket.fsproj") |> shouldEqual true
+    paths.[1].EndsWith(normalizePath "Paket.Core/Paket.Core.fsproj") |> shouldEqual true
 
 [<Test>]
 let ``should detect Guids for dependencies in Project2 proj file``() =