Skip to content

fix for projects that contained linked files. #1390

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 15, 2016
Merged

fix for projects that contained linked files. #1390

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
7 changes: 3 additions & 4 deletions src/Paket.Core/PackageProcess.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,9 @@ let private convertToSymbols (projectFile : ProjectFile) (includeReferencedProje
let item = match compileItem.Link with
| Some link -> link
| None -> compileItem.Include

let dir = Path.GetDirectoryName(Path.GetFullPath(item))
let tld = Path.GetFileName(Path.GetDirectoryName(dir))
Path.Combine("src", tld, Path.GetFileName(dir))

let tld = Path.GetFileName(compileItem.BaseDir)
Path.Combine("src", tld, Path.GetFileName(Path.GetDirectoryName(Path.GetFullPath(item))))

projectFile.GetCompileItems(includeReferencedProjects)
|> Seq.map (fun c -> c.Include, getTarget c)
Expand Down
9 changes: 6 additions & 3 deletions src/Paket.Core/ProjectFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ type ProjectReference =
/// Compile items inside of project files.
type CompileItem =
{ Include : string
Link : string option }
Link : string option
BaseDir : string}

/// Project output type.
[<RequireQualifiedAccess>]
Expand Down Expand Up @@ -1155,10 +1156,12 @@ module ProjectFile =
|> function
| [] ->
{ Include = includePath
Link = None }
Link = None
BaseDir = Path.GetDirectoryName(Path.GetFullPath(projfile.FileName))}
| [ link ] | link :: _ ->
{ Include = includePath
Link = Some link.InnerText }
Link = Some link.InnerText
BaseDir = Path.GetDirectoryName(Path.GetFullPath(projfile.FileName))}

let referencedProjects =
if includeReferencedProjects then
Expand Down