diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2016-10-10 14:58:49 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2016-10-10 14:58:49 +0300 |
| commit | 4ce1e96bad5faad62df8b420abe71ba86ab48826 (patch) | |
| tree | 6be49a983e1f5bb707861eaeb718147961ab8fef /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad | |
| parent | 19efb90ce85af3fa97283d8287f1c15978c81568 (diff) | |
| parent | c452156c8bea7479584c28f8ff069e4da668e5b0 (diff) | |
Merge master into multisessiondebugging
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 | 8 |
1 files changed, 6 insertions, 2 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 1a01f93d4b..6ebb7f85b4 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 @@ -79,8 +79,12 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad // For portable libraries, add node that represents all framework assemblies var project = (DotNetProject) ctx.GetParentDataItem (typeof(DotNetProject), false); - if (project != null && project.IsPortableLibrary) - ctx.AddChild (new PortableFrameworkSubset (project)); + if (project != null) { + var tfm = project.TargetFramework.Id; + if (tfm.Identifier == MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.ID_PORTABLE && tfm.Version != "5.0") { + ctx.AddChild (new PortableFrameworkSubset (project)); + } + } } public override bool HasChildNodes (ITreeBuilder builder, object dataObject) |