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

Change the line number for version conflcits

Browse source 
- Use the project.json that caused the conflict
This commit is contained in:
David Fowler 2015-11-08 10:22:09 -08:00
parent b343d121a3
commit cb471485a9
1 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs
View file

@ -39,7 +39,7 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
} }
var dependencies = new Dictionary<string, List<DependencyItem>>(); var dependencies = new Dictionary<string, List<DependencyItem>>();
var topLevel = new List<LibraryDescription>(); var topLevel = new List<LibraryItem>();
foreach (var library in GetLibraries()) foreach (var library in GetLibraries())
{ {
@ -101,7 +101,7 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
continue; continue;
} }
topLevel.Add(library); topLevel.Add(new LibraryItem(range, library));
// If we ended up with a declared version that isn't what was asked for directly // If we ended up with a declared version that isn't what was asked for directly
// then report a warning // then report a warning
@ -129,8 +129,15 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
} }
// Version conflicts // Version conflicts
foreach (var library in topLevel) foreach (var libraryItem in topLevel)
{ {
var library = libraryItem.Library;
if (library.Identity.Type != LibraryType.Package)
{
continue;
}
List<DependencyItem> items; List<DependencyItem> items;
if (dependencies.TryGetValue(library.Identity.Name, out items)) if (dependencies.TryGetValue(library.Identity.Name, out items))
{ {
@ -138,7 +145,7 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
{ {
var versionRange = item.Dependency.VersionRange; var versionRange = item.Dependency.VersionRange;
if (versionRange == null || item.Dependency.Target != LibraryType.Package) if (versionRange == null)
{ {
continue; continue;
} }
@ -150,10 +157,17 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
if (item.Library != library && !versionRange.Satisfies(library.Identity.Version)) if (item.Library != library && !versionRange.Satisfies(library.Identity.Version))
{ {
var errorCode = ErrorCodes.NU1012;
var message = $"Dependency conflict. {item.Library.Identity} expected {FormatLibraryRange(item.Dependency)} but got {library.Identity.Version}"; var message = $"Dependency conflict. {item.Library.Identity} expected {FormatLibraryRange(item.Dependency)} but got {library.Identity.Version}";
AddDiagnostics(messages, item.Library, message, DiagnosticMessageSeverity.Warning, errorCode); messages.Add(
new DiagnosticMessage(
ErrorCodes.NU1012,
message,
libraryItem.RequestedRange.SourceFilePath,
DiagnosticMessageSeverity.Warning,
libraryItem.RequestedRange.SourceLine,
libraryItem.RequestedRange.SourceColumn,
library));
} }
} }
} }
@ -230,5 +244,17 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
Library = library; Library = library;
} }
} }
private struct LibraryItem
{
public LibraryRange RequestedRange { get; private set; }
public LibraryDescription Library { get; private set; }
public LibraryItem(LibraryRange requestedRange, LibraryDescription library)
{
RequestedRange = requestedRange;
Library = library;
}
}
} }
} }