Merge pull request #875 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2

[automated] Merge branch 'release/2.1' => 'release/2.2'

Author: dagood

tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/UsageReport/AnnotatedUsage.cs

@@ -16,6 +16,8 @@ public class AnnotatedUsage
         public bool EndsUpInOutput { get; set; }
         public bool TestProjectByHeuristic { get; set; }
         public bool TestProjectOnlyByHeuristic { get; set; }
+        public bool IsDirectDependency { get; set; }
+        public bool IsAutoReferenced { get; set; }
 
         public XElement ToXml() => new XElement(
             nameof(AnnotatedUsage),
@@ -25,6 +27,8 @@ public class AnnotatedUsage
             ProdConPackageIdCreator.ToXAttributeIfNotNull(nameof(ProdConPackageIdCreator)),
             TestProjectByHeuristic.ToXAttributeIfTrue(nameof(TestProjectByHeuristic)),
             TestProjectOnlyByHeuristic.ToXAttributeIfTrue(nameof(TestProjectOnlyByHeuristic)),
+            IsDirectDependency.ToXAttributeIfTrue(nameof(IsDirectDependency)),
+            IsAutoReferenced.ToXAttributeIfTrue(nameof(IsAutoReferenced)),
             EndsUpInOutput.ToXAttributeIfTrue(nameof(EndsUpInOutput)));
     }
 }

tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/UsageReport/Usage.cs

@@ -16,6 +16,10 @@ public class Usage : IEquatable<Usage>
 
         public string AssetsFile { get; set; }
 
+        public bool IsDirectDependency { get; set; }
+
+        public bool IsAutoReferenced { get; set; }
+
         /// <summary>
         /// The Runtime ID this package is for, or null. Runtime packages (are assumed to) have the
         /// id 'runtime.{rid}.{rest of id}'. We can't use a simple regex to grab this value since
@@ -28,24 +32,32 @@ public class Usage : IEquatable<Usage>
             nameof(Usage),
             PackageIdentity.ToXElement().Attributes(),
             AssetsFile.ToXAttributeIfNotNull("File"),
+            IsDirectDependency.ToXAttributeIfTrue(nameof(IsDirectDependency)),
+            IsAutoReferenced.ToXAttributeIfTrue(nameof(IsAutoReferenced)),
             RuntimePackageRid.ToXAttributeIfNotNull("Rid"));
 
         public static Usage Parse(XElement xml) => new Usage
         {
             PackageIdentity = XmlParsingHelpers.ParsePackageIdentity(xml),
             AssetsFile = xml.Attribute("File")?.Value,
+            IsDirectDependency = Convert.ToBoolean(xml.Attribute(nameof(IsDirectDependency))?.Value),
+            IsAutoReferenced = Convert.ToBoolean(xml.Attribute(nameof(IsAutoReferenced))?.Value),
             RuntimePackageRid = xml.Attribute("Rid")?.Value
         };
 
         public static Usage Create(
             string assetsFile,
             PackageIdentity identity,
+            bool isDirectDependency,
+            bool isAutoReferenced,
             IEnumerable<string> possibleRuntimePackageRids)
         {
             return new Usage
             {
                 AssetsFile = assetsFile,
                 PackageIdentity = identity,
+                IsDirectDependency = isDirectDependency,
+                IsAutoReferenced = isAutoReferenced,
                 RuntimePackageRid = possibleRuntimePackageRids
                     .Where(rid => identity.Id.StartsWith($"runtime.{rid}.", StringComparison.Ordinal))
                     .OrderByDescending(rid => rid.Length)

tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/UsageReport/WritePackageUsageData.cs

@@ -180,28 +180,44 @@ public override bool Execute()
                 assetFiles,
                 assetFile =>
                 {
-                    var properties = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                    JObject jObj;
 
                     using (var file = File.OpenRead(Path.Combine(RootDir, assetFile)))
                     using (var reader = new StreamReader(file))
                     using (var jsonReader = new JsonTextReader(reader))
                     {
-                        while (jsonReader.Read())
-                        {
-                            if (jsonReader.TokenType == JsonToken.PropertyName &&
-                                jsonReader.Value is string value)
-                            {
-                                properties.Add(value);
-                            }
-                        }
+                        jObj = (JObject)JToken.ReadFrom(jsonReader);
                     }
 
+                    var properties = new HashSet<string>(
+                        jObj.SelectTokens("$.targets.*").Children()
+                            .Concat(jObj.SelectToken("$.libraries"))
+                            .Select(t => ((JProperty)t).Name)
+                            .Distinct(), 
+                        StringComparer.OrdinalIgnoreCase);
+
+                    var directDependencies = jObj.SelectTokens("$.project.frameworks.*.dependencies").Children().Select(dep =>
+                        new
+                        {
+                            name = ((JProperty)dep).Name,
+                            target = dep.SelectToken("$..target")?.ToString(),
+                            version = VersionRange.Parse(dep.SelectToken("$..version")?.ToString()),
+                            autoReferenced = dep.SelectToken("$..autoReferenced")?.ToString() == "True",
+                        })
+                        .ToArray();
+
                     foreach (var identity in toCheck
                         .Where(id => properties.Contains(id.Id + "/" + id.Version.OriginalVersion)))
                     {
+                        var directDependency =
+                            directDependencies?.FirstOrDefault(
+                                d => d.name == identity.Id && 
+                                     d.version.Satisfies(identity.Version));
                         usages.Add(Usage.Create(
                             assetFile,
                             identity,
+                            directDependency != null,
+                            directDependency?.autoReferenced == true,
                             possibleRids));
                     }
                 });
@@ -214,6 +230,8 @@ public override bool Execute()
                 usages.Add(Usage.Create(
                     null,
                     restoredWithoutUsagesFound,
+                    false,
+                    false,
                     possibleRids));
             }