Paket should keep paket.dependencies as stable as possible

src/Paket.Core/Environment.fs

@@ -90,5 +90,5 @@ module PaketEnv =
             let dependenciesFile = 
                 DependenciesFile(
                     Path.Combine(directory.FullName, Constants.DependenciesFileName), 
-                    InstallOptions.Default, [], [], [], [])
+                    InstallOptions.Default, [], [], [], [||])
             dependenciesFile.ToString() |> saveFile dependenciesFile.FileName

src/Paket.Core/FindOutdated.fs

@@ -21,7 +21,7 @@ let private adjustVersionRequirements strict includingPrereleases (dependenciesF
                 | false,false -> VersionRequirement.AllReleases, ResolverStrategy.Max
             { p with VersionRequirement = requirement; ResolverStrategy = strategy})
 
-    DependenciesFile(dependenciesFile.FileName, dependenciesFile.Options, dependenciesFile.Sources, newPackages, dependenciesFile.RemoteFiles, dependenciesFile.Comments)
+    DependenciesFile(dependenciesFile.FileName, dependenciesFile.Options, dependenciesFile.Sources, newPackages, dependenciesFile.RemoteFiles, dependenciesFile.Lines) // TODO: fix me
 
 let private detectOutdated (oldResolution: PackageResolver.PackageResolution) (newResolution: PackageResolver.PackageResolution) =
     [for kv in oldResolution do

src/Paket.Core/NugetConvert.fs

@@ -292,8 +292,16 @@ let createDependenciesFileR (rootDirectory : DirectoryInfo) nugetEnv mode =
 
         sources
         |> lift (fun sources -> 
-            let packages = packages |> List.map (fun (name,v,restr) -> createPackageRequirement (name, v, restr)  sources dependenciesFileName)
-            Paket.DependenciesFile(dependenciesFileName, InstallOptions.Default, sources, packages, [], []))
+            let sourceLines = sources |> List.map (fun s -> DependenciesFileSerializer.sourceString(s.ToString()))
+            let packageLines = 
+                packages 
+                |> List.map (fun (name,v,restr) -> 
+                    let vr = createPackageRequirement (name, v, restr) sources dependenciesFileName
+                    DependenciesFileSerializer.packageString vr.Name vr.VersionRequirement vr.ResolverStrategy vr.Settings)
+
+            let newLines = sourceLines @ [""] @ packageLines |> Seq.toArray
+
+            Paket.DependenciesFile(DependenciesFileParser.parseDependenciesFile dependenciesFileName newLines))
 
     if File.Exists dependenciesFileName then read() else create()
 

src/Paket.Core/Simplifier.fs

