Merge pull request #1644 from matthid/fix_travis_by_fixing_a_bug

Fix failing test case.

Author: forki

src/Paket.Core/ProjectFile.fs

@@ -485,9 +485,8 @@ module ProjectFile =
             let libReferenceNode = 
                 let name = 
                     match fileItem.BuildAction with
-                    | BuildAction.Reference -> 
-                        let n = FileInfo(fileItem.Include).Name.TrimEnd('\\').Split('\\') |> Array.last
-                        n.Replace(Path.GetExtension n,"")
+                    | BuildAction.Reference ->
+                        fileItem.Include |> normalizePath |> Path.GetFileNameWithoutExtension
                     | _ -> fileItem.Include
 
                 createNode (string fileItem.BuildAction) project
@@ -520,7 +519,7 @@ module ProjectFile =
                 |> getDescendants (string fileItem.BuildAction)
                 |> List.filter (fun node -> 
                     match node |> getAttribute "Include" with
-                    | Some path when path.StartsWith (Path.GetDirectoryName fileItem.Include) -> true
+                    | Some path when path.StartsWith (fileItem.Include |> normalizePath |> Path.GetDirectoryName |> windowsPath) -> true
                     | _ -> false)
 
 

src/Paket.Core/Utils.fs

@@ -442,7 +442,7 @@ let askYesNo question =
     getAnswer()
 
 let inline normalizePath(path:string) = path.Replace("\\",Path.DirectorySeparatorChar.ToString()).Replace("/",Path.DirectorySeparatorChar.ToString()).TrimEnd(Path.DirectorySeparatorChar)
-
+let inline windowsPath (path:string) = path.Replace(Path.DirectorySeparatorChar, '\\')
 /// Gets all files with the given pattern
 let inline FindAllFiles(folder, pattern) = DirectoryInfo(folder).GetFiles(pattern, SearchOption.AllDirectories)