Use registration data from normalized NuGet version - fixes #1387

fsprojects · Jan 14, 2016 · 3e0bab5 · 3e0bab5
1 parent f1cb827
commit 3e0bab5
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 37 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,20 +1,10 @@
-#### 2.42.7 - 13.01.2016
-* PERFORMANCE: Fix issue with bad performance - https://github.com/fsprojects/Paket/issues/1387
-
-#### 2.42.6 - 13.01.2016
-* BUGFIX: Fix path issue
-
-#### 2.42.5 - 13.01.2016
-* USABILITY: Fail if credentials are invalid - https://github.com/fsprojects/Paket/issues/1382
-
-#### 2.42.4 - 12.01.2016
+#### 2.43.0 - 14.01.2016
+* BUGFIX: Use registration data from normalized NuGet version - https://github.com/fsprojects/Paket/issues/1387
 * BUGFIX: $(SolutionDir) in ProjectReference include attribute will be parsed - https://github.com/fsprojects/Paket/issues/1377
-
-#### 2.42.3 - 11.01.2016
 * BUGFIX: Restore groups sequentially - https://github.com/fsprojects/Paket/issues/1371
-
-#### 2.42.1 - 10.01.2016
-* PERFORMANCE: Try relaxed resolver only when there is a chance
+* PERFORMANCE: Fix issue with bad performance - https://github.com/fsprojects/Paket/issues/1387
+* PERFORMANCE: Try relaxed resolver only when there is a chance to succeed
+* USABILITY: Fail if credentials are invalid - https://github.com/fsprojects/Paket/issues/1382
 
 #### 2.42.0 - 10.01.2016
 * Nemerle projects support

diff --git a/integrationtests/Paket.IntegrationTests/NuGetV3Specs.fs b/integrationtests/Paket.IntegrationTests/NuGetV3Specs.fs
@@ -19,4 +19,11 @@ let ``#1211 update with V3 API should work exactly like V2 API``() =
     |> shouldEqual 
         (lockFileV2.ToString().Replace("remote: https://www.nuget.org/api/v2", "remote: http://api.nuget.org/v3/index.json"))
     lockFileV3.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "FsLexYacc.Runtime"].Version
-    |> shouldBeGreaterThan (SemVer.Parse "6")
+    |> shouldBeGreaterThan (SemVer.Parse "6")
+
+[<Test>]
+let ``#1387 update package in v3``() =
+    update "i001387-nugetv3" |> ignore
+    let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001387-nugetv3","paket.lock"))
+    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Bender"].Version
+    |> shouldEqual (SemVer.Parse "3.0.29.0")
diff --git a/integrationtests/scenarios/i001387-nugetv3/before/paket.dependencies b/integrationtests/scenarios/i001387-nugetv3/before/paket.dependencies
@@ -1,4 +1,3 @@
-git https://github.com/forki/nupkgtest.git 2.0.0 build:"build.cmd", Packages: /source/, OS:windows
-git https://github.com/forki/nupkgtest.git 2.0.0 build:"build.sh", Packages: /source/, OS:mono
+source https://api.nuget.org/v3/index.json
 
-nuget Argu
+nuget Bender 3.0.29.0
diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs
@@ -4,11 +4,11 @@
 [assembly: AssemblyTitleAttribute("Paket.Bootstrapper")]
 [assembly: AssemblyProductAttribute("Paket")]
 [assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")]
-[assembly: AssemblyVersionAttribute("2.42.7")]
-[assembly: AssemblyFileVersionAttribute("2.42.7")]
-[assembly: AssemblyInformationalVersionAttribute("2.42.7")]
+[assembly: AssemblyVersionAttribute("2.43.0")]
+[assembly: AssemblyFileVersionAttribute("2.43.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.43.0")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.42.7";
+        internal const string Version = "2.43.0";
     }
 }
diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("Paket")>]
 [<assembly: AssemblyCompanyAttribute("Paket team")>]
 [<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
-[<assembly: AssemblyVersionAttribute("2.42.7")>]
-[<assembly: AssemblyFileVersionAttribute("2.42.7")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.42.7")>]
+[<assembly: AssemblyVersionAttribute("2.43.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.43.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("2.43.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.42.7"
+    let [<Literal>] Version = "2.43.0"
diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs
@@ -461,7 +461,6 @@ let GetPackageDetails root force (sources:PackageSource list) packageName (versi
 
     let getPackageDetails force =
         sources
-        |> List.sortBy (fun x -> x.Url.ToLower().Contains "nuget.org" |> not)
         |> List.map (fun source -> async {
             try 
                 match source with

diff --git a/src/Paket.Core/NuGetV3.fs b/src/Paket.Core/NuGetV3.fs
@@ -187,7 +187,7 @@ type Catalog =
 let getRegistration (source : NugetV3Source) (packageName:PackageName) (version:SemVerInfo) =
     async {
         let! registrationUrl = PackageSources.getNuGetV3Resource source Registration
-        let url = sprintf "%s%s/%s.json" registrationUrl (packageName.ToString().ToLower()) version.AsString
+        let url = sprintf "%s%s/%s.json" registrationUrl (packageName.ToString().ToLower()) (version.Normalize())
         let! rawData = safeGetFromUrl (source.Authentication |> Option.map toBasicAuth, url, acceptJson)
         return
             match rawData with

diff --git a/src/Paket.PowerShell/AssemblyInfo.fs b/src/Paket.PowerShell/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("Paket")>]
 [<assembly: AssemblyCompanyAttribute("Paket team")>]
 [<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
-[<assembly: AssemblyVersionAttribute("2.42.7")>]
-[<assembly: AssemblyFileVersionAttribute("2.42.7")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.42.7")>]
+[<assembly: AssemblyVersionAttribute("2.43.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.43.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("2.43.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.42.7"
+    let [<Literal>] Version = "2.43.0"
diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("Paket")>]
 [<assembly: AssemblyCompanyAttribute("Paket team")>]
 [<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
-[<assembly: AssemblyVersionAttribute("2.42.7")>]
-[<assembly: AssemblyFileVersionAttribute("2.42.7")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.42.7")>]
+[<assembly: AssemblyVersionAttribute("2.43.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.43.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("2.43.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.42.7"
+    let [<Literal>] Version = "2.43.0"