Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add TFMs to top level package properties grid (partial fix for 587 for RTM) #1515

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ public class NuGetDependenciesSubTreeProviderTests
""Resolved"":""true"",
""Dependencies"":""""
},
""tfm2/package1/1.0.2.0"": {
""Name"": ""package"",
""Version"": ""1.0.2.0"",
""Type"":""Package"",
""Path"":""SomePath"",
""Resolved"":""true"",
""Dependencies"":""""
},
""tfm1/PackageToRemove/1.0.0"": {
""Name"": ""PackageToRemove"",
""Version"": ""1.0.0"",
Expand All @@ -83,10 +91,10 @@ public class NuGetDependenciesSubTreeProviderTests
""Dependencies"":""""
},
""tfm2"": {
""RuntimeIdentifier"": ""net45"",
""RuntimeIdentifier"": ""net46"",
""TargetFrameworkMoniker"": "".NetFramework,Version=v4.5"",
""FrameworkName"": ""net45"",
""FrameworkVersion"": ""4.5"",
""FrameworkName"": ""net46"",
""FrameworkVersion"": ""4.6"",
""Dependencies"":""package1/1.0.2.0;ExistingUnresolvedPackage/2.0.0""
},
""tfm1/package2/1.0.2.0"": {
Expand Down Expand Up @@ -117,7 +125,7 @@ public class NuGetDependenciesSubTreeProviderTests
""RuleName"": ""ResolvedPackageReference""
},
""Difference"": {
""AddedItems"": [ ""tfm1"", ""tfm1/package1/1.0.2.0"", ""tfm2"", ""tfm1/package2/1.0.2.0"",
""AddedItems"": [ ""tfm1"", ""tfm1/package1/1.0.2.0"", ""tfm2"", ""tfm1/package2/1.0.2.0"", ""tfm2/package1/1.0.2.0"",
""tfm1/ToBeOverridenByResolvedPackage/1.0.0"", ""tfm2/ExistingUnresolvedPackage/2.0.0"" ],
""ChangedItems"": [ ""tfm1/PackageToChange/2.0.0"", ""tfm1/PackageToChange2/2.0.0"" ],
""RemovedItems"": [ ""tfm1/PackageToRemove/1.0.0"" ],
Expand Down Expand Up @@ -255,6 +263,9 @@ public void NuGetDependenciesSubTreeProvider_ProcessDependenciesChanges(
Assert.True(currentSnapshot.Any(x => x.Equals(addedNode.Id.ItemSpec, StringComparison.OrdinalIgnoreCase)));
}
}

var node = provider.TestCreateDependencyNode("tfm1/package1/1.0.2.0");
Assert.Equal("net45 4.5;net46 4.6", node.Properties["TargetFramework"]);
}

[Theory]
Expand Down Expand Up @@ -1196,6 +1207,12 @@ public void AddChildToNodeInCache(string itemSpec, IDependencyNode childNode)
node.AddChild(childNode);
}

public IDependencyNode TestCreateDependencyNode(string itemSpec)
{
CurrentSnapshot.DependenciesWorld.TryGetValue(itemSpec, out DependencyMetadata dependencyMetadata);
return CreateDependencyNode(dependencyMetadata);
}

private class SnapshotModel
{
public IEnumerable<DependencyNode> NodesCache { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Collections.Immutable;
using System.ComponentModel.Composition;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.VisualStudio.Imaging;
using Microsoft.VisualStudio.Imaging.Interop;
Expand Down Expand Up @@ -98,7 +99,7 @@ protected override IDependencyNode CreateRootNode()
KnownMonikers.PackageReference);
}

private IDependencyNode CreateDependencyNode(DependencyMetadata dependencyMetadata,
protected IDependencyNode CreateDependencyNode(DependencyMetadata dependencyMetadata,
DependencyNodeId id = null,
bool topLevel = true)
{
Expand All @@ -116,12 +117,20 @@ private IDependencyNode CreateDependencyNode(DependencyMetadata dependencyMetada
switch(dependencyMetadata.DependencyType)
{
case DependencyType.Package:
var packageProperties = dependencyMetadata.Properties;
if (topLevel)
{
var targets = CurrentSnapshot.GetTargetsForPackage(dependencyMetadata);
packageProperties = dependencyMetadata.Properties
.SetItem(ResolvedPackageReference.TargetFrameworkProperty, targets);
}

dependencyNode = new PackageDependencyNode(
id,
name: dependencyMetadata.Name,
caption: dependencyMetadata.FriendlyName,
flags: NuGetSubTreeNodeFlags,
properties: dependencyMetadata.Properties,
properties: packageProperties,
resolved: dependencyMetadata.Resolved);
break;
case DependencyType.Assembly:
Expand Down Expand Up @@ -666,6 +675,36 @@ public void SetProperties(IImmutableDictionary<string, string> properties)
FrameworkVersion = properties.ContainsKey(MetadataKeys.FrameworkVersion)
? properties[MetadataKeys.FrameworkVersion] : string.Empty;
}

public override string ToString()
{
var name = FrameworkName;
if (string.IsNullOrEmpty(FrameworkVersion))
{
return name;
}

var versionFriendlyString = string.Empty;

try
{
var version = new Version(FrameworkVersion);
if (version.Build > 0)
{
versionFriendlyString = version.ToString(3);
}
else
{
versionFriendlyString = version.ToString(2);
}
}
catch
{
versionFriendlyString = FrameworkVersion;
}

return $"{name} {versionFriendlyString}";
}
}

protected class DependencyMetadata
Expand Down Expand Up @@ -923,6 +962,35 @@ public HashSet<string> GetUniqueTopLevelDependencies()

return topLevelDependenciesItemSpecs;
}

public string GetTargetsForPackage(DependencyMetadata packageMetadata)
{
var builder = new StringBuilder();
foreach (var target in Targets)
{
if (!DependenciesWorld.TryGetValue(target.Key, out DependencyMetadata targetMetadata))
{
continue;
}

foreach (var dependencyItemSpec in targetMetadata.DependenciesItemSpecs)
{
if (!DependenciesWorld.TryGetValue(dependencyItemSpec, out DependencyMetadata targetDependency))
{
continue;
}

if (packageMetadata.Name.Equals(targetDependency?.Name)
&& packageMetadata.Version.Equals(targetDependency?.Version))
{
builder.Append(target.Value.ToString());
builder.Append(';');
}
}
}

return builder.ToString().TrimEnd(';');
}
}

protected enum DependencyType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
ReadOnly="True" />

<StringProperty Name="TargetFramework"
Visible="False"
Visible="True"
ReadOnly="True" />

<StringProperty Name="FrameworkName"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
ReadOnly="True" />

<StringProperty Name="TargetFramework"
Visible="False"
Visible="True"
ReadOnly="True" />

<StringProperty Name="FrameworkName"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<StringProperty Name="Path" Visible="False" ReadOnly="True" />
<StringProperty Name="Type" Visible="False" ReadOnly="True" />
<StringProperty Name="RuntimeIdentifier" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="False" ReadOnly="True" />
<StringProperty Name="TargetFramework" Visible="True" ReadOnly="True" />
<StringProperty Name="FrameworkName" Visible="False" ReadOnly="True" />
<StringProperty Name="FrameworkVersion" Visible="False" ReadOnly="True" />
<StringProperty Name="IsImplicitlyDefined" Visible="False" ReadOnly="True" />
Expand Down
Loading