Call restore in rootFolder - references fsprojects#4122

hesxenon · Feb 17, 2022 · bb4eedd · bb4eedd
1 parent c465670
commit bb4eedd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-#### 7.0.0-alpha016 - 2022-12-09
+#### 7.0.0-alpha017 - 2022-12-17
 * Support as .NET 6.0 tool
 * Auto-Restore after paket install an paket update
 

diff --git a/src/Paket.Core/Common/Utils.fs b/src/Paket.Core/Common/Utils.fs
@@ -451,9 +451,10 @@ type PackagesFolderGroupConfig =
             parentPath () |> ResolvedPackagesFolder.ResolvedFolder
     static member Default = DefaultPackagesFolder
 
-let runDotnet arguments =
+let runDotnet workingDir arguments =
     let result =
         let p = new System.Diagnostics.Process()
+        p.StartInfo.WorkingDirectory <- workingDir
         p.StartInfo.FileName <- "dotnet"
         p.StartInfo.Arguments <- arguments        
         p.Start() |> ignore
@@ -467,6 +468,8 @@ let RunInLockedAccessMode(lockedFolder,lockedAction: unit -> bool) =
     if not (Directory.Exists lockedFolder) then
         Directory.CreateDirectory lockedFolder |> ignore
 
+    let rootFolder = DirectoryInfo(lockedFolder).Parent
+
     let currentProcess = System.Diagnostics.Process.GetCurrentProcess()
     let fileName = Path.Combine(lockedFolder,Constants.AccessLockFileName)
     let pid = string currentProcess.Id
@@ -539,7 +542,7 @@ let RunInLockedAccessMode(lockedFolder,lockedAction: unit -> bool) =
         releaseLock 5
         if runDotNetRestore then            
             tracefn "Calling dotnet restore"
-            runDotnet "restore"
+            runDotnet rootFolder.FullName "restore"
     with
     | _ ->
         releaseLock 5