Merge pull request #26 from nexB/add-top-level-deps

Add top level deps

Author: pombredanne

build.sh

@@ -17,6 +17,6 @@ dotnet publish \
   --runtime linux-x64 \
   --self-contained true \
   --configuration Release \
-  -p:Version=0.9.5 \
+  -p:Version=0.9.6-beta1 \
   --output build \
   src/nuget-inspector/nuget-inspector.csproj

release.sh

@@ -16,7 +16,7 @@
 rm -rf release/
 mkdir release
 
-VERSION=0.9.5
+VERSION=0.9.6-beta1
 
 TARGET_BASE=nuget-inspector-$(git describe)
 

setup.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = False
 tag = False
-current_version = 0.9.5
+current_version = 0.9.6-beta1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}-{release}

src/nuget-inspector/Config.cs

@@ -6,5 +6,5 @@ public static class Config
     public static bool TRACE_NET = false;
     public static bool TRACE_DEEP = false;
     public static bool TRACE_META = false;
-    public static string NUGET_INSPECTOR_VERSION = "0.9.5";
+    public static string NUGET_INSPECTOR_VERSION = "0.9.6-beta1";
 }

src/nuget-inspector/Models.cs

@@ -204,6 +204,52 @@ public static BasePackage FromBasePackage(BasePackage package, List<BasePackage>
             };
         }
 
+        ///<summary>
+        /// Return a deep clone of this package. Does not clone dependencies.
+        ///</summary>
+        public BasePackage Clone()
+        {
+            return new BasePackage(
+                name: name,
+                version:version,
+                datafile_path: datafile_path
+            )
+            {
+                type = type,
+                namespace_ = namespace_,
+
+                qualifiers = qualifiers,
+                subpath = subpath,
+                purl = purl,
+                primary_language = primary_language,
+                description = description,
+                release_date = release_date,
+                parties = new List<Party>(parties.Select(p => p.Clone())),
+                keywords = new List<string>(keywords),
+                homepage_url = homepage_url,
+                download_url = download_url,
+                size = size,
+                sha1 = sha1,
+                md5 = md5,
+                sha256 = sha256,
+                sha512 = sha512,
+                bug_tracking_url = bug_tracking_url,
+                code_view_url = code_view_url,
+                vcs_url = vcs_url,
+                copyright = copyright,
+                license_expression = license_expression,
+                declared_license = declared_license,
+                notice_text = notice_text,
+                source_packages = new List<string>(source_packages),
+                repository_homepage_url = repository_homepage_url,
+                repository_download_url = repository_download_url,
+                api_data_url = api_data_url,
+                datasource_id = datasource_id,
+
+                extra_data = new Dictionary<string, string>(extra_data),
+            };
+        }
+
         protected bool Equals(BasePackage other)
         {
             return
@@ -426,8 +472,21 @@ public class Party
         public string? name { get; set; } = "";
         public string? email { get; set; } = "";
         public string? url { get; set; } = "";
+    
+        public Party Clone()
+        {
+            return new Party(){
+                type=type,
+                role=role,
+                name=name,
+                email=email,
+                url=url
+            };
+        }
     }
 
+
+
     // TODO: unused
     public class DependentPackage
     {

src/nuget-inspector/OutputFormatJson.cs

@@ -36,6 +36,10 @@ public class ScanOutput
 
     [JsonProperty(propertyName: "packages")]
     public List<BasePackage> Packages { get; set; } = new();
+
+    [JsonProperty(propertyName: "dependencies")]
+    public List<BasePackage> Dependencies { get; set; } = new();
+
 }
 
 internal class OutputFormatJson
@@ -49,13 +53,44 @@ public OutputFormatJson(ScanResult result)
         Result = result;
         scan_output = new ScanOutput
         {
-            Packages = result.Packages!
+            Packages = result.Packages
         };
         ScanHeader scan_header = new(result.Options!)
         {
             project_framework = result.Options!.ProjectFramework!
         };
         scan_output.Headers.Add(scan_header);
