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

let RID detection do its thing

Browse source 
also:
* fix up pjvalidate to handle versionless deps
* fix up package-command-test
This commit is contained in:
Andrew Stanton-Nurse 2016-01-12 08:46:33 -08:00
parent 4344af3c1b
commit 845f2c56e6
11 changed files with 50 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/MultiProjectValidator/AnalysisRules/DependencyMismatch/DependencyInfo.cs
View file

@ -1,4 +1,5 @@
using Microsoft.DotNet.ProjectModel;
using System;
using Microsoft.DotNet.ProjectModel;
namespace MultiProjectValidator.AnalysisRules.DependencyMismatch
{
@ -9,7 +10,7 @@ namespace MultiProjectValidator.AnalysisRules.DependencyMismatch
return new DependencyInfo
{
ProjectPath = context.ProjectFile.ProjectFilePath,
Version = library.Identity.Version.ToString(),
Version = library.Identity.Version?.ToString() ?? String.Empty,
Name = library.Identity.Name
};
}

10
tools/MultiProjectValidator/AnalysisRules/DependencyMismatchRule.cs
View file

@ -70,11 +70,11 @@ namespace MultiProjectValidator.AnalysisRules
StringBuilder sb = new StringBuilder();
sb.Append($"Conflict for {dependencyGroup.DependencyName} in projects:{Environment.NewLine}");
foreach (var version in dependencyGroup.VersionDependencyInfoMap.Keys)
{
var dependencyInfoList = dependencyGroup.VersionDependencyInfoMap[version];
foreach (var dependencyInfo in dependencyInfoList)
{
sb.Append($"Version: {dependencyInfo.Version} Path: {dependencyInfo.ProjectPath} {Environment.NewLine}");
@ -134,12 +134,8 @@ namespace MultiProjectValidator.AnalysisRules
}
}
}
return libraryNameDependencyGroupMap.Values.ToList();
}
}
}