From 43d57e438e159c9c836d2bcb5cf402e4337dcfc6 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Fri, 22 Jan 2016 10:22:53 -0800 Subject: [PATCH] adjust lock file check to handle NuGet-style lock file fixes #970 --- .../Graph/LockFile.cs | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs index 330638c64..cacd22cc1 100644 --- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs +++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs @@ -60,7 +60,9 @@ namespace Microsoft.DotNet.ProjectModel.Graph // If the framework name is empty, the associated dependencies are shared by all frameworks if (group.FrameworkName == null) { - actualDependencies = project.Dependencies.Select(RenderDependency).OrderBy(x => x); + actualDependencies = project.Dependencies + .Select(RenderDependency) + .OrderBy(x => x, StringComparer.OrdinalIgnoreCase); } else { @@ -71,7 +73,9 @@ namespace Microsoft.DotNet.ProjectModel.Graph return false; } - actualDependencies = framework.Dependencies.Select(RenderDependency).OrderBy(x => x); + actualDependencies = framework.Dependencies + .Select(RenderDependency) + .OrderBy(x => x, StringComparer.OrdinalIgnoreCase); } if (!actualDependencies.SequenceEqual(expectedDependencies)) @@ -84,16 +88,6 @@ namespace Microsoft.DotNet.ProjectModel.Graph return true; } - private string RenderDependency(LibraryRange arg) - { - var name = arg.Name; - - if (arg.Target == LibraryType.ReferenceAssembly) - { - name = $"fx/{name}"; - } - - return $"{name} {VersionUtility.RenderVersion(arg.VersionRange)}"; - } + private string RenderDependency(LibraryRange arg) => $"{arg.Name} {VersionUtility.RenderVersion(arg.VersionRange)}"; } } \ No newline at end of file