+        scan_output.Dependencies = GetDependencies(result.Packages);
+    }
+
+    /// <summary>
+    /// Return a flat list of dependencies collected from a list of top-level packages.
+    /// </summary>
+    public static List<BasePackage> GetDependencies(List<BasePackage> packages)
+    {
+        var flat_deps = new List<BasePackage>();
+        foreach (var package in packages)
+        {
+            flat_deps.AddRange(FlattenDeps(package.dependencies));
+        }
+        flat_deps.Sort();
+        return flat_deps;
+    }
+
+    /// <summary>
+    /// Flatten recursively a tree of dependencies. Remove subdeps as the flattening goes.
+    /// </summary>
+    public static List<BasePackage> FlattenDeps(List<BasePackage> dependencies)
+    {
+        List<BasePackage> flattened = new();
+        List<BasePackage> depdeps;
+        foreach (var dep in dependencies)
+        {
+            depdeps = dep.dependencies;
+            flattened.Add(dep.Clone());
+            flattened.AddRange(FlattenDeps(depdeps));
+        }
+        return flattened;
     }
 
     public void Write()

src/nuget-inspector/ProjectFileProcessor.cs

@@ -1,6 +1,8 @@
 using Microsoft.Build.Evaluation;
-using Microsoft.Build.Exceptions;
+//using NuGet.Build.Tasks.Console;
+using NuGet.Common;
 using NuGet.Frameworks;
+using NuGet.LibraryModel;
 using NuGet.PackageManagement;
 using NuGet.Packaging;
 using NuGet.Packaging.Core;
@@ -66,6 +68,27 @@ public List<Dependency> GetDependenciesFromReferences(List<PackageReference> ref
         return dependencies;
     }
 
+    /// <summary>
+    /// Copied from NuGet.Client/src/NuGet.Core/NuGet.Build.Tasks.Console/MSBuildStaticGraphRestore.cs
+    /// Copyright (c) .NET Foundation. All rights reserved.
+    /// Licensed under the Apache License, Version 2.0.
+    /// Gets the <see cref="LibraryIncludeFlags" /> for the specified value.
+    /// </summary>
+    /// <param name="value">A semicolon delimited list of include flags.</param>
+    /// <param name="defaultValue">The default value ot return if the value contains no flags.</param>
+    /// <returns>The <see cref="LibraryIncludeFlags" /> for the specified value, otherwise the <paramref name="defaultValue" />.</returns>
+    private static LibraryIncludeFlags GetLibraryIncludeFlags(string value, LibraryIncludeFlags defaultValue)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return defaultValue;
+        }
+
+        string[] parts = MSBuildStringUtility.Split(value);
+
+        return parts.Length > 0 ? LibraryIncludeFlagUtils.GetFlags(parts) : defaultValue;
+    }
+
     /// <summary>
     /// Return a list of PackageReference extracted from the project file
     /// using a project model.
@@ -87,22 +110,32 @@ public List<PackageReference> GetPackageReferences()
             globalProperties: properties,
             toolsVersion: null);
 
