Add Project References to ProjectContext

src/Microsoft.Extensions.ProjectModel.Abstractions.Sources/IProjectContext.cs

@@ -29,5 +29,6 @@ namespace Microsoft.Extensions.ProjectModel
         string FindProperty(string propertyName);
         IEnumerable<DependencyDescription> PackageDependencies { get;}
         IEnumerable<ResolvedReference> CompilationAssemblies { get; }
+        IEnumerable<string> ProjectReferences { get; }
     }
 }

src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetDependencyProvider.cs

@@ -17,6 +17,7 @@ namespace Microsoft.Extensions.ProjectModel
         private List<DependencyDescription> _packageDependencies;
         private List<ResolvedReference> _resolvedReferences;
         private string _configuration;
+        private List<string> _projectReferences;
 
         public DotNetDependencyProvider(ProjectContext context, string configuration = Constants.DefaultConfiguration)
         {
@@ -30,6 +31,11 @@ namespace Microsoft.Extensions.ProjectModel
             DiscoverDependencies();
         }
 
+        public IEnumerable<string> GetProjectReferences()
+        {
+            return _projectReferences;
+        }
+
         public IEnumerable<DependencyDescription> GetPackageDependencies()
         {
             return _packageDependencies;
@@ -55,31 +61,41 @@ namespace Microsoft.Extensions.ProjectModel
                 throw new InvalidOperationException("Couldn't resolve dependencies when target framework is not specified.");
             }
 
-            var exports = exporter.GetAllExports();
+            var exports = exporter.GetDependencies();
-            var nugetPackages = new Dictionary<string, DependencyDescription>(StringComparer.OrdinalIgnoreCase);
             _resolvedReferences = new List<ResolvedReference>();
+            _packageDependencies = new List<DependencyDescription>();
+            _projectReferences = new List<string>();
 
             foreach (var export in exports)
             {
                 var library = export.Library;
-
+                var project = library as ProjectDescription;
-                var description = new DependencyDescription(
+                if (project != null)
-                    library.Identity.Name,
-                    library.Identity.Version.ToString(),
-                    export.Library.Path,
-                    framework.DotNetFrameworkName,
-                    library.Identity.Type.Value,
-                    library.Resolved);
-
-                foreach (var dependency in export.Library.Dependencies)
                 {
-                    var dep = new Dependency(dependency.Name, version: string.Empty);
+                    _projectReferences.Add(project.Project.ProjectFilePath);
-                    description.AddDependency(dep);
+                }
+                else
+                {
+                    var description = new DependencyDescription(
+                        library.Identity.Name,
+                        library.Identity.Version.ToString(),
+                        export.Library.Path,
+                        framework.DotNetFrameworkName,
+                        library.Identity.Type.Value,
+                        library.Resolved);
+
+                    foreach (var dependency in export.Library.Dependencies)
+                    {
+                        var dep = new Dependency(dependency.Name, version: string.Empty);
+                        description.AddDependency(dep);
+                    }
+
+
+                    var itemSpec = $"{framework.DotNetFrameworkName}/{library.Identity.Name}/{library.Identity.Version.ToString()}";
+                    _packageDependencies.Add(description);
                 }
 
-                var itemSpec = $"{framework.DotNetFrameworkName}/{library.Identity.Name}/{library.Identity.Version.ToString()}";
+                // For resolved references we need to include all type of dependencies.
-                nugetPackages[itemSpec] = description;
-
                 if (library.Resolved)
                 {
                     foreach (var asset in export.CompilationAssemblies)
@@ -91,8 +107,6 @@ namespace Microsoft.Extensions.ProjectModel
                     }
                 }
             }
-
-            _packageDependencies = nugetPackages.Values.ToList();
         }
     }
 }

src/Microsoft.Extensions.ProjectModel.DotNet.Sources/DotNetProjectContext.cs

@@ -22,6 +22,7 @@ namespace Microsoft.Extensions.ProjectModel
 
         private IEnumerable<DependencyDescription> _packageDependencies;
         private IEnumerable<ResolvedReference> _compilationAssemblies;
+        private IEnumerable<string> _projectReferences;
 
         public DotNetProjectContext(ProjectContext projectContext, string configuration, string outputPath)
         {
@@ -118,6 +119,19 @@ namespace Microsoft.Extensions.ProjectModel
             }
         }
 
