Merge branch 'local_file_version' of https://github.com/theimowski/Paket

Author: forki

Diff for: .gitignore

@@ -191,3 +191,4 @@ docs/tools/FSharp.Formatting.svclog
 docs/content/paket.exe
 TestResult.xml
 tests/Paket.Tests/NuGetConfig/PasswordConfig.xml
+paket.local

Diff for: RELEASE_NOTES.md

@@ -1,14 +1,9 @@
-#### 3.9.7 - 01.08.2016
+#### 3.10.0 - 03.08.2016
+* Allow to specify nupkg version for source override in paket.local file - https://github.com/fsprojects/Paket/issues/1803
 * BUGFIX: Allow "auto-restore on" to be done twice - https://github.com/fsprojects/Paket/issues/1836
-
-#### 3.9.6 - 27.07.2016
 * BUGFIX: be careful with distinction between .NET 4.0 client and .NET 4.0 full profile - https://github.com/fsprojects/Paket/issues/1830
-
-#### 3.9.4 - 26.07.2016
 * BUGFIX: Don't allow empty string as description in template file - https://github.com/fsprojects/Paket/pull/1831
-
-#### 3.9.1 - 22.07.2016
-* Respect comments in dependencies file
+* BUGFIX: Respect comments in dependencies file
 
 #### 3.9.0 - 22.07.2016
 * Don't create runtime references for CoreClr anymore - new concept coming soon 

Diff for: docs/content/local-file.md

@@ -85,11 +85,20 @@ Format of git source is the same as used in `paket.dependencies` for specifying
 
     [lang=paket] 
     nuget Fake -> source c:\github\FAKE\bin
