Skip to content

Fix project references #64

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix project references #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4916db9
Update README.rst
chinyeungli Sep 20, 2024
863cf89
updating to .NET 9 and updating nuget packages
jcutrono Jul 10, 2025
29be086
Porting fixes from previous branch. Adding ability to only scan exter…
jcutrono Jul 10, 2025
d9e597e
Merge branch 'main' into fix-project-references
jcutrono Jul 24, 2025
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
48 changes: 25 additions & 23 deletions src/nuget-inspector.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nuget-inspector", "nuget-inspector\nuget-inspector.csproj", "{12C8B8AB-5476-42CD-961A-4DACD9C8C0FD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{12C8B8AB-5476-42CD-961A-4DACD9C8C0FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12C8B8AB-5476-42CD-961A-4DACD9C8C0FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B81C40A9-6510-4181-A94F-95FD0219DA10}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nuget-inspector", "nuget-inspector\nuget-inspector.csproj", "{12C8B8AB-5476-42CD-961A-4DACD9C8C0FD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{12C8B8AB-5476-42CD-961A-4DACD9C8C0FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12C8B8AB-5476-42CD-961A-4DACD9C8C0FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12C8B8AB-5476-42CD-961A-4DACD9C8C0FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12C8B8AB-5476-42CD-961A-4DACD9C8C0FD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B81C40A9-6510-4181-A94F-95FD0219DA10}
EndGlobalSection
EndGlobal
32 changes: 26 additions & 6 deletions src/nuget-inspector/LockFileHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,21 @@ public DependencyResolution Process()
{
var tree_builder = new PackageTree();
var resolution = new DependencyResolution();
var project_references = ProjectLockFile.Libraries
.Where(l => l.Type.Equals(ComponentType.Project))
.Select(l => l.Name)
.ToList();

foreach (var target in ProjectLockFile.Targets)
{
foreach (var library in target.Libraries)
{
var type = library.Type;
var name = library.Name;
var version = library.Version.ToNormalizedString();
var package = new BasePackage(name: name, version: version);
var package = new BasePackage(name: name, type: type, version: version);
var dependencies = new List<BasePackage>();

foreach (var dependency in library.Dependencies)
{
var dep_name = dependency.Id;
Expand All @@ -90,7 +96,10 @@ public DependencyResolution Process()
}
else
{
var depId = new BasePackage(name: dep_name, version: best_version.ToNormalizedString());
var dep_type = project_references.Contains(dep_name)
? ComponentType.Project
: ComponentType.NuGet;
var depId = new BasePackage(name: dep_name, dep_type, version: best_version.ToNormalizedString());
dependencies.Add(item: depId);
}
}
Expand All @@ -111,7 +120,10 @@ public DependencyResolution Process()
foreach (var dep in ProjectLockFile.PackageSpec.Dependencies)
{
var version = tree_builder.GetResolvedVersion(name: dep.Name, range: dep.LibraryRange.VersionRange);
resolution.Dependencies.Add(item: new BasePackage(name: dep.Name, version: version));
var dep_type1 = project_references.Contains(dep.Name)
? ComponentType.Project
: ComponentType.NuGet;
resolution.Dependencies.Add(item: new BasePackage(name: dep.Name, dep_type1, version: version));
}
}
else
Expand All @@ -128,8 +140,11 @@ public DependencyResolution Process()
{
foreach (var dep in framework.Dependencies)
{
var dep_type1 = project_references.Contains(dep.Name)
? ComponentType.Project
: ComponentType.NuGet;
var version = tree_builder.GetResolvedVersion(name: dep.Name, range: dep.LibraryRange.VersionRange);
resolution.Dependencies.Add(item: new BasePackage(name: dep.Name, version: version));
resolution.Dependencies.Add(item: new BasePackage(name: dep.Name, dep_type1, version: version));
}
}
}
Expand All @@ -152,8 +167,13 @@ public DependencyResolution Process()
version = library_version.ToNormalizedString();
}

resolution.Dependencies.Add(
item: new BasePackage(name: project_dependency.GetName()!, version: version));
var name = project_dependency.GetName()!;


var dep_type1 = project_references.Contains(name)
? ComponentType.Project
: ComponentType.NuGet;
resolution.Dependencies.Add(item: new BasePackage(name: name, dep_type1, version: version));
}
}

Expand Down
56 changes: 36 additions & 20 deletions src/nuget-inspector/Models.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,30 @@
using NuGet.Versioning;

