Peek into project refs to give more details to the IDE

- Added WrappedProject to TargetFrameworkInformation - Return the wrapped project file or assembly instead of a project reference where appropriate. #945
aspnet · Dec 2, 2014 · 054ee91 · 054ee91
1 parent a569a4c
commit 054ee91
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs b/src/Microsoft.Framework.DesignTimeHost/ApplicationContext.cs
@@ -887,16 +887,41 @@ private DependencyInfo ResolveProjectDepencies(Project project, string configura
                     if (string.Equals(library.Type, "Project") &&
                        !string.Equals(library.Identity.Name, project.Name))
                     {
-                        info.ProjectReferences.Add(new ProjectReference
+                        Project referencedProject;
+                        if (!Project.TryGetProject(library.Path, out referencedProject))
                         {
-                            Framework = new FrameworkData
+                            // Should never happen
+                            continue;
+                        }
+
+                        var targetFrameworkInformation = referencedProject.GetTargetFramework(library.Framework);
+
+                        // If this is an assembly reference then treat it like a file reference
+                        if (!string.IsNullOrEmpty(targetFrameworkInformation.AssemblyPath) &&
+                            string.IsNullOrEmpty(targetFrameworkInformation.WrappedProject))
+                        {
+                            info.References.Add(GetProjectRelativeFullPath(referencedProject, targetFrameworkInformation.AssemblyPath));
+                        }
+                        else
+                        {
+                            string projectPath = library.Path;
+
+                            if (!string.IsNullOrEmpty(targetFrameworkInformation.WrappedProject))
                             {
-                                ShortName = VersionUtility.GetShortFrameworkName(library.Framework),
-                                FrameworkName = library.Framework.ToString(),
-                                FriendlyName = frameworkResolver.GetFriendlyFrameworkName(library.Framework)
-                            },
-                            Path = library.Path
-                        });
+                                projectPath = GetProjectRelativeFullPath(referencedProject, targetFrameworkInformation.WrappedProject);
+                            }
+
+                            info.ProjectReferences.Add(new ProjectReference
+                            {
+                                Framework = new FrameworkData
+                                {
+                                    ShortName = VersionUtility.GetShortFrameworkName(library.Framework),
+                                    FrameworkName = library.Framework.ToString(),
+                                    FriendlyName = frameworkResolver.GetFriendlyFrameworkName(library.Framework)
+                                },
+                                Path = projectPath
+                            });
+                        }
                     }
                 }
 
@@ -931,6 +956,11 @@ private DependencyInfo ResolveProjectDepencies(Project project, string configura
             });
         }
 
+        private static string GetProjectRelativeFullPath(Project referencedProject, string path)
+        {
+            return Path.GetFullPath(Path.Combine(referencedProject.ProjectDirectory, path));
+        }
+
         private static DependencyDescription CreateDependencyDescription(LibraryDescription library)
         {
             return new DependencyDescription

diff --git a/src/Microsoft.Framework.Runtime/Project.cs b/src/Microsoft.Framework.Runtime/Project.cs
@@ -656,6 +656,8 @@ private bool BuildTargetFrameworkNode(KeyValuePair<string, JToken> targetFramewo
 
             targetFrameworkInformation.Dependencies.AddRange(frameworkAssemblies);
 
+            targetFrameworkInformation.WrappedProject = GetValue<string>(properties, "wrappedProject");
+
             var binNode = properties["bin"];
 
             if (binNode != null)

diff --git a/src/Microsoft.Framework.Runtime/TargetFrameworkInformation.cs b/src/Microsoft.Framework.Runtime/TargetFrameworkInformation.cs
@@ -14,6 +14,8 @@ public class TargetFrameworkInformation : IFrameworkTargetable
 
         public IList<LibraryDependency> Dependencies { get; set; }
 
+        public string WrappedProject { get; set; }
+
         public string AssemblyPath { get; set; }
 
         public string PdbPath { get; set; }