diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3e75aa5b45..fe894a9c14 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 2.50.6 - 12.02.2016 +* Keep Auth from dependencies file for fast path - https://github.com/fsprojects/Paket/issues/1469 + #### 2.50.5 - 11.02.2016 * Fix Platform matching bug in CPP projects - https://github.com/fsprojects/Paket/issues/1467 diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 712f533437..9f98bcc4b7 100644 --- 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.50.5")] -[assembly: AssemblyFileVersionAttribute("2.50.5")] -[assembly: AssemblyInformationalVersionAttribute("2.50.5")] +[assembly: AssemblyVersionAttribute("2.50.6")] +[assembly: AssemblyFileVersionAttribute("2.50.6")] +[assembly: AssemblyInformationalVersionAttribute("2.50.6")] namespace System { internal static class AssemblyVersionInformation { - internal const string Version = "2.50.5"; + internal const string Version = "2.50.6"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 94e277f574..af0bfe47ba 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "2.50.5" + let [] Version = "2.50.6" diff --git a/src/Paket.Core/DependencyChangeDetection.fs b/src/Paket.Core/DependencyChangeDetection.fs index 8302f17ef5..bd161615f3 100644 --- a/src/Paket.Core/DependencyChangeDetection.fs +++ b/src/Paket.Core/DependencyChangeDetection.fs @@ -159,7 +159,14 @@ let findRemoteFileChangesInDependenciesFile(dependenciesFile:DependenciesFile,lo |> Seq.concat |> Set.ofSeq -let GetPreferredNuGetVersions (oldLockFile:LockFile) = - oldLockFile.GetGroupedResolution() - |> Seq.map (fun kv -> kv.Key, (kv.Value.Version, kv.Value.Source)) +let GetPreferredNuGetVersions (dependenciesFile:DependenciesFile,lockFile:LockFile) = + lockFile.GetGroupedResolution() + |> Seq.map (fun kv -> + let lockFileSource = kv.Value.Source + match dependenciesFile.Groups |> Map.tryFind (fst kv.Key) with + | None -> kv.Key, (kv.Value.Version, lockFileSource) + | Some group -> + match group.Sources |> List.tryFind (fun s -> s.Url = lockFileSource.Url) with + | Some s -> kv.Key, (kv.Value.Version, s) + | None -> kv.Key, (kv.Value.Version, kv.Value.Source)) |> Map.ofSeq diff --git a/src/Paket.Core/UpdateProcess.fs b/src/Paket.Core/UpdateProcess.fs index b399d913a2..2ad58f23c6 100644 --- a/src/Paket.Core/UpdateProcess.fs +++ b/src/Paket.Core/UpdateProcess.fs @@ -121,7 +121,7 @@ let selectiveUpdate force getSha1 getSortedVersionsF getPackageDetailsF (lockFil nuGetChanges,groups let preferredVersions = - DependencyChangeDetection.GetPreferredNuGetVersions lockFile + DependencyChangeDetection.GetPreferredNuGetVersions(dependenciesFile,lockFile) |> Map.map (fun k (v,s) -> v,[s]) let getVersionsF sources resolverStrategy groupName packageName = diff --git a/src/Paket.PowerShell/AssemblyInfo.fs b/src/Paket.PowerShell/AssemblyInfo.fs index abc6485fe5..00db43db68 100644 --- a/src/Paket.PowerShell/AssemblyInfo.fs +++ b/src/Paket.PowerShell/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "2.50.5" + let [] Version = "2.50.6" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index a54d7810c4..0448736b94 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "2.50.5" + let [] Version = "2.50.6" diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index f61042bdc4..4f6bab9660 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -50,7 +50,7 @@ pack -v output "D:\code\Paket\integrationtests\scenarios\i001376-pack-template\temp\out" templatefile "D:\code\Paket\integrationtests\scenarios\i001376-pack-template\temp\PaketBug\paket.template" pack -v output D:\code\Paket\integrationtests\scenarios\i001429-pack-deps\temp\out pack output "out/nuget" version 0.9.3 releaseNotes "[LanguageExtensions][New] New Ensure methods with exception parameter." include-referenced-projects - update + update nuget Darkseid version 0.3.0 Project paket.exe c:\code\Paketkopie @@ -61,7 +61,7 @@ D:\code\Paket\integrationtests\scenarios\i001270-net461\temp C:\code\restore D:\code\Paket\integrationtests\scenarios\i001450-twiddle-wakka\temp - D:\code\paket-issue-repro + D:\code\Paket-issue-1469 pdbonly diff --git a/tests/Paket.Tests/DependenciesFile/DependencyChangesSpecs.fs b/tests/Paket.Tests/DependenciesFile/DependencyChangesSpecs.fs index fdcef6f283..f3dff87171 100644 --- a/tests/Paket.Tests/DependenciesFile/DependencyChangesSpecs.fs +++ b/tests/Paket.Tests/DependenciesFile/DependencyChangesSpecs.fs @@ -62,7 +62,7 @@ nuget Castle.Windsor-log4net""" let lockFile = LockFile.Parse("",toLines lockFileData) let changedDependencies = DependencyChangeDetection.findNuGetChangesInDependenciesFile(cfg,lockFile) - let newDependencies = DependencyChangeDetection.GetPreferredNuGetVersions lockFile + let newDependencies = DependencyChangeDetection.GetPreferredNuGetVersions(cfg,lockFile) newDependencies |> Map.filter (fun k v -> not <| changedDependencies.Contains(k)) |> shouldEqual Map.empty @@ -100,7 +100,7 @@ nuget NUnit""" let lockFile = LockFile.Parse("",toLines lockFileData) let changedDependencies = DependencyChangeDetection.findNuGetChangesInDependenciesFile(cfg,lockFile) - let newDependencies = DependencyChangeDetection.GetPreferredNuGetVersions lockFile + let newDependencies = DependencyChangeDetection.GetPreferredNuGetVersions (cfg,lockFile) let expected = Map.ofList [(Constants.MainDependencyGroup,PackageName "Castle.Core"), (SemVer.Parse "3.3.3"); @@ -148,7 +148,7 @@ nuget Castle.Windsor-log4net >= 3.3.0""" let lockFile = LockFile.Parse("",toLines lockFileData) let changedDependencies = DependencyChangeDetection.findNuGetChangesInDependenciesFile(cfg,lockFile) - let newDependencies = DependencyChangeDetection.GetPreferredNuGetVersions lockFile + let newDependencies = DependencyChangeDetection.GetPreferredNuGetVersions (cfg,lockFile) let expected = Map.ofList ([(Constants.MainDependencyGroup,PackageName "Castle.Core"), (SemVer.Parse "3.3.3"); @@ -195,7 +195,7 @@ nuget Castle.Windsor-log4net >= 3.4.0""" let lockFile = LockFile.Parse("",toLines lockFileData) let changedDependencies = DependencyChangeDetection.findNuGetChangesInDependenciesFile(cfg,lockFile) - let newDependencies = DependencyChangeDetection.GetPreferredNuGetVersions lockFile + let newDependencies = DependencyChangeDetection.GetPreferredNuGetVersions (cfg,lockFile) newDependencies |> Map.filter (fun k v -> not <| changedDependencies.Contains(k)) |> shouldEqual Map.empty