Skip to content

use different protocol on mono #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 1 commit into from
Jan 6, 2016
Merged

use different protocol on mono #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
use different protocol on mono
  • Loading branch information
@forki
forki committed Jan 6, 2016
commit 93507940fc7cf9ac16f245ff485b81300e6c9dd7
6 changes: 5 additions & 1 deletion integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/Paket.Core/ProjectFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down