mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Lock file parsing cleanup

Browse source 
- Handle Package vs package, NuGet puts Package in the lock file
- Handle null package lookups gracefully
This commit is contained in:
David Fowler 2015-10-24 04:32:26 -07:00
parent 3876d2e16a
commit 8ea6607c92
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Microsoft.Extensions.ProjectModel/Graph/LockFileReader.cs
View file

@ -92,7 +92,7 @@ namespace Microsoft.Extensions.ProjectModel.Graph
var type = value.ValueAsString("type")?.Value;
if (type == null || type == "package")
if (type == null || string.Equals(type, "package", StringComparison.OrdinalIgnoreCase))
{
lockFile.PackageLibraries.Add(new LockFilePackageLibrary
{

25
src/Microsoft.Extensions.ProjectModel/ProjectContextBuilder.cs
View file

@ -61,7 +61,7 @@ namespace Microsoft.Extensions.ProjectModel
if (LockFile != null)
{
validLockFile = (LockFile.Version == LockFile.CurrentVersion) && LockFile.IsValidForProject(Project, out lockFileValidationMessage);
validLockFile = LockFile.IsValidForProject(Project, out lockFileValidationMessage);
lockFileLookup = new LockFileLookup(LockFile);
}
@ -169,24 +169,37 @@ namespace Microsoft.Extensions.ProjectModel
{
foreach (var library in target.Libraries)
{
LibraryDescription description = null;
var type = LibraryType.Unspecified;
if (string.Equals(library.Type, "project"))
{
var projectLibrary = lockFileLookup.GetProject(library.Name);
var path = Path.GetFullPath(Path.Combine(ProjectDirectory, projectLibrary.Path));
if (projectLibrary != null)
{
var path = Path.GetFullPath(Path.Combine(ProjectDirectory, projectLibrary.Path));
var projectDescription = projectResolver.GetDescription(library.Name, path, library);
description = projectResolver.GetDescription(library.Name, path, library);
}
libraries.Add(new LibraryKey(projectDescription.Identity.Name), projectDescription);
type = LibraryType.Project;
}
else
{
var packageEntry = lockFileLookup.GetPackage(library.Name, library.Version);
var packageDescription = packageResolver.GetDescription(packageEntry, library);
if (packageEntry != null)
{
description = packageResolver.GetDescription(packageEntry, library);
}
libraries.Add(new LibraryKey(packageDescription.Identity.Name), packageDescription);
type = LibraryType.Package;
}
description = description ?? UnresolvedDependencyProvider.GetDescription(new LibraryRange(library.Name, type), target.TargetFramework);
libraries.Add(new LibraryKey(library.Name), description);
}
}