+        public IEnumerable<string> ProjectReferences
+        {
+            get
+            {
+                if (_projectReferences == null)
+                {
+                    _projectReferences = _dependencyProvider.Value.GetProjectReferences();
+                }
+
+                return _projectReferences;
+            }
+        }
+
         /// <summary>
         /// Returns string values of top-level keys in the project.json file
         /// </summary>

src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectContext.cs

@@ -20,6 +20,7 @@ namespace Microsoft.Extensions.ProjectModel
         private readonly MsBuildProjectDependencyProvider _dependencyProvider;
         private IEnumerable<DependencyDescription> _packageDependencies;
         private IEnumerable<ResolvedReference> _compilationAssemblies;
+        private IEnumerable<string> _projectReferences;
 
         protected ProjectInstance Project { get; }
         protected string Name { get; }
@@ -114,5 +115,17 @@ namespace Microsoft.Extensions.ProjectModel
             }
         }
 
+        public IEnumerable<string> ProjectReferences
+        {
+            get
+            {
+                if (_projectReferences == null)
+                {
+                    _projectReferences = _dependencyProvider.GetProjectReferences();
+                }
+
+                return _projectReferences;
+            }
+        }
     }
 }

src/Microsoft.Extensions.ProjectModel.MsBuild.Sources/MsBuildProjectDependencyProvider.cs

@@ -25,6 +25,18 @@ namespace Microsoft.Extensions.ProjectModel
             _projectInstance = projectInstance;
         }
 
