Fix pinning of packages not properly handled by the resolver #2307
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ndencies as well.
… to the resolution.
| @@ -229,6 229,7 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr | |||
| RemoteDownload.DownloadSourceFiles(Path.GetDirectoryName fileName, groupName, force, remoteFiles) | |||
|
|
|||
| // Step 1 Package resolution | |||
There was a problem hiding this comment.
let's call this something other than step 1 & step 2, it's already confusing enough with all the other steps
matthid
commented
Apr 30, 2017
| | Some d -> d.Settings | ||
| | None -> p.Settings }) | ||
| |> fun des -> Seq.append des runtimeDeps | ||
| |> Seq.distinctBy (fun p -> p.Name) |> Set.ofSeq |
There was a problem hiding this comment.
This part seems to be quite slow as it takes quite a while after Trying to find a valid resolution considering runtime dependencies... has been printed until the second resolution starts...
src/Paket/Paket.fsproj
Outdated
| <StartArguments>install</StartArguments> | ||
| <StartWorkingDirectory>C:\PROJ\Paket\integrationtests\scenarios\i001145-excludes\temp</StartWorkingDirectory> | ||
| <StartArguments>update</StartArguments> | ||
| <StartWorkingDirectory>C:\PROJ\Paket\integrationtests\scenarios\i002294-pin-netstandard-1-6\temp</StartWorkingDirectory> |
|
aside from some superficial cleanup LGTM |
…olution (for example to workaround problems or compare performance of the resolution algorithm with older versions of paket)
matthid
commented
Apr 30, 2017
| @@ -693,7 713,7 @@ let Resolve (getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrate | |||
| currentStep.CurrentResolution.Count | |||
| (currentStep.CurrentResolution |> Seq.map (fun x -> sprintf "\n - %O, %O" x.Key x.Value.Version) |> String.Concat) | |||
| currentStep.OpenRequirements.Count | |||
| (currentStep.OpenRequirements |> Seq.map (fun x -> sprintf "\n - %O, %O" x.Parent x.VersionRequirement) |> String.Concat) | |||
| (currentStep.OpenRequirements |> Seq.map (fun x -> sprintf "\n - %O, %O (from %O)" x.Name x.VersionRequirement x.Parent) |> String.Concat) | |||
There was a problem hiding this comment.
@cloudRoutine what about this?
matthid
changed the title
This was referenced Apr 30, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I got started by the test of @0x53A, therefore this was done on top of his branch and contains #2305.
Fixes #2294
Edit: Its actually OK to have this in the same PR because #2294 was the underlying issue the runtime solution didn't work out. So this actually first allows the workaround to "work" by applying the correct settings to the runtime resolution. At the same time it fixes #2294 itself (therefore a separate PR)