-        foreach (ProjectItem? reference in project.GetItems(itemType: "PackageReference"))
+        foreach (ProjectItem reference in project.GetItems(itemType: "PackageReference"))
         {
-            if (reference == null)
-                continue;
             if (Config.TRACE)
             {
                 Console.WriteLine($"    Project reference: EvaluatedInclude: {reference.EvaluatedInclude}");
                 foreach (var meta in reference.Metadata)
                 {
                     Console.WriteLine($"        Metadata: name: '{meta.Name}' value: '{meta.EvaluatedValue}'");
                 }
-                foreach (var dmeta in reference.DirectMetadata)
-                {
-                    Console.WriteLine($"        DirectMetadata: name: '{dmeta.Name}' value: '{dmeta.EvaluatedValue}'");
-                }
             }
+            // var IncludeAssets = reference.Metadata.FirstOrDefault(predicate: meta => meta.Name == "IncludeAssets");
+            // var IncludeType? = null;
+            // if (IncludeAssets is not null)
+            //    IncludeType = GetLibraryIncludeFlags(IncludeAssets.EvaluatedValue, LibraryIncludeFlags.All);
+
+            // var IncludeType = GetLibraryIncludeFlags(
+            //     reference.GetProperty("IncludeAssets"), 
+            //     LibraryIncludeFlags.All) & ~GetLibraryIncludeFlags(
+            //     reference.GetProperty("ExcludeAssets"),
+            //     LibraryIncludeFlags.None),
+            // LibraryRange = new LibraryRange(
+            //     packageReferenceItem.Identity,
+            //     string.IsNullOrWhiteSpace(version) ? isCentralPackageVersionManagementEnabled ? null : VersionRange.All : VersionRange.Parse(version),
+            //     LibraryDependencyTarget.Package),
+            // NoWarn = MSBuildStringUtility.GetNuGetLogCodes(packageReferenceItem.GetProperty("NoWarn")).ToList(),
+            // SuppressParent = GetLibraryIncludeFlags(packageReferenceItem.GetProperty("PrivateAssets"), LibraryIncludeFlagUtils.DefaultSuppressParent),
 
             var version_metadata = reference.Metadata.FirstOrDefault(predicate: meta => meta.Name == "Version");
             VersionRange? version_range;
@@ -481,9 +514,12 @@ private List<PackageIdentity> CollectDirectDeps(List<Dependency> dependencies)
 /// </summary>
 internal class ProjectXmlFileProcessor : ProjectFileProcessor
 {
-    new public const string DatasourceId = "dotnet-project-xml";
+    public new const string DatasourceId = "dotnet-project-xml";
 
-    public ProjectXmlFileProcessor(string projectPath, NugetApi nugetApi, NuGetFramework? project_target_framework) : base(projectPath, nugetApi, project_target_framework)
+    public ProjectXmlFileProcessor(
+        string projectPath,
+        NugetApi nugetApi,
+        NuGetFramework? project_target_framework) : base(projectPath, nugetApi, project_target_framework)
     {
     }
 
@@ -493,7 +529,7 @@ public ProjectXmlFileProcessor(string projectPath, NugetApi nugetApi, NuGetFrame
     /// breadth of attributes as with an MSBuild-based parsing. In particular
     /// this does not handle frameworks and conditions.    /// using a project model.
     /// </summary>
-    new public List<PackageReference> GetPackageReferences()
+    public new List<PackageReference> GetPackageReferences()
     {
         if (Config.TRACE)
             Console.WriteLine($"ProjectXmlFileProcessor.GetPackageReferences: ProjectPath {ProjectPath}");

src/nuget-inspector/ProjectScanner.cs

@@ -291,7 +291,7 @@ public void FetchMetadata(ScanResult scan_result)
             }
             else
             {
-            // In the case of older proj file we process the bare XML as a last resort option
+                // In the case of older proj file we process the bare XML as a last resort option
                 if (Config.TRACE){
                     Console.WriteLine($"Failed to use ProjectFileProcessor: {dependency_resolution.ErrorMessage}");
                     Console.WriteLine("Using Fallback ProjectXmlFileProcessor reader and resolver.");

src/nuget-inspector/nuget-inspector.csproj

@@ -23,11 +23,11 @@
         <PackageId>nuget-inspector</PackageId>
         <Product>nuget-inspector</Product>
         <AssemblyName>nuget-inspector</AssemblyName>
-        <Version>0.9.5</Version>
+        <Version>0.9.6-beta1</Version>
         <Authors>nexB Inc.</Authors>
         <Company>nexB Inc</Company>
-        <AssemblyVersion>0.9.5.0</AssemblyVersion>
-        <FileVersion>0.9.5.0</FileVersion>
+        <AssemblyVersion>0.9.6.1</AssemblyVersion>
+        <FileVersion>0.9.6.1</FileVersion>
         <Description>A NuGet and Dotnet package dependency resolver</Description>
         <PackageProjectUrl>https://github.com/nexB/nuget-inspector</PackageProjectUrl>
         <PackageLicenseUrl>Apache-2.0 AND MIT</PackageLicenseUrl>
@@ -43,6 +43,7 @@
         <PackageReference Include="Mono.Options" Version="6.12.0.148" />
         <PackageReference Include="NuGet.Common" Version="6.4.0" />
         <PackageReference Include="NuGet.Configuration" Version="6.4.0" />
+        <PackageReference Include="NuGet.Build.Tasks.Console" Version="6.4.0" />
         <PackageReference Include="NuGet.Frameworks" Version="6.4.0" />
         <PackageReference Include="NuGet.LibraryModel" Version="6.4.0" />
         <PackageReference Include="NuGet.PackageManagement" Version="6.4.0" />