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

Fixing a migration test where migration was not failing for a unresolved dependency because we were not classifing unresolved dependencies correctly.

Browse source
This commit is contained in:
Livar Cunha 2016-09-26 14:44:08 -07:00 • committed by Livar Cunha
parent f0a50c92ac
commit 2acd4474de
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs
View file

@ -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))
{

1
src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateProjectDependenciesRule.cs
View file

@ -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;

23
src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs
View file

@ -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<ProjectLibraryDependency>(),
@ -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;
}
}
}
}