Ported PR from mrahl from nuget/nuget-3#26

Merged

deepakaravindr merged 2 commits intoNuGet.Client.Mergefrom daravind/PR_from_mrahl

Oct 13, 2015

+101

Commits on Oct 13, 2015

Added test for resolving versions when updating dependency package in a diamond dependency graph that requires multiple package updates (scenario failing on NuGet 2.8.5)

mrahl
authored and
deepakaravindr
committed
Updated test to match the latest PackageResolver.Resolve
deepakaravindr
committed