diff options
| author | Vsevolod Kukol <sevoku@xamarin.com> | 2015-12-10 20:43:35 +0300 |
|---|---|---|
| committer | Vsevolod Kukol <sevoku@xamarin.com> | 2015-12-10 20:43:35 +0300 |
| commit | ae651cf348b123e287ddc31f09c55cf08ab8aa84 (patch) | |
| tree | 752e0ddf1b7bb5f6bb2db4247f86a848338ba0d8 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad | |
| parent | 374cdf4d5adc6d69df45aae2ffa6a45db44bc5b8 (diff) | |
| parent | ad1d852e8e9eaa13d3cc8f17618ccd9c49a00cbe (diff) | |
Merge remote-tracking branch 'origin/master' into roslyn-dark-skin
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs index 1f5c44f993..7ff2635683 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs @@ -163,7 +163,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad // Check if there is a cyclic reference after removing from the source project if (pref.ReferenceType == ReferenceType.Project) { - DotNetProject pdest = p.ParentSolution.FindProjectByName (pref.Reference) as DotNetProject; + DotNetProject pdest = pref.ResolveProject (p.ParentSolution) as DotNetProject; if (pdest == null || ProjectReferencesProject (pdest, p2.Name)) { // Restore the dep p.References.Add (pref); @@ -180,7 +180,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad // Check for cyclic referencies if (pref.ReferenceType == ReferenceType.Project) { - DotNetProject pdest = p.ParentSolution.FindProjectByName (pref.Reference) as DotNetProject; + DotNetProject pdest = pref.ResolveProject (p.ParentSolution) as DotNetProject; if (pdest == null) return; if (HasCircularReference (pdest, p.Name)) @@ -224,7 +224,10 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad return true; foreach (ProjectReference pr in project.References) { - DotNetProject pref = project.ParentSolution.FindProjectByName (pr.Reference) as DotNetProject; + if (pr.ReferenceType != ReferenceType.Project) { + continue; + } + DotNetProject pref = pr.ResolveProject (project.ParentSolution) as DotNetProject; if (pref != null && ProjectReferencesProject (pref, targetProject)) return true; } |