Don't restore if we don't find a proj or sln - fixes #4125

Author: forki

RELEASE_NOTES.md

@@ -1,4 +1,4 @@
-#### 7.0.0 - 2022-03-01
+#### 7.0.1 - 2022-03-01
 * Support for .NET 7.0
 * Support as .NET 6.0 tool
 * Auto-Restore after paket install an paket update

src/Paket.Core/Common/Utils.fs

@@ -456,7 +456,7 @@ let runDotnet workingDir arguments =
         let p = new System.Diagnostics.Process()
         p.StartInfo.WorkingDirectory <- workingDir
         p.StartInfo.FileName <- "dotnet"
-        p.StartInfo.Arguments <- arguments        
+        p.StartInfo.Arguments <- arguments
         p.Start() |> ignore
         p.WaitForExit()
         p.ExitCode
@@ -469,7 +469,7 @@ let RunInLockedAccessMode(lockedFolder,lockedAction: unit -> bool) =
         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
@@ -486,7 +486,7 @@ let RunInLockedAccessMode(lockedFolder,lockedAction: unit -> bool) =
                         let content = File.ReadAllText fileName
                         if content = pid then
                             skipUnlock <- true
-                        else 
+                        else
                             let hasRunningPaketProcess =
                                 Process.GetProcessesByName currentProcess.ProcessName
                                 |> Array.filter (fun p -> string p.Id <> pid)
@@ -497,11 +497,11 @@ let RunInLockedAccessMode(lockedFolder,lockedAction: unit -> bool) =
                                     failwith "timeout"
                                 else
                                     Thread.Sleep 100
-                            else 
+                            else
                                 skipUnlock <- true
                     else
                         skipUnlock <- true
-                    
+
                 File.WriteAllText(fileName, pid)
                 skip <- true
             with
@@ -544,13 +544,10 @@ let RunInLockedAccessMode(lockedFolder,lockedAction: unit -> bool) =
             let slnFiles = rootFolder.GetFiles("*.sln", SearchOption.TopDirectoryOnly)
             if Array.isEmpty slnFiles then
                 let projFiles = rootFolder.GetFiles("*.*proj", SearchOption.TopDirectoryOnly)
-                if Array.isEmpty projFiles then
-                    tracefn "Calling dotnet restore"
-                    runDotnet rootFolder.FullName "restore"
-                else
-                    for sln in projFiles do
-                        tracefn "Calling dotnet restore on %s" sln.Name
-                        runDotnet rootFolder.FullName (sprintf "restore \"%s\"" sln.Name)
+
+                for proj in projFiles do
+                    tracefn "Calling dotnet restore on %s" proj.Name
+                    runDotnet rootFolder.FullName (sprintf "restore \"%s\"" proj.Name)
             else
                 for sln in slnFiles do
                     tracefn "Calling dotnet restore on %s" sln.Name
@@ -770,7 +767,7 @@ let extractZipToDirectory (zipFileName:string) (directoryName:string) =
             if fi.Exists then
                 try fi.Delete() with | _ -> ()
             entry.ExtractToFile(destinationPath)
-            
+
 
 
 // adapted from MiniRx

src/Paket.Core/Installation/InstallProcess.fs

@@ -341,7 +341,7 @@ let private applyBindingRedirects isFirstGroup createNewBindingFiles cleanBindin
 let installForDotnetSDK root (project:ProjectFile) =
     let paketTargetsPath = RestoreProcess.extractRestoreTargets root
     let relativePath = createRelativePath project.FileName paketTargetsPath
-        
+
     Paket.ProjectFile.removePaketNodes project
     project.RemoveImportForPaketTargets()
     project.AddImportForPaketTargets(relativePath)
@@ -498,15 +498,15 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile
         else // start the installation process
             if toolsVersion >= 15.0 then
                 installForDotnetSDK root project
-                if forceTouch then 
+                if forceTouch then
                     touchedProjects.Add project |> ignore
                 else
                     match touchedPackages with
                     | Some touchedPackages ->
                         let packageInstalled =
                             touchedPackages
                             |> Seq.exists (fun (g,p,_,_) -> project.HasPackageInstalled (g,p))
-                        if packageInstalled then 
+                        if packageInstalled then
                             touchedProjects.Add project |> ignore
                     | _ ->
                         touchedProjects.Add project |> ignore

src/Paket.Core/Versioning/CredentialProviders.fs

@@ -55,7 +55,7 @@ type CredentialProviderUnknownStatusException =
 module CredentialProviders =
     open Logging
     open System.Collections.Concurrent
-    
+
     let patternExe = "CredentialProvider*.exe"
     let patternDll = "CredentialProvider*.dll"
     let envVar = "NUGET_CREDENTIALPROVIDERS_PATH"