Skip to content

Allow transitive deps - fixes #2557 #2559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 22 commits into from
Jul 28, 2017
Merged

Allow transitive deps - fixes #2557 #2559

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d433394
add test cases
matthid Jul 26, 2017
39a60cf
Allow transitive deps - fixes #2557
forki Jul 26, 2017
754788f
Merge branch 'fix_prereleases' of https://github.com/fsprojects/Paket…
forki Jul 26, 2017
b35d2dd
typo
forki Jul 26, 2017
11a3416
fix compile error
forki Jul 26, 2017
c1f3d0e
Update test
forki Jul 27, 2017
236ed4c
fix test definition
forki Jul 27, 2017
b8db3fe
Check transitive deps
forki Jul 27, 2017
f4d1543
add some more tests
matthid Jul 27, 2017
f1ecbaf
break transitivity
forki Jul 27, 2017
5c58978
add more tests
matthid Jul 27, 2017
079e97b
Merge branch 'transitiveprereleases' of github.com:fsprojects/Paket i…
matthid Jul 27, 2017
52ec16b
break transitivity
forki Jul 27, 2017
4181cc6
break transitivity
forki Jul 27, 2017
5c4453f
break transitivity
forki Jul 27, 2017
0d1b1de
change test
matthid Jul 27, 2017
d93566b
Merge branch 'transitiveprereleases' of github.com:fsprojects/Paket i…
matthid Jul 27, 2017
f9a47c6
Transitives
forki Jul 27, 2017
d16a650
Transitives
forki Jul 27, 2017
6a5ce56
Transitives
forki Jul 27, 2017
5d607c5
fix tests
forki Jul 27, 2017
d515c5e
restore rc tests
forki Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/Paket.Core/Dependencies/PackageResolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ let calcOpenRequirements (exploredPackage:ResolvedPackage,globalFrameworkRestric
VersionRequirement = v
Parent = Package(dependency.Name, versionToExplore, exploredPackage.Source)
Graph = Set.add dependency dependency.Graph
TransitivePrereleases = dependency.TransitivePrereleases && v.PreReleases <> PreReleaseStatus.No
TransitivePrereleases = dependency.TransitivePrereleases && exploredPackage.Version.PreRelease.IsSome
Settings = { dependency.Settings with FrameworkRestrictions = newRestrictions } })
|> Set.filter (fun d ->
resolverStep.ClosedRequirements
Expand Down Expand Up @@ -526,10 +526,21 @@ let private getCompatibleVersions
compatibleVersions, true
elif Seq.isEmpty compatibleVersions then
let prereleaseStatus (r:PackageRequirement) =
if r.Parent.IsRootRequirement() && r.VersionRequirement <> VersionRequirement.AllReleases then
match r.Parent with
| DependenciesFile _ when r.VersionRequirement <> VersionRequirement.AllReleases ->
r.VersionRequirement.PreReleases
else
PreReleaseStatus.All
| Package (_,v,_) ->
match v.PreRelease with
| Some _ -> PreReleaseStatus.All
| _ ->
let allowTransitivePreleases =
(currentStep.ClosedRequirements |> Set.exists (fun r2 -> r2.TransitivePrereleases && r2.Name = r.Name)) ||
(currentStep.OpenRequirements |> Set.exists (fun r2 -> r2.TransitivePrereleases && r2.Name = r.Name))
if allowTransitivePreleases then
PreReleaseStatus.All
else
r.VersionRequirement.PreReleases
| _ -> PreReleaseStatus.All

let available = availableVersions |> Seq.toList
let prereleases = List.filter (isInRange (fun r -> r.IncludingPrereleases(prereleaseStatus r))) available
Expand Down
6 changes: 3 additions & 3 deletions tests/Paket.Tests/Resolver/PrereleaseSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ let ``should fail resolution when only prerelease is available in transitives``(
"packageA","1.1-alpha",["packageB", VersionRequirement(VersionRange.AtLeast("1.1-alpha"),PreReleaseStatus.All)]
"packageB","1.0",[]
"packageB","1.1",["packageC", VersionRequirement(VersionRange.Between("1.1", "2.0"),PreReleaseStatus.No)]
"packageC","1.0",[]
"packageC","1.1-alpha",[]
]

Expand All @@ -233,9 +234,8 @@ nuget PackageA prerelease
"""
let cfg = DependenciesFile.FromSource(config)
try
ResolveWithGraph(cfg,noSha1, VersionsFromGraphAsSeq graph, PackageDetailsFromGraph graph).[Constants.MainDependencyGroup].ResolvedPackages.GetModelOrFail()
|> ignore
Assert.Fail ("Expected resolution to fail")
let resolved = ResolveWithGraph(cfg,noSha1, VersionsFromGraphAsSeq graph, PackageDetailsFromGraph graph).[Constants.MainDependencyGroup].ResolvedPackages.GetModelOrFail()
Assert.Fail (sprintf "Expected resolution to fail but got %A" resolved)
with
| :? NUnit.Framework.AssertionException -> reraise()
| :? System.AggregateException as agg -> ()
Expand Down