From f385e357bc85904ee6d2ebbdeafb28f914016619 Mon Sep 17 00:00:00 2001
From: Steffen Forkmann <steffen.forkmann@msu-solutions.de>
Date: Tue, 10 Oct 2017 12:28:22 +0200
Subject: [PATCH 1/3] load scripts should only work on lock file  - fixes #2372

---
 src/Paket.Core/Installation/RestoreProcess.fs | 15 ++++++-------
 .../Installation/ScriptGeneration.fs          | 21 +++++++++----------
 .../PaketConfigFiles/DependenciesFile.fs      | 15 +------------
 .../PaketConfigFiles/DependencyCache.fs       |  9 ++++----
 src/Paket.Core/PaketConfigFiles/LockFile.fs   | 13 ++++++++++++
 5 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/src/Paket.Core/Installation/RestoreProcess.fs b/src/Paket.Core/Installation/RestoreProcess.fs
index 3d3468b562..bd333c4005 100644
--- a/src/Paket.Core/Installation/RestoreProcess.fs
+++ b/src/Paket.Core/Installation/RestoreProcess.fs
@@ -356,7 +356,7 @@ let createProjectReferencesFiles (lockFile:LockFile) (projectFile:ProjectFile) (
         // it can happen that the references file doesn't exist if paket doesn't find one in that case we update the cache by deleting it.
         if paketCachedReferencesFileName.Exists then paketCachedReferencesFileName.Delete()
 
-let CreateScriptsForGroups dependenciesFile lockFile (groups:Map<GroupName,LockFileGroup>) =
+let CreateScriptsForGroups dependenciesFileName (lockFile:LockFile) (groups:Map<GroupName,LockFileGroup>) =
     let groupsToGenerate =
         groups
         |> Seq.map (fun kvp -> kvp.Value)
@@ -365,12 +365,12 @@ let CreateScriptsForGroups dependenciesFile lockFile (groups:Map<GroupName,LockF
         |> Seq.toList
 
     if not (List.isEmpty groupsToGenerate) then
-        let depsCache = DependencyCache(dependenciesFile,lockFile)
-        let dir = DirectoryInfo dependenciesFile.Directory
+        let depsCache = DependencyCache(dependenciesFileName,lockFile)
+        let rootPath = DirectoryInfo lockFile.RootPath
 
         let scripts = LoadingScripts.ScriptGeneration.constructScriptsFromData depsCache groupsToGenerate [] []
         for sd in scripts do
-            sd.Save dir
+            sd.Save rootPath
 
 let FindOrCreateReferencesFile (projectFile:ProjectFile) =
     match projectFile.FindReferencesFile() with
@@ -428,7 +428,6 @@ let Restore(dependenciesFileName,projectFile,force,group,referencesFileNames,ign
     if not (hasLocalFile || force) && isEarlyExit () then
         tracefn "Last restore is still up to date."
     else
-        let dependenciesFile = DependenciesFile.ReadFromFile(dependenciesFileName)
         if projectFile = None then
             extractRestoreTargets root |> ignore
 
@@ -438,10 +437,12 @@ let Restore(dependenciesFileName,projectFile,force,group,referencesFileNames,ign
                 s.Split([|';'|], StringSplitOptions.RemoveEmptyEntries)
                 |> Array.map (fun s -> s.Trim())
                 |> Array.choose FrameworkDetection.Extract)
+        
+        
+        let dependenciesFile = DependenciesFile.ReadFromFile(dependenciesFileName)
 
         if not hasLocalFile && not ignoreChecks then
             let hasAnyChanges,nugetChanges,remoteFilechanges,hasChanges = DependencyChangeDetection.GetChanges(dependenciesFile,lockFile,false)
-
             let checkResponse = if failOnChecks then failwithf else traceWarnfn
             if hasAnyChanges then 
                 checkResponse "paket.dependencies and paket.lock are out of sync in %s.%sPlease run 'paket install' or 'paket update' to recompute the paket.lock file." lockFileName.Directory.FullName Environment.NewLine
@@ -532,6 +533,6 @@ let Restore(dependenciesFileName,projectFile,force,group,referencesFileNames,ign
                     |> Async.RunSynchronously
                     |> ignore
 
-                CreateScriptsForGroups dependenciesFile lockFile groups
+                CreateScriptsForGroups dependenciesFileName lockFile groups
                 if isFullRestore then
                     File.WriteAllText(restoreCacheFile, newContents)))
\ No newline at end of file
diff --git a/src/Paket.Core/Installation/ScriptGeneration.fs b/src/Paket.Core/Installation/ScriptGeneration.fs
index 4635303c05..2e4cb13b48 100644
--- a/src/Paket.Core/Installation/ScriptGeneration.fs
+++ b/src/Paket.Core/Installation/ScriptGeneration.fs
@@ -127,13 +127,13 @@ module ScriptGeneration =
             self.Input |> Seq.map refString |> Seq.distinct |> String.concat "\n"
         
         /// Save the script in '<directory>/.paket/load/<script>'
-        member self.Save (directory:DirectoryInfo) = 
-            directory.Create()
-            let scriptFile = FileInfo (directory.FullName </> self.PartialPath)
+        member self.Save (rootPath:DirectoryInfo) = 
+            rootPath.Create()
+            let scriptFile = FileInfo (rootPath.FullName </> self.PartialPath)
             if verbose then
                 verbosefn "generating script - %s" scriptFile.FullName
             scriptFile.Directory.Create()
-            let text = self.Render directory
+            let text = self.Render rootPath
             File.WriteAllText (scriptFile.FullName, text)
 
 
@@ -249,21 +249,20 @@ module ScriptGeneration =
         
 
     let constructScriptsFromData (depCache:DependencyCache) (groups:GroupName list) providedFrameworks providedScriptTypes =
-        let dependenciesFile = depCache.DependenciesFile
-        let frameworksForDependencyGroups = dependenciesFile.ResolveFrameworksForScriptGeneration()
-        let environmentFramework = FrameworkDetection.resolveEnvironmentFramework
         let lockFile = depCache.LockFile
-
+        let frameworksForDependencyGroups = lockFile.ResolveFrameworksForScriptGeneration()
+        let environmentFramework = FrameworkDetection.resolveEnvironmentFramework
+        
         let groups = 
             if List.isEmpty groups then 
-                dependenciesFile.Groups |> Seq.map (fun kvp -> kvp.Key) |> Seq.toList 
+                lockFile.Groups |> Seq.map (fun kvp -> kvp.Key) |> Seq.toList 
             else 
                 groups
         
         if verbose then
             verbosefn "Generating load scripts for the following groups: %A" (groups |> List.map (fun g -> g.Name.ToString()))
-            verbosefn " - using Paket dependency file: %s" dependenciesFile.FileName
-            verbosefn " - using Packe fock file: %s" lockFile.FileName
+            verbosefn " - using Paket dependency file: %s" depCache.DependenciesFileName
+            verbosefn " - using Packe lock file: %s" lockFile.FileName
 
         let tupleMap f v = (v, f v)
         let failOnMismatch toParse parsed fn message =
diff --git a/src/Paket.Core/PaketConfigFiles/DependenciesFile.fs b/src/Paket.Core/PaketConfigFiles/DependenciesFile.fs
index 75312627bd..414b97bbb1 100644
--- a/src/Paket.Core/PaketConfigFiles/DependenciesFile.fs
+++ b/src/Paket.Core/PaketConfigFiles/DependenciesFile.fs
@@ -714,20 +714,7 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
         FileInfo(Path.Combine(FileInfo(dependenciesFileName).Directory.FullName, Constants.LocalFileName))
 
     /// Find the matching lock file to a dependencies file
-    member this.FindLockfile() = DependenciesFile.FindLockfile this.FileName
-
-
-    member this.ResolveFrameworksForScriptGeneration () = lazy (
-        this.Groups
-        |> Seq.map (fun f -> f.Value.Options.Settings.FrameworkRestrictions)
-        |> Seq.map(fun restrictions ->
-            match restrictions with
-            | Paket.Requirements.AutoDetectFramework -> failwithf "couldn't detect framework"
-            | Paket.Requirements.ExplicitRestriction list ->
-                list.RepresentedFrameworks |> Seq.choose (function TargetProfile.SinglePlatform tf -> Some tf | _ -> None)
-          )
-        |> Seq.concat
-    )
+    member this.FindLockFile() = DependenciesFile.FindLockfile this.FileName
 
 
 type PaketFiles = 
diff --git a/src/Paket.Core/PaketConfigFiles/DependencyCache.fs b/src/Paket.Core/PaketConfigFiles/DependencyCache.fs
index 814536d368..2c04440cbf 100644
--- a/src/Paket.Core/PaketConfigFiles/DependencyCache.fs
+++ b/src/Paket.Core/PaketConfigFiles/DependencyCache.fs
@@ -23,7 +23,7 @@ type ReferenceType =
         | Framework info -> sprintf "Framework: '%s'" info
         | LoadScript info -> sprintf "LoadScript: '%s'" info.FullName
 
-type DependencyCache (dependencyFile:DependenciesFile, lockFile:LockFile) =
+type DependencyCache (dependencyFileName:string, lockFile:LockFile) =
     let loadedGroups = HashSet<GroupName>()
     let mutable nuspecCache = ConcurrentDictionary<PackageName*SemVerInfo, Nuspec>()
     let mutable installModelCache = ConcurrentDictionary<GroupName * PackageName,InstallModel>()
@@ -175,7 +175,7 @@ type DependencyCache (dependencyFile:DependenciesFile, lockFile:LockFile) =
 
 
     member __.LockFile = lockFile
-    member __.DependenciesFile = dependencyFile
+    member __.DependenciesFileName = dependencyFileName
     
     member __.InstallModels () = 
         installModelCache |> Seq.map (fun x -> x.Value) |> List.ofSeq
@@ -236,9 +236,8 @@ type DependencyCache (dependencyFile:DependenciesFile, lockFile:LockFile) =
 
 
     new (dependencyFilePath:string) = 
-        let depFile = DependenciesFile.ReadFromFile dependencyFilePath 
-        let lockFile = depFile.FindLockfile() |> fun path -> path.FullName |> LockFile.LoadFrom
-        DependencyCache (depFile,lockFile)
+        let lockFile = DependenciesFile.FindLockfile dependencyFilePath |> fun path -> path.FullName |> LockFile.LoadFrom
+        DependencyCache (dependencyFilePath,lockFile)
 
  
     member __.InstallModel groupName packageName = tryGet (groupName, packageName)  installModelCache
diff --git a/src/Paket.Core/PaketConfigFiles/LockFile.fs b/src/Paket.Core/PaketConfigFiles/LockFile.fs
index cbe0136d3c..a7d7fcf779 100644
--- a/src/Paket.Core/PaketConfigFiles/LockFile.fs
+++ b/src/Paket.Core/PaketConfigFiles/LockFile.fs
@@ -700,6 +700,19 @@ type LockFile (fileName:string, groups: Map<GroupName,LockFileGroup>) =
         | Some v -> Some(allDependenciesOf v.Name)
         | None -> None
 
+
+    member this.ResolveFrameworksForScriptGeneration () = lazy (
+        this.Groups
+        |> Seq.map (fun f -> f.Value.Options.Settings.FrameworkRestrictions)
+        |> Seq.map(fun restrictions ->
+            match restrictions with
+            | Paket.Requirements.AutoDetectFramework -> failwithf "couldn't detect framework"
+            | Paket.Requirements.ExplicitRestriction list ->
+                list.RepresentedFrameworks |> Seq.choose (function TargetProfile.SinglePlatform tf -> Some tf | _ -> None)
+          )
+        |> Seq.concat
+    )
+
     /// Gets only direct dependencies of the given package in the given group.
     member this.GetDirectDependenciesOfSafe(groupName:GroupName,package,context) =
         let group = groups.[groupName]

From cb8da87d1db3bc0be3e88346988bbd9a27f3c3e4 Mon Sep 17 00:00:00 2001
From: Steffen Forkmann <steffen.forkmann@msu-solutions.de>
Date: Tue, 10 Oct 2017 12:35:52 +0200
Subject: [PATCH 2/3] load scripts should only work on lock file  - fixes #2372

---
 src/Paket.Core/Installation/UpdateProcess.fs        | 6 +++---
 src/Paket.Core/Packaging/PackageMetaData.fs         | 2 +-
 src/Paket.Core/PaketConfigFiles/DependenciesFile.fs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Paket.Core/Installation/UpdateProcess.fs b/src/Paket.Core/Installation/UpdateProcess.fs
index 3710cda399..85a55d9270 100644
--- a/src/Paket.Core/Installation/UpdateProcess.fs
+++ b/src/Paket.Core/Installation/UpdateProcess.fs
@@ -200,7 +200,7 @@ let SelectiveUpdate(dependenciesFile : DependenciesFile, alternativeProjectRoot,
     lockFile,hasChanged,updatedGroups
 
 /// Smart install command
-let SmartInstall(dependenciesFile, updateMode, options : UpdaterOptions) =
+let SmartInstall(dependenciesFile:DependenciesFile, updateMode, options : UpdaterOptions) =
     let lockFile,hasChanged,updatedGroups = SelectiveUpdate(dependenciesFile, options.Common.AlternativeProjectRoot, updateMode, options.Common.SemVerUpdateMode, options.Common.Force)    
 
     let root = Path.GetDirectoryName dependenciesFile.FileName
@@ -230,8 +230,8 @@ let SmartInstall(dependenciesFile, updateMode, options : UpdaterOptions) =
           |> Seq.map (fun g -> g.Name)
           |> Seq.toList
         
-        let rootDir = (DirectoryInfo dependenciesFile.RootPath) 
-        let depCache= DependencyCache(dependenciesFile,lockFile)
+        let rootDir = DirectoryInfo dependenciesFile.RootPath
+        let depCache= DependencyCache(dependenciesFile.FileName,lockFile)
         let scripts = LoadingScripts.ScriptGeneration.constructScriptsFromData depCache groupsToGenerate options.Common.ProvidedFrameworks options.Common.ProvidedScriptTypes
         for script in scripts do
             script.Save rootDir
diff --git a/src/Paket.Core/Packaging/PackageMetaData.fs b/src/Paket.Core/Packaging/PackageMetaData.fs
index f1cb877569..45cd8be9dd 100644
--- a/src/Paket.Core/Packaging/PackageMetaData.fs
+++ b/src/Paket.Core/Packaging/PackageMetaData.fs
@@ -286,7 +286,7 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp
         |> List.fold (fun templatefile file -> addFile (toFile config platform file) targetDir templatefile) withDeps
 
     let lockFile = 
-        dependenciesFile.FindLockfile().FullName
+        dependenciesFile.FindLockFile().FullName
         |> LockFile.LoadFrom
 
     let allReferences = 
diff --git a/src/Paket.Core/PaketConfigFiles/DependenciesFile.fs b/src/Paket.Core/PaketConfigFiles/DependenciesFile.fs
index 414b97bbb1..3cf8806c3f 100644
--- a/src/Paket.Core/PaketConfigFiles/DependenciesFile.fs
+++ b/src/Paket.Core/PaketConfigFiles/DependenciesFile.fs
@@ -139,7 +139,7 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
         let transform (dependenciesFile:DependenciesFile) (group:DependenciesGroup) =
             let getRestrictionList =
                 let projectFrameworks = lazy ( 
-                    let lockFile = dependenciesFile.FindLockfile()
+                    let lockFile = dependenciesFile.FindLockFile()
                     let dir = (lockFile : FileInfo).DirectoryName
                     let projects = ProjectFile.FindAllProjects dir
                     let frameworks = projects |> Array.map ProjectFile.getTargetProfile |> Array.distinct
@@ -741,7 +741,7 @@ type PaketFiles =
 
         let dependenciesFile = findInPath (directory,true) |> DependenciesFile.ReadFromFile
             
-        let file = dependenciesFile.FindLockfile()
+        let file = dependenciesFile.FindLockFile()
         if file.Exists then
             let lockFile = file.FullName |> LockFile.LoadFrom
             DependenciesAndLock(dependenciesFile, lockFile)

From 72f9bb8464a56f499ac253d3f09c47781ad35e7e Mon Sep 17 00:00:00 2001
From: Steffen Forkmann <steffen.forkmann@msu-solutions.de>
Date: Tue, 10 Oct 2017 12:38:02 +0200
Subject: [PATCH 3/3] fix typo

---
 src/Paket.Core/Installation/ScriptGeneration.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Paket.Core/Installation/ScriptGeneration.fs b/src/Paket.Core/Installation/ScriptGeneration.fs
index 2e4cb13b48..cb47f80c66 100644
--- a/src/Paket.Core/Installation/ScriptGeneration.fs
+++ b/src/Paket.Core/Installation/ScriptGeneration.fs
@@ -262,7 +262,7 @@ module ScriptGeneration =
         if verbose then
             verbosefn "Generating load scripts for the following groups: %A" (groups |> List.map (fun g -> g.Name.ToString()))
             verbosefn " - using Paket dependency file: %s" depCache.DependenciesFileName
-            verbosefn " - using Packe lock file: %s" lockFile.FileName
+            verbosefn " - using Paket lock file: %s" lockFile.FileName
 
         let tupleMap f v = (v, f v)
         let failOnMismatch toParse parsed fn message =