Fixing a migration test where migration was not failing for a unresolved dependency because we were not classifing unresolved dependencies correctly.
This commit is contained in:
parent
f0a50c92ac
commit
2acd4474de
3 changed files with 23 additions and 2 deletions
|
@ -60,6 +60,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration
|
||||||
|
|
||||||
if (!possibleProjectDependencies.TryGetValue(projectExportName, out projectDependency))
|
if (!possibleProjectDependencies.TryGetValue(projectExportName, out projectDependency))
|
||||||
{
|
{
|
||||||
|
Console.WriteLine($"Don't have it: {projectExportName} {projectExport.Library.Identity.Type}");
|
||||||
if (projectExport.Library.Identity.Type.Equals(LibraryType.Project)
|
if (projectExport.Library.Identity.Type.Equals(LibraryType.Project)
|
||||||
&& !preResolvedProjects.Contains(projectExportName))
|
&& !preResolvedProjects.Contains(projectExportName))
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,7 +8,6 @@ using System.Linq;
|
||||||
using Microsoft.Build.Construction;
|
using Microsoft.Build.Construction;
|
||||||
using Microsoft.DotNet.ProjectJsonMigration.Transforms;
|
using Microsoft.DotNet.ProjectJsonMigration.Transforms;
|
||||||
using Microsoft.DotNet.ProjectModel;
|
using Microsoft.DotNet.ProjectModel;
|
||||||
using Microsoft.DotNet.ProjectModel.Graph;
|
|
||||||
using Microsoft.DotNet.Tools.Common;
|
using Microsoft.DotNet.Tools.Common;
|
||||||
using NuGet.Frameworks;
|
using NuGet.Frameworks;
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace Microsoft.DotNet.ProjectModel.Resolution
|
||||||
new LibraryIdentity(
|
new LibraryIdentity(
|
||||||
libraryDependency.Name,
|
libraryDependency.Name,
|
||||||
libraryDependency.LibraryRange.VersionRange?.MinVersion,
|
libraryDependency.LibraryRange.VersionRange?.MinVersion,
|
||||||
LibraryType.Unresolved),
|
libraryDependency.LibraryRange.TypeConstraint == LibraryDependencyTarget.Project ? LibraryType.Project : LibraryType.Unresolved),
|
||||||
hash: null,
|
hash: null,
|
||||||
path: null,
|
path: null,
|
||||||
dependencies: Enumerable.Empty<ProjectLibraryDependency>(),
|
dependencies: Enumerable.Empty<ProjectLibraryDependency>(),
|
||||||
|
@ -23,5 +23,26 @@ namespace Microsoft.DotNet.ProjectModel.Resolution
|
||||||
resolved: false,
|
resolved: false,
|
||||||
compatible: true);
|
compatible: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static LibraryType GetLibraryTypeFromLibraryDependencyTarget(LibraryDependencyTarget target)
|
||||||
|
{
|
||||||
|
switch(target)
|
||||||
|
{
|
||||||
|
case LibraryDependencyTarget.Package:
|
||||||
|
return LibraryType.Package;
|
||||||
|
case LibraryDependencyTarget.Project:
|
||||||
|
return LibraryType.Project;
|
||||||
|
case LibraryDependencyTarget.Reference:
|
||||||
|
return LibraryType.Reference;
|
||||||
|
case LibraryDependencyTarget.Assembly:
|
||||||
|
return LibraryType.Assembly;
|
||||||
|
case LibraryDependencyTarget.ExternalProject:
|
||||||
|
return LibraryType.ExternalProject;
|
||||||
|
case LibraryDependencyTarget.WinMD:
|
||||||
|
return LibraryType.WinMD;
|
||||||
|
default:
|
||||||
|
return LibraryType.Unresolved;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue