Be more conservative during paket add and paket remove - fixes #1652

fsprojects · Oct 28, 2016 · 03b7de2 · 03b7de2
1 parent c1ee508
commit 03b7de2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 3.25.1 - 28.10.2016
+* BUGFIX: Be more conservative during paket add and paket remove - https://github.com/fsprojects/Paket/issues/1652
+
 #### 3.25.0 - 28.10.2016
 * Allow to put required paket version into the paket.dependencies file - https://github.com/fsprojects/Paket/pull/1983
 * BUGFIX: Custom print for NugetSourceAuthentication types - https://github.com/fsprojects/Paket/pull/1985

diff --git a/src/Paket.Core/AddProcess.fs b/src/Paket.Core/AddProcess.fs
@@ -24,7 +24,7 @@ let private add installToProjects addToProjectsF dependenciesFileName groupName
             existingDependenciesFile
                 .Add(groupName,package,version)
 
-        let updateMode = PackageResolver.UpdateMode.UpdateFiltered(groupName, PackageFilter.ofName package)
+        let updateMode = PackageResolver.UpdateMode.Install
         let lockFile,hasChanged,updatedGroups = UpdateProcess.SelectiveUpdate(dependenciesFile, updateMode, options.SemVerUpdateMode, options.Force)
         let projects = seq { for p in ProjectFile.FindAllProjects(Path.GetDirectoryName lockFile.FileName) -> p } // lazy sequence in case no project install required
 

diff --git a/src/Paket.Core/RemoveProcess.fs b/src/Paket.Core/RemoveProcess.fs
@@ -35,13 +35,13 @@ let private remove removeFromProjects dependenciesFileName groupName (package: P
         let lockFileName = DependenciesFile.FindLockfile dependenciesFileName
         LockFile.LoadFrom(lockFileName.FullName)
 
-    let dependenciesFile,lockFile,hasChanged =
+    let dependenciesFile,lockFile,_ =
         let exisitingDependenciesFile = DependenciesFile.ReadFromFile dependenciesFileName
         if stillInstalled then exisitingDependenciesFile,oldLockFile,false else
         let dependenciesFile = exisitingDependenciesFile.Remove(groupName,package)
         dependenciesFile.Save()
 
-        let lockFile,hasChanged,_ = UpdateProcess.SelectiveUpdate(dependenciesFile,PackageResolver.UpdateMode.UpdateGroup groupName,SemVerUpdateMode.NoRestriction,force)
+        let lockFile,hasChanged,_ = UpdateProcess.SelectiveUpdate(dependenciesFile,PackageResolver.UpdateMode.Install,SemVerUpdateMode.NoRestriction,force)
         dependenciesFile,lockFile,hasChanged
 
     if installAfter then

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -30,8 +30,8 @@
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartAction>Project</StartAction>
-    <StartArguments>convert-from-nuget</StartArguments>
-    <StartWorkingDirectory>C:\Git\Third Party\Paket\integrationtests\scenarios\i001922-convert-nuget-with-analyzers\before\</StartWorkingDirectory>
+    <StartArguments>remove nuget Autofac</StartArguments>
+    <StartWorkingDirectory>D:\temp\Paket-1652</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>