diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 0569e4a521..e6ee609150 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 2.37.2 - 22.12.2015 +#### 2.37.3 - 22.12.2015 * PERFORMANCE: Keep traffic for GetVersions and GetPackageDetails low #### 2.37.1 - 21.12.2015 diff --git a/src/Paket.Core/PackageResolver.fs b/src/Paket.Core/PackageResolver.fs index e430211d37..df2af0ac1a 100644 --- a/src/Paket.Core/PackageResolver.fs +++ b/src/Paket.Core/PackageResolver.fs @@ -245,7 +245,7 @@ let Resolve(groupName:GroupName, sources, getVersionsF, getPackageDetailsF, stra try getPackageDetailsF [preferredSource] dependency.Name version with - | _ -> getPackageDetailsF packageSources dependency.Name version + | _ -> getPackageDetailsF (List.filter (fun x -> x <> preferredSource) packageSources) dependency.Name version let filteredDependencies = DependencySetFilter.filterByRestrictions newRestrictions packageDetails.DirectDependencies @@ -351,7 +351,7 @@ let Resolve(groupName:GroupName, sources, getVersionsF, getPackageDetailsF, stra match currentRequirement.Parent with | PackageRequirementSource.Package(_,_,parentSource) -> Seq.singleton (v,Some parentSource, sources) - | _ -> Seq.singleton (v,None,sources) + | _ -> Seq.singleton (v,Seq.tryHead sources,sources) availableVersions := match currentRequirement.VersionRequirement.Range with