@@ -31,11 +31,12 @@ let simplifyDependenciesFile (dependenciesFile : DependenciesFile, flatLookup, i
     let packages = dependenciesFile.Packages |> List.map (fun p -> p.Name)
     let! transitive = findTransitive(packages, flatLookup, DependencyNotFoundInLockFile)
 
-    let newPackages = 
+    return
         dependenciesFile.Packages
-        |> List.filter (fun package -> not <| removePackage(package.Name, transitive, dependenciesFile.FileName, interactive))
-    let d = dependenciesFile
-    return DependenciesFile(d.FileName, d.Options, d.Sources, newPackages, d.RemoteFiles, d.Comments)
+        |> List.fold  (fun (d:DependenciesFile) package ->
+                if removePackage(package.Name, transitive, dependenciesFile.FileName, interactive) then
+                    d.Remove(package.Name)
+                else d) dependenciesFile
 }
 
 let simplifyReferencesFile (refFile, flatLookup, interactive) = trial {

src/Paket/Paket.fsproj

@@ -32,7 +32,7 @@
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>D:\code\Pakettest</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Paketkopie</StartWorkingDirectory>
-    <StartArguments>add nuget fake</StartArguments>
+    <StartArguments>add nuget FSharp.Core</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>D:\code\Pakettest</StartWorkingDirectory>

tests/Paket.Tests/DependenciesFile/AddPackageSpecs.fs

@@ -21,8 +21,8 @@ nuget SignalR = 3.3.2"""
 
 nuget Castle.Windsor-log4net ~> 3.2
 nuget Rx-Main ~> 2.0
-nuget FAKE 1.1
-nuget SignalR 3.3.2
+nuget FAKE = 1.1
+nuget SignalR = 3.3.2
 nuget xunit"""
 
     cfg.ToString()
@@ -42,10 +42,10 @@ nuget SignalR = 3.3.2"""
     let expected = """source http://nuget.org/api/v2
 
 nuget Castle.Windsor-log4net ~> 3.2
-nuget FAKE 1.1
+nuget FAKE = 1.1
 nuget Rx-Main ~> 2.0
 nuget Rz
-nuget SignalR 3.3.2"""
+nuget SignalR = 3.3.2"""
 
     cfg.ToString()
     |> shouldEqual (normalizeLineEndings expected)
@@ -67,7 +67,7 @@ github forki/FsUnit FsUnit.fs"""
 
 nuget Castle.Windsor-log4net ~> 3.2
 nuget Rx-Main ~> 2.0
-nuget FAKE 1.1
+nuget FAKE = 1.1
 nuget NuGet.CommandLine
 nuget xunit
 
@@ -105,7 +105,6 @@ nuget Castle.Windsor-log4net ~> 3.2"""
     let cfg = DependenciesFile.FromCode(config).Add(PackageName "FAKE","1.2")
 
     let expected = """source http://nuget.org/api/v2
-
 nuget Castle.Windsor-log4net ~> 3.2
 nuget FAKE 1.2"""
 
@@ -129,13 +128,14 @@ github forki/FsUnit FsUnit.fs"""
 
 [<Test>]
 let ``should add new packages with nuget package resolution strategy``() = 
-    let config = """"""
+    let config = ""
 
     let cfg = DependenciesFile.FromCode(config).Add(PackageName "FAKE","!~> 1.2")
 
     let expected = """source https://nuget.org/api/v2
 
-nuget FAKE !~> 1.2"""
+nuget FAKE !~> 1.2
+"""
 
     cfg.ToString()
     |> shouldEqual (normalizeLineEndings expected)
@@ -161,4 +161,64 @@ nuget Rx-Main ~> 2.0
 nuget FAKE = 1.1
 nuget SignalR = 3.3.2"""
 
-    DependenciesFile.FromCode(config).Add(PackageName "fAKe","") |> ignore
+    DependenciesFile.FromCode(config).Add(PackageName "fAKe","") |> ignore
+
+[<Test>]
+let ``should keep sources stable``() = 
+    let before = """source https://www.nuget.org/api/v2
+
+nuget quicksilver
+nuget FsCheck
+
+source https://www.nuget.org/api/v3
+
+nuget NUnit"""
+
+    let expected = """source https://www.nuget.org/api/v2
+
+nuget quicksilver
+nuget FsCheck
+
+source https://www.nuget.org/api/v3
+
+nuget NUnit
+nuget FAKE"""
+
+    DependenciesFile.FromCode(before)
+      .Add(PackageName "FAKE","")
+      .ToString()
+    |> shouldEqual (normalizeLineEndings expected)
+
+[<Test>]
+let ``should update packages with new version``() = 
+    let config = """source https://nuget.org/api/v2
+
+nuget FAKE 1.1
+"""
+
+    let cfg = DependenciesFile.FromCode(config).UpdatePackageVersion(PackageName "FAKE","1.2")
+
+    let expected = """source https://nuget.org/api/v2
+
+nuget FAKE 1.2
+"""
+
+    cfg.ToString()
+    |> shouldEqual (normalizeLineEndings expected)
+
+[<Test>]
+let ``should update packages with nuget package resolution strategy``() = 
+    let config = """source https://nuget.org/api/v2
+
+nuget FAKE ~> 1.1
+"""
+
+    let cfg = DependenciesFile.FromCode(config).UpdatePackageVersion(PackageName "FAKE","!~> 1.2")
+
+    let expected = """source https://nuget.org/api/v2
+
+nuget FAKE !~> 1.2
+"""
+
+    cfg.ToString()
+    |> shouldEqual (normalizeLineEndings expected)

tests/Paket.Tests/DependenciesFile/RemovePackageSpecs.fs

@@ -0,0 +1,58 @@
+module paket.dependenciesFile.RemovePackageSpecs
+
+open Paket
+open NUnit.Framework
+open FsUnit
+open TestHelpers
+open Paket.Domain
+
+[<Test>]
+let ``should remove the right package``() = 
+    let config = """source http://nuget.org/api/v2
+
+nuget Castle.Windsor-log4net ~> 3.2
+nuget Rx-Main ~> 2.0
+nuget FAKE = 1.1
+nuget SignalR = 3.3.2"""
+
+    let cfg = DependenciesFile.FromCode(config).Remove(PackageName "FAKE")
+
+    let expected = """source http://nuget.org/api/v2
+
+nuget Castle.Windsor-log4net ~> 3.2
+nuget Rx-Main ~> 2.0
+nuget SignalR = 3.3.2"""
+
+    cfg.ToString()
+    |> shouldEqual (normalizeLineEndings expected)
+
+[<Test>]
+let ``should remove only the correct package``() = 
+    let config = """source http://nuget.org/api/v2
+
+nuget Castle.Windsor-log4net ~> 3.2
+nuget Castle.Windsor ~> 3.2"""
+
+    let cfg = DependenciesFile.FromCode(config).Remove(PackageName "Castle.Windsor")
+
+    let expected = """source http://nuget.org/api/v2
+
+nuget Castle.Windsor-log4net ~> 3.2"""
+
+    cfg.ToString()
+    |> shouldEqual (normalizeLineEndings expected)
+
+[<Test>]
+let ``should keep stable if package doesn't exist``() = 
+    let config = """source http://nuget.org/api/v2
+
+nuget Castle.Windsor-log4net ~> 3.2"""
+
+    let cfg = DependenciesFile.FromCode(config).Remove(PackageName "Castle.Windsor")
+
+    let expected = """source http://nuget.org/api/v2
+
+nuget Castle.Windsor-log4net ~> 3.2"""
+
+    cfg.ToString()
+    |> shouldEqual (normalizeLineEndings expected)

tests/Paket.Tests/DependenciesFile/SaveSpecs.fs

@@ -35,22 +35,6 @@ let ``should serialize strict config``() =
     |> shouldEqual (normalizeLineEndings strictConfig)
 
 
-let configWithNoRestriction = """source http://nuget.org/api/v2
-
-nuget FAKE >= 0"""
-
-let configWithNoRestriction2 = """source http://nuget.org/api/v2
-
-nuget FAKE"""
-
-
-[<Test>]
-let ``should remove >= 0 from config``() = 
-    let cfg = DependenciesFile.FromCode(configWithNoRestriction)
-
-    cfg.ToString()
-    |> shouldEqual (normalizeLineEndings configWithNoRestriction2)
-
 let contentNoneConfig = """redirects: on
 content: none
 source http://nuget.org/api/v2

tests/Paket.Tests/Paket.Tests.fsproj

@@ -176,6 +176,7 @@
     <Compile Include="DependenciesFile\ParserSpecs.fs" />
     <Compile Include="DependenciesFile\SaveSpecs.fs" />
     <Compile Include="DependenciesFile\AddPackageSpecs.fs" />
+    <Compile Include="DependenciesFile\RemovePackageSpecs.fs" />
     <Compile Include="DependenciesFile\DependencyChangesSpecs.fs" />
     <Compile Include="Resolver\DependencyGraphSpecs.fs" />
     <Compile Include="Resolver\SimpleDependenciesSpecs.fs" />

tests/Paket.Tests/Simplifier/BasicScenarioSpecs.fs

@@ -95,3 +95,12 @@ let ``should remove all transitive dependencies from dep file recursively``() =
         depFile.Packages |> List.map (fun p -> p.Name) |> shouldEqual [PackageName"A";PackageName"C"]
         refFiles.Head.NugetPackages |>  shouldEqual [PackageInstallSettings.Default("A"); PackageInstallSettings.Default("C")]
         refFiles.Tail.Head.NugetPackages |>  shouldEqual [PackageInstallSettings.Default("C"); PackageInstallSettings.Default("D")]
+
+        let expected = """
+source http://nuget.org/api/v2
+
+nuget A 1.0
+nuget C 1.0"""
+
+        depFile.ToString()
+        |> shouldEqual (normalizeLineEndings expected)