Merge pull request #3033 from dotnet/pakrym/csproj-ref

Copy csproj reference assemblies to build output
dotnet · May 16, 2016 · c3aa0a5 · c3aa0a5
2 parents 864145a + 8831e93
commit c3aa0a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Microsoft.DotNet.Compiler.Common/Executable.cs b/src/Microsoft.DotNet.Compiler.Common/Executable.cs
@@ -161,7 +161,7 @@ private void WriteDepsFileAndCopyProjectDependencies(LibraryExporter exporter)
             var exports = exporter.GetAllExports().ToList();
             WriteConfigurationFiles(exports, exports, includeDevConfig: true);
 
-            var projectExports = exporter.GetDependencies(LibraryType.Project);
+            var projectExports = exporter.GetAllProjectTypeDependencies();
             CopyAssemblies(projectExports);
             CopyAssets(projectExports);
 

diff --git a/src/Microsoft.DotNet.Compiler.Common/LibraryExporterExtensions.cs b/src/Microsoft.DotNet.Compiler.Common/LibraryExporterExtensions.cs
@@ -1,16 +1,23 @@
-using System.Collections.Generic;
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
 using System.IO;
-using System;
 using System.Linq;
-using Microsoft.DotNet.ProjectModel;
 using Microsoft.DotNet.ProjectModel.Compilation;
 using Microsoft.DotNet.ProjectModel.Graph;
-using Microsoft.Extensions.DependencyModel;
 
 namespace Microsoft.DotNet.Cli.Compiler.Common
 {
     public static class LibraryExporterExtensions
     {
+        public static IEnumerable<LibraryExport> GetAllProjectTypeDependencies(this LibraryExporter exporter)
+        {
+            return
+                exporter.GetDependencies(LibraryType.Project)
+                    .Concat(exporter.GetDependencies(LibraryType.MSBuildProject));
+        }
+
         public static void CopyTo(this IEnumerable<LibraryAsset> assets, string destinationPath)
         {
             if (!Directory.Exists(destinationPath))