From 3a64206c0d0735069240e3100e48009ec2549dc5 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 17 Feb 2022 17:16:53 +0100 Subject: [PATCH] Bump version to 7.0.0-alpha018 --- RELEASE_NOTES.md | 2 +- src/Paket.Core/Common/Utils.fs | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index fae4927152..50f1b350d9 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 7.0.0-alpha017 - 2022-12-17 +#### 7.0.0-alpha018 - 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 index 2dc58173ca..6ecaba0f98 100644 --- a/src/Paket.Core/Common/Utils.fs +++ b/src/Paket.Core/Common/Utils.fs @@ -540,9 +540,15 @@ let RunInLockedAccessMode(lockedFolder,lockedAction: unit -> bool) = let runDotNetRestore = lockedAction() releaseLock 5 - if runDotNetRestore then - tracefn "Calling dotnet restore" - runDotnet rootFolder.FullName "restore" + if runDotNetRestore then + let slnFiles = rootFolder.GetFiles("*.sln", SearchOption.TopDirectoryOnly) + if Array.isEmpty slnFiles then + tracefn "Calling dotnet restore" + runDotnet rootFolder.FullName "restore" + else + for sln in slnFiles do + tracefn "Calling dotnet restore on %s" sln.Name + runDotnet rootFolder.FullName (sprintf "restore \"%s\"" sln.Name) with | _ -> releaseLock 5