From cdd39307c55ae1d90fa4a0d3050f7a4b558068fa Mon Sep 17 00:00:00 2001 From: Tomasz Heimowski Date: Fri, 21 Nov 2014 12:35:43 +0100 Subject: [PATCH] path to dependencies file is now relative after nuget convert - fixes #378 --- src/Paket.Core/NugetConvert.fs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Paket.Core/NugetConvert.fs b/src/Paket.Core/NugetConvert.fs index 824efeaae1..359f0111bf 100644 --- 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