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

ensure dotnet-build can see projects under packages

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2016-04-13 13:45:35 -07:00
parent 2956446864
commit 362397a945
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/dotnet/commands/dotnet-build/CompileContext.cs
View file

@ -12,6 +12,7 @@ using Microsoft.DotNet.ProjectModel;
using Microsoft.DotNet.ProjectModel.Utilities;
using Microsoft.DotNet.Tools.Compiler;
using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.DotNet.ProjectModel.Compilation;
namespace Microsoft.DotNet.Tools.Build
{
@ -79,7 +80,7 @@ namespace Microsoft.DotNet.Tools.Build
return true;
}
foreach (var dependency in Sort(_rootProjectDependencies.ProjectDependenciesWithSources))
foreach (var dependency in Sort(_rootProjectDependencies))
{
var dependencyProjectContext = ProjectContext.Create(dependency.Path, dependency.Framework, new[] { _rootProject.RuntimeIdentifier });
@ -514,31 +515,40 @@ namespace Microsoft.DotNet.Tools.Build
executable.MakeCompilationOutputRunnable();
}
private static ISet<ProjectDescription> Sort(Dictionary<string, ProjectDescription> projects)
private static IEnumerable<ProjectDescription> Sort(ProjectDependenciesFacade dependencies)
{
var outputs = new HashSet<ProjectDescription>();
var outputs = new List<ProjectDescription>();
foreach (var pair in projects)
foreach (var pair in dependencies.Dependencies)
{
Sort(pair.Value, projects, outputs);
Sort(pair.Value, dependencies, outputs);
}
return outputs;
return outputs.Distinct(new ProjectComparer());
}
private static void Sort(ProjectDescription project, Dictionary<string, ProjectDescription> projects, ISet<ProjectDescription> outputs)
private static void Sort(LibraryExport node, ProjectDependenciesFacade dependencies, IList<ProjectDescription> outputs)
{
// Sorts projects in dependency order so that we only build them once per chain
foreach (var dependency in project.Dependencies)
ProjectDescription projectDependency;
foreach (var dependency in node.Library.Dependencies)
{
ProjectDescription projectDependency;
if (projects.TryGetValue(dependency.Name, out projectDependency))
{
Sort(projectDependency, projects, outputs);
}
// Sort the children
Sort(dependencies.Dependencies[dependency.Name], dependencies, outputs);
}
outputs.Add(project);
// Add this node to the list if it is a project
if (dependencies.ProjectDependenciesWithSources.TryGetValue(node.Library.Identity.Name, out projectDependency))
{
// Add to the list of projects to build
outputs.Add(projectDependency);
}
}
private class ProjectComparer : IEqualityComparer<ProjectDescription>
{
public bool Equals(ProjectDescription x, ProjectDescription y) => string.Equals(x.Identity.Name, y.Identity.Name);
public int GetHashCode(ProjectDescription obj) => obj.Identity.Name.GetHashCode();
}
public struct CompilerIO

8
src/dotnet/commands/dotnet-build/ProjectDependenciesFacade.cs
View file

@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Tools.Build
{
// projectName -> ProjectDescription
public Dictionary<string, ProjectDescription> ProjectDependenciesWithSources { get; }
public List<LibraryExport> Dependencies { get; }
public Dictionary<string, LibraryExport> Dependencies { get; }
public ProjectDependenciesFacade(ProjectContext rootProject, string configValue)
{
@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Tools.Build
// Build project references
foreach (var dependency in Dependencies)
{
var projectDependency = dependency.Library as ProjectDescription;
var projectDependency = dependency.Value.Library as ProjectDescription;
if (projectDependency != null && projectDependency.Resolved && projectDependency.Project.Files.SourceFiles.Any())
{
@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Tools.Build
}
// todo make extension of ProjectContext?
private static List<LibraryExport> GetProjectDependencies(ProjectContext projectContext, string configuration)
private static Dictionary<string, LibraryExport> GetProjectDependencies(ProjectContext projectContext, string configuration)
{
// Create the library exporter
var exporter = projectContext.CreateExporter(configuration);
@ -43,7 +43,7 @@ namespace Microsoft.DotNet.Tools.Build
// Gather exports for the project
var dependencies = exporter.GetDependencies().ToList();
return dependencies;
return dependencies.ToDictionary(d => d.Library.Identity.Name);
}
}