Merge pull request #379 from theimowski/master

path to dependencies file is now relative after nuget convert
fsprojects · Nov 21, 2014 · aba0178 · aba0178
2 parents 74dbb7c + cdd3930
commit aba0178
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Paket.Core/NugetConvert.fs b/src/Paket.Core/NugetConvert.fs
@@ -222,12 +222,12 @@ let ConvertFromNuget(dependenciesFileName, force, installAfter, initAutoRestore,
             convertNugetToRefFile(nugetPackagesConfig)
         | SolutionLevel -> ()
 
-    for slnFile in FindAllFiles(".", "*.sln") do
+    for slnFile in FindAllFiles(root, "*.sln") do
         let solution = SolutionFile(slnFile.FullName)
         solution.RemoveNugetEntries()
-        let relativePath = createRelativePath solution.FileName Environment.CurrentDirectory 
-        solution.AddPaketFolder(Path.Combine(relativePath, dependenciesFileName), 
-                                if installAfter then Some(Path.Combine(relativePath, "paket.lock")) else None)
+        let dependenciesFileRef = createRelativePath solution.FileName dependenciesFileName
+        let lockFileRef = createRelativePath solution.FileName (Path.Combine(root,"paket.lock"))
+        solution.AddPaketFolder(dependenciesFileRef, if installAfter then Some(lockFileRef) else None)
         solution.Save()
 
     for project in ProjectFile.FindAllProjects root do