+        public IEnumerable<string> GetProjectReferences()
+        {
+            var projectPaths = _projectInstance
+                .GetItems("ProjectReference")
+                .Select(reference => reference.EvaluatedInclude);
+
+            return projectPaths
+                .Select(path => Path.IsPathRooted(path)
+                    ? path
+                    : Path.Combine(_projectInstance.Directory, path));
+        }
+
         public IEnumerable<DependencyDescription> GetPackageDependencies()
         {
             var packageItems = _projectInstance.GetItems(PackageDependencyItemType);

test/Microsoft.Extensions.ProjectModel.Tests/DotNet/DotNetDependencyProviderTests.cs

@@ -13,7 +13,33 @@ namespace Microsoft.Extensions.ProjectModel.DotNet
 {
     public class DotNetDependencyProviderTests
     {
+        private const string globalJson = @"
+{
+    ""projects"": [ ""demo"", ""demoLib""]
+}";
+
         private const string projectJson = @"
+{
+  ""buildOptions"": {
+  },
+  ""dependencies"": {
+    ""Microsoft.AspNetCore.Mvc"": ""1.0.0-*"",
+    ""demoLib"": ""1.0.0-*"",
+  },
+  ""frameworks"": {
+    ""netcoreapp1.0"": {
+      ""dependencies"": {
+        ""Microsoft.NETCore.App"": {
+          ""version"": ""1.0.0"",
+          ""type"": ""platform""
+        }
+      }
+    }
+  },
+}
+";
+
+        private const string libProjectJson = @"
 {
   ""buildOptions"": {
   },
@@ -45,13 +71,20 @@ namespace Microsoft.Extensions.ProjectModel.DotNet
             using (var fileProvider = new TemporaryFileProvider())
             {
                 Directory.CreateDirectory(Path.Combine(fileProvider.Root, "demo"));
-                fileProvider.Add($"demo{Path.DirectorySeparatorChar}project.json", projectJson);
+                Directory.CreateDirectory(Path.Combine(fileProvider.Root, "demoLib"));
-                fileProvider.Add($"demo{Path.DirectorySeparatorChar}First.cs", "namespace demo { class First{} }");
+
+                fileProvider.Add($"global.json", globalJson);
+
+                fileProvider.Add($"demo/project.json", projectJson);
+                fileProvider.Add($"demo/First.cs", "namespace demo { class First{} }");
+
+                fileProvider.Add($"demoLib/project.json", libProjectJson);
+                fileProvider.Add($"demoLib/Second.cs", "namespace demoLib { class First{} }");
 
                 var muxer = new Muxer().MuxerPath;
 
                 var result = Command
-                    .Create(muxer, new[] { "restore", Path.Combine(fileProvider.Root, "demo") })
+                    .Create(muxer, new[] { "restore", fileProvider.Root })
                     .OnErrorLine(l => _output.WriteLine(l))
                     .OnOutputLine(l => _output.WriteLine(l))
                     .Execute();
@@ -77,7 +110,9 @@ namespace Microsoft.Extensions.ProjectModel.DotNet
                     .First();
 
                 Assert.True(Directory.Exists(mvcPackage.Path));
-                Assert.True(mvcPackage.Path.EndsWith($"Microsoft.AspNetCore.Mvc{Path.DirectorySeparatorChar}1.0.0", StringComparison.OrdinalIgnoreCase));
+                Assert.True(mvcPackage.Path.EndsWith($"Microsoft.AspNetCore.Mvc/1.0.0", StringComparison.OrdinalIgnoreCase));
+
+                Assert.True(context.ProjectReferences.First().Equals(Path.Combine(fileProvider.Root, "demoLib", "project.json")));
             }
         }
     }

test/Microsoft.Extensions.ProjectModel.Tests/MsBuild/MsBuildProjectDependencyProviderTests.cs

@@ -53,7 +53,7 @@ namespace Microsoft.Extensions.ProjectModel.MsBuild
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include=""..\Library1\library.csproj"" />
+    <ProjectReference Include=""..\Library1\Library1.csproj"" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include = ""xyz.dll"" />
@@ -109,14 +109,14 @@ namespace Microsoft.Extensions.ProjectModel.MsBuild
                 fileProvider.Add("NuGet.config", NugetConfigTxt);
 
                 // Add Root Project
-                fileProvider.Add($"Root{Path.DirectorySeparatorChar}test.csproj", RootProjectTxt);
+                fileProvider.Add($"Root/test.csproj", RootProjectTxt);
-                fileProvider.Add($"Root{Path.DirectorySeparatorChar}One.cs", "public class Abc {}");
+                fileProvider.Add($"Root/One.cs", "public class Abc {}");
-                fileProvider.Add($"Root{Path.DirectorySeparatorChar}Two.cs", "public class Abc2 {}");
+                fileProvider.Add($"Root/Two.cs", "public class Abc2 {}");
-                fileProvider.Add($"Root{Path.DirectorySeparatorChar}Excluded.cs", "public class Abc {}");
+                fileProvider.Add($"Root/Excluded.cs", "public class Abc {}");
 
                 // Add Class Library project
-                fileProvider.Add($"Library1{Path.DirectorySeparatorChar}library.csproj", LibraryProjectTxt);
+                fileProvider.Add($"Library1/Library1.csproj", LibraryProjectTxt);
-                fileProvider.Add($"Library1{Path.DirectorySeparatorChar}Three.cs", "public class Abc3 {}");
+                fileProvider.Add($"Library1/Three.cs", "public class Abc3 {}");
 
                 var testContext = _fixture.GetMsBuildContext();
 
@@ -152,9 +152,8 @@ namespace Microsoft.Extensions.ProjectModel.MsBuild
                     .FirstOrDefault();
 
                 Assert.NotNull(lib1Dll);
-                var expectedPath = Path.Combine(fileProvider.Root, "Root", "bin", "Debug", "netcoreapp1.0", "lib1.dll");
+                Assert.True(File.Exists(lib1Dll.ResolvedPath));
-                Assert.Equal(expectedPath, lib1Dll.ResolvedPath, ignoreCase: true);
+
-                
                 // This reference doesn't resolve so should not be available here.
                 Assert.False(compilationAssemblies.Any(assembly => assembly.Name.Equals("xyz", StringComparison.OrdinalIgnoreCase)));
 
@@ -165,6 +164,8 @@ namespace Microsoft.Extensions.ProjectModel.MsBuild
                 Assert.NotNull(mvcPackage);
 
                 Assert.True(mvcPackage.Dependencies.Any(dependency => dependency.Name.Equals("Microsoft.Extensions.DependencyInjection", StringComparison.OrdinalIgnoreCase)));
+
+                Assert.True(context.ProjectReferences.First().Equals(Path.Combine(fileProvider.Root, "Library1", "Library1.csproj")));
             }
         }
     }