diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs index 4be944cae..6f1522b56 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs @@ -60,6 +60,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration 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) && !preResolvedProjects.Contains(projectExportName)) { diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateProjectDependenciesRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateProjectDependenciesRule.cs index 9386c8fa4..5528b5e3a 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateProjectDependenciesRule.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateProjectDependenciesRule.cs @@ -8,7 +8,6 @@ using System.Linq; using Microsoft.Build.Construction; using Microsoft.DotNet.ProjectJsonMigration.Transforms; using Microsoft.DotNet.ProjectModel; -using Microsoft.DotNet.ProjectModel.Graph; using Microsoft.DotNet.Tools.Common; using NuGet.Frameworks; diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs index 63221b108..227c7b8e7 100644 --- a/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs +++ b/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.ProjectModel.Resolution new LibraryIdentity( libraryDependency.Name, libraryDependency.LibraryRange.VersionRange?.MinVersion, - LibraryType.Unresolved), + libraryDependency.LibraryRange.TypeConstraint == LibraryDependencyTarget.Project ? LibraryType.Project : LibraryType.Unresolved), hash: null, path: null, dependencies: Enumerable.Empty(), @@ -23,5 +23,26 @@ namespace Microsoft.DotNet.ProjectModel.Resolution resolved: false, 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; + } + } } }