namespace NugetInspector
{
#pragma warning disable IDE1006
{
#pragma warning disable IDE1006
public class Dependency
{
public string? name;
public NuGetFramework? framework;
public VersionRange? version_range;
public string type;
public bool is_direct;

//True only for legacy packages.config-based projects only when set there
public bool is_development_dependency = false;

public Dependency(
string? name,
string type,
VersionRange? version_range,
NuGetFramework? framework = null,
bool is_direct = false,
bool is_development_dependency = false)
{
this.framework = framework;
this.name = name;
this.type = type;
this.version_range = version_range;
this.is_direct = is_direct;
this.is_development_dependency = is_development_dependency;
Expand All @@ -40,6 +43,7 @@ public BasePackage CreateEmptyBasePackage()
{
return new BasePackage(
name: name!,
type: type,
version: version_range?.MinVersion.ToNormalizedString(),
framework: framework?.ToString()
);
Expand Down Expand Up @@ -144,6 +148,12 @@ public VersionPair(string rawVersion, NuGetVersion version)
}
}

public static class ComponentType
{
public const string NuGet = "nuget";
public const string Project = "project";
}

/// <summary>
/// Package data object using purl as identifying attributes as
/// specified here https://github.com/package-url/purl-spec
Expand Down Expand Up @@ -192,13 +202,14 @@ public class BasePackage : IEquatable<BasePackage>, IComparable<BasePackage>

// Track if we updated this package metadata
[JsonIgnore]
public bool has_updated_metadata;

public BasePackage(){}
public bool has_updated_metadata;
public BasePackage() { }

public BasePackage(string name, string? version, string? framework = "", string? datafile_path = "")
public BasePackage(string name, string type, string? version, string? framework = "", string? datafile_path = "")
{
this.name = name;
this.type = type;
this.version = version;
if (!string.IsNullOrWhiteSpace(framework))
this.version = version;
Expand All @@ -210,7 +221,7 @@ public BasePackage(string name, string? version, string? framework = "", string?

public static BasePackage FromPackage(BasePackage package, List<BasePackage> dependencies)
{
return new(name: package.name, version: package.version)
return new(name: package.name, type: package.type, version: package.version)
{
extra_data = package.extra_data,
dependencies = dependencies
Expand All @@ -220,13 +231,14 @@ public static BasePackage FromPackage(BasePackage package, List<BasePackage> dep
///<summary>
/// Return a deep clone of this package. Optionally clone dependencies.
///</summary>
public BasePackage Clone(bool with_deps=false)
public BasePackage Clone(bool with_deps = false)
{
List<BasePackage> deps = with_deps ? dependencies : new List<BasePackage>();

return new BasePackage(
name: name,
version:version,
type: type,
version: version,
datafile_path: datafile_path
)
{
Expand Down Expand Up @@ -318,7 +330,8 @@ public void Update(NugetApi nugetApi, bool with_details = false)

try
{
UpdateWithRemoteMetadata(nugetApi, with_details: with_details);
if (!type.Equals(ComponentType.Project))
UpdateWithRemoteMetadata(nugetApi, with_details: with_details);
}
catch (Exception ex)
{
Expand Down Expand Up @@ -527,7 +540,8 @@ public static string GetApiDataUrl(PackageIdentity pid, SourcePackageDependencyI
/// <summary>
/// Sort recursively the dependencies of this package.
/// </summary>
public void Sort() {
public void Sort()
{
dependencies.Sort();
foreach (var dep in dependencies)
dep.Sort();
Expand Down Expand Up @@ -599,12 +613,13 @@ public class Party

public Party Clone()
{
return new Party(){
type=type,
role=role,
name=name,
email=email,
url=url
return new Party()
{
type = type,
role = role,
name = name,
email = email,
url = url
};
}
}
Expand All @@ -631,14 +646,15 @@ public class PackageDownload
public string hash { get; set; } = "";
public string hash_algorithm { get; set; } = "";
public int? size { get; set; } = 0;
public bool IsEnhanced(){
public bool IsEnhanced()
{
return !string.IsNullOrWhiteSpace(download_url) && !string.IsNullOrWhiteSpace(hash);
}

public static PackageDownload FromSpdi(SourcePackageDependencyInfo spdi)
{
PackageDownload download = new(){ download_url = spdi.DownloadUri.ToString() };
/// Note that this hash is unlikely there per https://github.com/NuGet/NuGetGallery/issues/9433
PackageDownload download = new() { download_url = spdi.DownloadUri.ToString() };
// Note that this hash is unlikely there per https://github.com/NuGet/NuGetGallery/issues/9433
if (!string.IsNullOrEmpty(spdi.PackageHash))
{
download.hash = spdi.PackageHash;
Expand Down
7 changes: 5 additions & 2 deletions src/nuget-inspector/NugetResolverHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@ public void ResolveOne(Dependency dependency)
}

if (dependency.name != null)
package_tree.AddOrUpdatePackage(id: new BasePackage(name: dependency.name, version: version));
package_tree.AddOrUpdatePackage(id: new BasePackage(name: dependency.name, type: dependency.type, version: version));
return;
}

var base_package = new BasePackage(
name: dependency.name!,
type: dependency.type,
version: psmr.Identity.Version.ToNormalizedString());

IEnumerable<NuGet.Packaging.Core.PackageDependency> packages = nugetApi.GetPackageDependenciesForPackage(
Expand All @@ -74,7 +75,7 @@ public void ResolveOne(Dependency dependency)
var resolved_version = package_tree.GetResolvedVersion(name: pkg.Id, range: pkg.VersionRange);
if (resolved_version != null)
{
var base_pkg = new BasePackage(name: pkg.Id, version: resolved_version);
var base_pkg = new BasePackage(name: pkg.Id, type: ComponentType.NuGet, version: resolved_version);
dependencies.Add(item: base_pkg);
if (Config.TRACE)
Console.WriteLine($" dependencies.Add name: {pkg.Id}, version: {resolved_version}");
Expand All @@ -93,6 +94,7 @@ public void ResolveOne(Dependency dependency)

var dependent_package = new BasePackage(
name: psrm.Identity.Id,
type: ComponentType.NuGet,
version: psrm.Identity.Version.ToNormalizedString());

dependencies.Add(item: dependent_package);
Expand All @@ -101,6 +103,7 @@ public void ResolveOne(Dependency dependency)
{
Dependency pd = new(
name: pkg.Id,
type: ComponentType.NuGet,
version_range: pkg.VersionRange,
framework: dependency.framework);

Expand Down
Loading
Loading