Skip to content

Project cracking fix child references #478

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
merged 1 commit into from
Dec 2, 2015
Merged

Project cracking fix child references #478

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
25 changes: 14 additions & 11 deletions src/fsharp/FSharp.Compiler.Service.ProjectCracker.Exe/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,20 +378,23 @@ module Program =
// C# referenced projects, as we don't look at them otherwise.
let referencedProjectOutputs =
if runningOnMono then
[| yield! Array.map (fun (s,_) -> "-r:" + s) referencedProjectOptions
for file in parsedProject.ProjectReferences do
let ext = Path.GetExtension(file)
if ext = ".csproj" || ext = ".vbproj" then
let parsedProject = FSharpProjectFileInfo.Parse(file, properties=properties, enableLogging=false)
match parsedProject.OutputFile with
| None -> ()
| Some f -> yield "-r:" + f |]
[ yield! Array.map (fun (s,_) -> "-r:" + s) referencedProjectOptions
for file in parsedProject.ProjectReferences do
let ext = Path.GetExtension(file)
if ext = ".csproj" || ext = ".vbproj" then
let parsedProject = FSharpProjectFileInfo.Parse(file, properties=properties, enableLogging=false)
match parsedProject.OutputFile with
| None -> ()
| Some f -> yield "-r:" + f ]
else
[||]
[]

// On some versions of Mono the referenced projects are already
// correctly included, so we make sure not to introduce duplicates
|> List.filter (fun r -> not (Set.contains r (set parsedProject.Options)))

let options = { ProjectFile = file
Options = Array.append (Array.ofList (parsedProject.Options))
referencedProjectOutputs
Options = Array.ofSeq (parsedProject.Options @ referencedProjectOutputs)
ReferencedProjectOptions = referencedProjectOptions
LogOutput = parsedProject.LogOutput }

Expand Down