[Core] Improve display names for custom fx packages

5 files changed, 17 insertions, 4 deletions

diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs
index 3868e65cc5..87cda360e6 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs
@@ -138,7 +138,7 @@ namespace MonoDevelop.DesignerSupport.Projects
 		public string Package {
 			get {
 				if (pref.ReferenceType == ReferenceType.Gac && pref.Package != null)
-					return pref.Package.Name + " "  + pref.Package.Version;
+					return pref.Package.GetDisplayName ();
 				else
 					return string.Empty;
 			}
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemPackage.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemPackage.cs
index a32eb63c59..e8699d76ee 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemPackage.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemPackage.cs
@@ -73,6 +73,13 @@ namespace MonoDevelop.Core.Assemblies
 			}
 		}
 		
+		public string GetDisplayName ()
+		{
+			//for framework packages, the version is part of the name
+			//for other packages, include it in case it isn't
+			return (IsFrameworkPackage || string.IsNullOrEmpty (version))? Name : name + " " + version;
+		}
+		
 		public string Name {
 			get { return name; }
 		}
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs
index bcc6208187..e19d0d9df3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs
@@ -82,6 +82,11 @@ namespace MonoDevelop.Core.Assemblies
 		
 		public string Name {
 			get {
+				if (string.IsNullOrEmpty (name)) {
+					return string.IsNullOrEmpty (id.Profile)
+						? string.Format ("{0} {1}", id.Identifier, id.Version)
+						: string.Format ("{0} {1} ({2})", id.Identifier, id.Version, id.Profile);
+				}
 				return name;
 			}
 		}
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs
index 10143d6475..33d497cbea 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs
@@ -102,9 +102,10 @@ namespace MonoDevelop.Core.Assemblies
 		
 		public virtual SystemPackageInfo GetFrameworkPackageInfo (string packageName)
 		{
+			string name = !string.IsNullOrEmpty (packageName)? packageName : framework.Name;
 			SystemPackageInfo info = new SystemPackageInfo ();
-			info.Name = string.IsNullOrEmpty (packageName) ? runtime.DisplayRuntimeName : packageName;
-			info.Description = string.IsNullOrEmpty (packageName) ? framework.Name : packageName;
+			info.Name = name;
+			info.Description = name;
 			info.IsFrameworkPackage = true;
 			info.IsCorePackage = true;
 			info.IsGacPackage = true;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
index 0764a961f3..6800063574 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
@@ -153,7 +153,7 @@ namespace MonoDevelop.Ide.Projects
 					name = GLib.Markup.EscapeText (systemAssembly.Name);
 					version = GLib.Markup.EscapeText (systemAssembly.Version);
 				}
-				string pkg = systemAssembly.Package.Name;
+				string pkg = systemAssembly.Package.GetDisplayName ();
 				if (systemAssembly.Package.IsInternalPackage)
 					pkg += " " + GettextCatalog.GetString ("(Provided by MonoDevelop)");