Merge pull request #409 from fsprojects/Reffind

Find the references file in upper directories
fsprojects · Dec 1, 2014 · a3b570a · a3b570a
2 parents c7721e7 + f221d5c
commit a3b570a
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -51,10 +51,15 @@ type ProjectFile =
     static member FindReferencesFile (projectFile : FileInfo) =
         let specificReferencesFile = FileInfo(Path.Combine(projectFile.Directory.FullName, projectFile.Name + "." + Constants.ReferencesFile))
         if specificReferencesFile.Exists then Some specificReferencesFile.FullName
-        else 
-            let generalReferencesFile = FileInfo(Path.Combine(projectFile.Directory.FullName, Constants.ReferencesFile))
-            if generalReferencesFile.Exists then Some generalReferencesFile.FullName
-            else None
+        else
+            let rec findInDir (currentDir:DirectoryInfo) = 
+                let generalReferencesFile = FileInfo(Path.Combine(currentDir.FullName, Constants.ReferencesFile))
+                if generalReferencesFile.Exists then Some generalReferencesFile.FullName
+                elif (FileInfo(Path.Combine(currentDir.FullName, Constants.DependenciesFileName))).Exists then None
+                elif currentDir.Parent = null then None
+                else findInDir currentDir.Parent 
+
+            findInDir projectFile.Directory
 
     member this.CreateNode(name) = 
         this.Document.CreateElement(name, Constants.ProjectDefaultNameSpace)