Skip to content
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

Make Name and Guid in ProjectRefrence optional #1729

Merged
merged 1 commit into from
Jun 15, 2016
Merged

Make Name and Guid in ProjectRefrence optional #1729

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
12 changes: 6 additions & 6 deletions src/Paket.Core/ProjectFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ type FileItem =
type ProjectReference =
{ Path : string
RelativePath : string
Name : string
GUID : Guid }
Name : string option
GUID : Guid option }

/// Compile items inside of project files.
type CompileItem =
Expand Down Expand Up @@ -1045,13 +1045,13 @@ module ProjectFile =
let getInterProjectDependencies project =
let forceGetInnerText node name =
match node |> getNode name with
| Some n -> n.InnerText
| Some n -> Some n.InnerText
| None ->
match node |> getAttribute "Include" with
| Some fileName ->
let fi = FileInfo(normalizePath fileName)
fi.Name.Replace(fi.Extension,"")
| None -> failwithf "unable to parse %O" node
Some <| fi.Name.Replace(fi.Extension,"")
| None -> None

[for node in project.Document |> getDescendants "ProjectReference" ->
let path =
Expand All @@ -1069,7 +1069,7 @@ module ProjectFile =

RelativePath = path.Replace("/","\\")
Name = forceGetInnerText node "Name"
GUID = forceGetInnerText node "Project" |> Guid.Parse }]
GUID = forceGetInnerText node "Project" |> Option.map Guid.Parse }]

let replaceNuGetPackagesFile project =
let noneAndContentNodes =
Expand Down
6 changes: 3 additions & 3 deletions tests/Paket.Tests/ProjectFile/InterProjectDependencySpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ let ``should detect no dependencies in empty proj file``() =
[<Test>]
let ``should detect Paket dependency in Project1 proj file``() =
ProjectFile.TryLoad("./ProjectFile/TestData/Project1.fsprojtest").Value.GetInterProjectDependencies()
|> List.map (fun p -> p.Name)
|> List.map (fun p -> p.Name.Value)
|> shouldEqual ["Paket"]

[<Test>]
let ``should detect Paket and Paket.Core dependency in Project2 proj file``() =
ProjectFile.TryLoad("./ProjectFile/TestData/Project2.fsprojtest").Value.GetInterProjectDependencies()
|> List.map (fun p -> p.Name)
|> List.map (fun p -> p.Name.Value)
|> shouldEqual ["Paket"; "Paket.Core"]

[<Test>]
Expand All @@ -45,7 +45,7 @@ let ``should detect Guids for dependencies in Project2 proj file``() =
let p = ProjectFile.TryLoad("./ProjectFile/TestData/Project2.fsprojtest").Value
p.GetProjectGuid() |> shouldEqual (Guid.Parse "e789c72a-5cfd-436b-8ef1-61aa2852a89f")
p.GetInterProjectDependencies()
|> List.map (fun p -> p.GUID.ToString())
|> List.map (fun p -> p.GUID.Value.ToString())
|> shouldEqual ["09b32f18-0c20-4489-8c83-5106d5c04c93"; "7bab0ae2-089f-4761-b138-a717aa2f86c5"]


Expand Down