Do not touch project files in packages folder - references #1455

fsprojects · Feb 4, 2016 · bb1d3d3 · bb1d3d3
1 parent 408345b
commit bb1d3d3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.49.3 - 04.02.2016
+* BUGFIX: Do not touch project files in packages folder - https://github.com/fsprojects/Paket/issues/1455
+
 #### 2.49.2 - 04.02.2016
 * BUGFIX: Keep versions locked for dependencies during pack - https://github.com/fsprojects/Paket/issues/1457
 

diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -199,13 +199,25 @@ module ProjectFile =
             | _ -> None
 
     /// Finds all project files
-    let findAllProjects folder = 
+    let findAllProjects folder =
+        let packagesPath = Path.Combine(folder,Constants.PackagesFolderName) |> normalizePath
+        let paketPath = Path.Combine(folder,Constants.PaketFilesFolderName) |> normalizePath
+
         let findAllFiles (folder, pattern) = 
             let rec search (di:DirectoryInfo) = 
                 try
                     let files = di.GetFiles(pattern, SearchOption.TopDirectoryOnly)
                     di.GetDirectories()
-                    |> Array.filter (fun di -> try Path.Combine(di.FullName, Constants.DependenciesFileName) |> File.Exists |> not with | _ -> false)
+                    |> Array.filter (fun di ->
+                        try 
+                            let path = di.FullName |> normalizePath
+                            if path = packagesPath then false else
+                            if path = paketPath then false else
+                            Path.Combine(path, Constants.DependenciesFileName) 
+                            |> File.Exists 
+                            |> not 
+                        with 
+                        | _ -> false)
                     |> Array.collect search
                     |> Array.append files
                 with