+    
+    // Argu is searched in specific version
+    nuget Argu -> source C:\github\Argu\bin version 0.0.0
 
 The Format of the source is the same as in [path sources](nuget-dependencies.html#Path-sources).
 
 > Note: In case of source override, `paket restore` assumes the NuGet package **already exists** in   pointed directory - no build is going to be triggered.
 
+### Nupkg version
+
+If you happen to have a nupkg in local path, but with a different version than in `paket.lock`, you can optionally specify version which should be used for this override.
+One use case might be when the package version is determined by your build server, and nupkgs created locally have zero version.
+This is currently supported only for [Source override](#Source-override). 
+
 ### Groups
 
     [lang=paket]

Diff for: src/Paket.Core/LocalFile.fs

@@ -5,10 +5,11 @@ open Paket.ModuleResolver
 open Paket.PackageSources
 
 type OverriddenPackage =
-    OverriddenPackage of packageName: PackageName * group: GroupName
+    { Name : PackageName
+      Group : GroupName }
 
 type LocalOverride =
-    | LocalSourceOverride of package: OverriddenPackage * devSource: PackageSource
+    | LocalSourceOverride of package: OverriddenPackage * devSource: PackageSource * version: Option<SemVerInfo>
     | LocalGitOverride    of package: OverriddenPackage * gitSource: string
 
 type LocalFile = LocalFile of devSourceOverrides: LocalOverride list
@@ -26,22 +27,24 @@ module LocalFile =
         else 
             None
 
-    let private nameGroup (name, group) = 
+    let nameGroup (name, group) = 
         let group = 
             if group = "" then 
                 Constants.MainDependencyGroup 
             else 
                 GroupName group
-        OverriddenPackage (PackageName name, group)
+        { Name = PackageName name
+          Group = group }
 
     let private parseLine = function
         | Regex 
-            "nuget[ ]+(.*?)([ ]+group[ ]+(.*))?[ ]+->[ ]+(source[ ]+.*)" 
-            [package; _; group; source] ->
+            "^nuget[ ]+(.*?)([ ]+group[ ]+(.*))?[ ]+->[ ]+(source[ ]+.*?)([ ]+version[ ]+(.*))?$" 
+            [package; _; group; source; _; version] ->
+            let v = try SemVer.Parse version |> Some with _ -> None
             source
             |> Trial.Catch PackageSource.Parse
             |> Trial.mapFailure (fun _ -> [sprintf "Cannot parse source '%s'" source])
-            |> Trial.lift (fun s -> LocalSourceOverride (nameGroup(package, group), s))
+            |> Trial.lift (fun s -> LocalSourceOverride (nameGroup(package, group), s, v))
         | Regex 
             "nuget[ ]+(.*?)([ ]+group[ ]+(.*))?[ ]+->[ ]+git[ ]+(.*)"
             [package; _; group; gitSource] ->
@@ -66,35 +69,39 @@ module LocalFile =
 
     let empty = LocalFile []
 
-    let private overrideResolution (packageName, source) resolution = 
+    let private overrideResolution (p, v, source) resolution = 
         resolution
         |> Map.map (fun name original -> 
-            if name = packageName then
-                { original with PackageResolver.ResolvedPackage.Source = source }
+            if name = p then
+                { original with PackageResolver.ResolvedPackage.Source = source
+                                PackageResolver.ResolvedPackage.Version = 
+                                    defaultArg v original.Version }
             else
                 original)
 
     let private warning x =
         match x with
-        | LocalSourceOverride (OverriddenPackage(p,g),s) ->
+        | LocalSourceOverride ({ Name = p; Group = g},s, Some v) ->
+            sprintf "nuget %s group %s -> %s version %s" (p.ToString()) (g.ToString()) (s.ToString()) (v.ToString())
+        | LocalSourceOverride ({ Name = p; Group = g},s, None) ->
             sprintf "nuget %s group %s -> %s" (p.ToString()) (g.ToString()) (s.ToString())
-        | LocalGitOverride   (OverriddenPackage(p,g),s) ->
+        | LocalGitOverride   ({ Name = p; Group = g},s) ->
             sprintf "nuget %s group %s -> %s" (p.ToString()) (g.ToString()) s
         |> (+) "paket.local override: "
         |> Logging.traceWarn
         x
 
     let overrideDependency (lockFile: LockFile) = warning >> function
-        | LocalSourceOverride (OverriddenPackage(p,group),s) -> 
+        | LocalSourceOverride ({ Name = p; Group = group },s,v) -> 
             let groups =
                 lockFile.Groups
                 |> Map.map (fun name g -> 
                     if name = group then 
-                        { g with Resolution = overrideResolution (p,s) g.Resolution }
+                        { g with Resolution = overrideResolution (p,v,s) g.Resolution }
                     else
                         g )
             LockFile(lockFile.FileName, groups)
-        | LocalGitOverride   (OverriddenPackage(p,group),s) ->
+        | LocalGitOverride   ({ Name = p; Group = group},s) ->
             let owner,branch,project,cloneUrl,buildCommand,operatingSystemRestriction,packagePath = 
                 Git.Handling.extractUrlParts s
             let restriction = VersionRestriction.Concrete (defaultArg branch "master")
@@ -130,7 +137,7 @@ module LocalFile =
                 lockFile.Groups
                 |> Map.map (fun name g -> 
                     if name = group then
-                        { g with Resolution  = overrideResolution (p,source g.Name) g.Resolution
+                        { g with Resolution  = overrideResolution (p,None,source g.Name) g.Resolution
                                  RemoteFiles = remoteFile :: g.RemoteFiles } 
                     else
                         g)
@@ -141,6 +148,6 @@ module LocalFile =
 
     let overrides (LocalFile xs) (package, group) =
         xs 
-        |> List.exists (function | LocalSourceOverride (OverriddenPackage(p,g), _)
-                                 | LocalGitOverride    (OverriddenPackage(p,g), _) 
+        |> List.exists (function | LocalSourceOverride ({ Name = p; Group = g}, _, _)
+                                 | LocalGitOverride    ({ Name = p; Group = g}, _) 
                                    -> p = package && g = group)

Diff for: tests/Paket.Tests/LocalFile/LocalFileSpecs.fs

@@ -17,11 +17,10 @@ let ``should parse single dev source override``() =
         """
     let expected = 
         LocalFile [
-            LocalSourceOverride 
-                (OverriddenPackage(
-                    PackageName "NUnit",
-                    GroupName "main"), 
-                 LocalNuGet ("./local_source", None)) 
+            LocalSourceOverride
+                (LocalFile.nameGroup ("NUnit", "main"), 
+                 LocalNuGet ("./local_source", None),
+                 None) 
         ]
         |> Trial.ok
 
@@ -37,10 +36,9 @@ let ``should parse single dev source override in group``() =
     let expected = 
         LocalFile [
             LocalSourceOverride 
-                (OverriddenPackage(
-                    PackageName "NUnit",
-                    GroupName "Build"), 
-                 LocalNuGet ("./local_source", None)) 
+                (LocalFile.nameGroup ("NUnit", "Build"),
+                 LocalNuGet ("./local_source", None),
+                 None) 
         ]
         |> Trial.ok
 
@@ -49,6 +47,23 @@ let ``should parse single dev source override in group``() =
     actual |> shouldEqual expected
 
 
+[<Test>]
+let ``should parse single dev source override with version``() = 
+    let contents = """
+        nuget NUnit -> source ./local_source version 0.0.0
+        """
+    let expected = 
+        LocalFile [
+            LocalSourceOverride 
+                (LocalFile.nameGroup ("NUnit", "main"),
+                 LocalNuGet ("./local_source", None),
+                 Some (SemVer.Zero)) 
+        ]
+        |> Trial.ok
+
+    let actual = LocalFile.parse (toLines contents |> Array.toList)
+
+    actual |> shouldEqual expected
 
 [<Test>]
 let ``should ignore comments``() =