Bump version to 7.0.0-alpha016

RELEASE_NOTES.md

@@ -1,4 +1,4 @@
-#### 7.0.0-alpha014 - 2022-12-09
+#### 7.0.0-alpha016 - 2022-12-09
 * Support as .NET 6.0 tool
 * Auto-Restore after paket install an paket update
 

src/Paket.Core/Installation/InstallProcess.fs

@@ -361,7 +361,7 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile
             |> Seq.map (fun kv -> kv.Key)
         |> Set
 
-    let touchedProjects = System.Collections.Generic.HashSet<string>()
+    let touchedProjects = System.Collections.Generic.HashSet<_>()
     tracefn "Created dependency graph (%d packages in total)" packagesToInstall.Count
     let root = Path.GetDirectoryName lockFile.FileName
     let model = CreateModel(options.AlternativeProjectRoot, root, options.Force, dependenciesFile, lockFile, packagesToInstall, updatedGroups) |> Map.ofArray
@@ -499,17 +499,17 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile
             if toolsVersion >= 15.0 then
                 installForDotnetSDK root project
                 if forceTouch then 
-                    touchedProjects.Add project.FileName |> ignore
+                    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 
-                            touchedProjects.Add project.FileName |> ignore
+                            touchedProjects.Add project |> ignore
                     | _ ->
-                        touchedProjects.Add project.FileName |> ignore
+                        touchedProjects.Add project |> ignore
             else
                 project.UpdateReferences(model, directDependencies, usedPackages)
 
@@ -558,7 +558,7 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile
             project.Save forceTouch
             projectCache.[project.FileName] <- Some project
 
-            let first = ref true
+            let mutable first = true
 
             let allKnownLibNames =
                 model
@@ -585,15 +585,15 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile
 
                     (snd kv.Value,packageRedirects))
                 |> applyBindingRedirects
-                    !first
+                    first
                     options.CreateNewBindingFiles
                     options.CleanBindingRedirects
                     (FileInfo project.FileName).Directory.FullName
                     g.Key
                     lockFile.GetAllDependenciesOf
                     allKnownLibNames
                     projectCache
-                first := false
+                first <- false
 
     let restoreCacheFile = Path.Combine(root, Constants.PaketRestoreHashFilePath)
     let hash = Paket.RestoreProcess.getLockFileHashFromContent (lockFile.ToString())
@@ -602,8 +602,9 @@ let InstallIntoProjects(options : InstallerOptions, forceTouch, dependenciesFile
     Paket.RestoreProcess.writeRestoreCache restoreCacheFile { PackagesDownloadedHash = hash; ProjectsRestoredHash = hash }
     Paket.RestoreProcess.writeGitignore restoreCacheFile
 
-    for project in touchedProjects do
-        let di = (FileInfo project).Directory
+    for project in touchedProjects |> Seq.distinctBy (fun p -> p.FileName) |> Seq.sortBy (fun p -> p.FileName) do
+        tracefn " - Project %O needs to be restored" project.Name
+        let di = (FileInfo project.FileName).Directory
         for objDir in Directory.EnumerateDirectories(di.FullName,"obj", SearchOption.AllDirectories) do
             for file in Directory.EnumerateFiles(objDir,"project.assets.json", SearchOption.AllDirectories) do
                 try

src/Paket.Core/Installation/RestoreProcess.fs

@@ -596,7 +596,8 @@ let RestoreNewSdkProject lockFile resolved groups (projectFile:ProjectFile) targ
 
     RunInLockedAccessMode (
         objDirectory.FullName,
-        (fun () ->
+        (fun () ->        
+            tracefn "Restoring %O" projectFile.FileName
             createAlternativeNuGetConfig (projectFileInfo, objDirectory)
             createProjectReferencesFiles lockFile projectFile referencesFile resolved groups targetFrameworks objDirectory            
             false
@@ -708,7 +709,11 @@ let Restore(dependenciesFileName,projectFile:RestoreProjectOptions,force,group,i
     // fixup project specific changes (like an additional target framework or a changed references file)
 
     // Check if caching makes sense (even if we only can cache parts of it)
-    let canCacheRestore = not (hasLocalFile || force) && targetFrameworks = None && (projectFile = AllProjects || projectFile = NoProjects) && group = None
+    let canCacheRestore = 
+        not (hasLocalFile || force) && 
+            targetFrameworks = None && 
+            (projectFile = AllProjects || projectFile = NoProjects) && 
+            group = None
 
     if not skipRestoreTargetsExtraction && (projectFile = AllProjects || projectFile = NoProjects) then
         extractRestoreTargets root |> ignore
@@ -727,9 +732,9 @@ let Restore(dependenciesFileName,projectFile:RestoreProjectOptions,force,group,i
             Some updatedCache, cache, lockFileHash, (isPackagesDownloadUpToDate && isProjectRestoreUpToDate) || (projectFile = NoProjects && isPackagesDownloadUpToDate)
 
     let _,_,_, canEarlyExit = readCache()
-
-    if canEarlyExit then
-        tracefn "The last restore is still up to date. Nothing left to do."
+    
+    if canEarlyExit then        
+        tracefn "The last full restore is still up to date. Nothing left to do."
     else
         let dependenciesFile = DependenciesFile.ReadFromFile(dependenciesFileName)