Merge pull request #1349 from fsprojects/monorestore

use different protocol on mono
fsprojects · Jan 6, 2016 · 026d349 · 026d349
2 parents b4e1718 + 9350794
commit 026d349
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs b/integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs
@@ -54,8 +54,12 @@ let ``#1341 http dlls``() =
     let deps = sprintf """group Files
 
 http file:///%s/library.dll library/library.dll""" (root.Replace("\\","/"))
+
+    let monoDeps = sprintf """group Files
 
-    File.WriteAllText(Path.Combine(root,"paket.dependencies"),deps)
+http file://%s/library.dll library/library.dll""" (root.Replace("\\","/"))
+
+    File.WriteAllText(Path.Combine(root,"paket.dependencies"),if isMono then monoDeps else deps)
 
     directPaket "update -v" "i001341-http-dlls" |> ignore
 

diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -480,7 +480,7 @@ type ProjectFile =
                 let name = 
                     match fileItem.BuildAction with
                     | BuildAction.Reference -> 
-                        let n = FileInfo(fileItem.Include).Name
+                        let n = FileInfo(fileItem.Include).Name.TrimEnd('\\').Split('\\') |> Array.last
                         n.Replace(Path.GetExtension(n),"")
                     | _ -> fileItem.Include