Merge branch 'main' into dependabot/nuget/SDV.App/Serilog.Extensions.Logging-9.0.2

AndriiLab · web-flow · commit 7f197e6b5641 · 2025-11-15T18:18:16.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ riderModule.iml
 /_ReSharper.Caches/
 .idea/
 **/node_modules/
-SDV.sln.DotSettings.user
+SDV.sln.DotSettings.user
+.vs
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # SDV - Solution Dependencies Visualiser
 
 ![MIT License](https://img.shields.io/github/license/AndriiLab/SDV)
-![.NET Core 9.0](https://img.shields.io/badge/.net%20core-9.0-blue)
+![.NET Core 10.0](https://img.shields.io/badge/.net%20core-10.0-blue)
 ![Last Commit](https://img.shields.io/github/last-commit/AndriiLab/SDV)
 ![Last release](https://img.shields.io/github/release-date/AndriiLab/SDV)
 
@@ -36,7 +36,7 @@ But you can also check functional output demo [here](https://andriilab.github.io
 ## Prerequisites
 
 - Windows platform (only supported for now by GUI)
-- [.NET 9](https://dotnet.microsoft.com/en-us/download/dotnet/9.0)
+- [.NET 10](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
 
 ## Installation
 
diff --git a/SDV.App/SDV.App.csproj b/SDV.App/SDV.App.csproj
@@ -1,16 +1,16 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net9.0-windows</TargetFramework>
+        <TargetFramework>net10.0-windows</TargetFramework>
         <Nullable>enable</Nullable>
         <UseWPF>true</UseWPF>
-        <Version>1.0.5</Version>
+        <Version>1.1.0</Version>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
     </ItemGroup>
 
diff --git a/SDV.DependenciesAnalyzer/AssetsJson/AssetsExtractor.cs b/SDV.DependenciesAnalyzer/AssetsJson/AssetsExtractor.cs
@@ -8,20 +8,13 @@
 
 namespace SDV.DependenciesAnalyzer.AssetsJson;
 
-public class AssetsExtractorBuilder : IExtractorBuilder
+public class AssetsExtractorBuilder(ILogger log) : IExtractorBuilder
 {
-    private readonly ILogger _log;
-
-    public AssetsExtractorBuilder(ILogger log)
-    {
-        _log = log;
-    }
-    
     public bool IsCompatible(string projectName, string dependenciesSource)
     {
         if (dependenciesSource.EndsWith("project.assets.json"))
         {
-            _log.LogInformation("Found {File} file for project: {Project}", dependenciesSource, projectName);
+            log.LogInformation("Found {File} file for project: {Project}", dependenciesSource, projectName);
             return true;
         }
 
@@ -30,7 +23,7 @@ public bool IsCompatible(string projectName, string dependenciesSource)
 
     public IExtractor GetExtractor(string dependenciesSource, string csprojPath, string solutionPath)
     {
-        return AssetsExtractor.NewExtractor(dependenciesSource, _log);
+        return AssetsExtractor.NewExtractor(dependenciesSource, log);
     }
 
     private class AssetsExtractor : IExtractor
diff --git a/SDV.DependenciesAnalyzer/AssetsJson/AssetsUtils.cs b/SDV.DependenciesAnalyzer/AssetsJson/AssetsUtils.cs
@@ -7,18 +7,11 @@
 
 namespace SDV.DependenciesAnalyzer.AssetsJson;
 
-public class AssetsUtils
+public class AssetsUtils(ILogger log)
 {
-    private readonly ILogger _log;
-
     private const string AbsentNupkgWarnMsg = 
         "Skipping adding this dependency to the dependency tree. This might be because the package already exists in a different NuGet cache, possibly the SDK's NuGetFallbackFolder cache. Removing the package from this cache may resolve the issue.";
 
-    public AssetsUtils(ILogger log)
-    {
-        _log = log;
-    }
-
     public List<string> GetDirectDependencies(ProjectAssetsJsonModel assets)
     {
         var frameworks = assets.Project.Frameworks;
@@ -67,7 +60,7 @@ public CaseInsensitiveMap<IDependencyDetails> GetAllDependencies(ProjectAssetsJs
             {
                 if (IsPackagePartOfTargetDependencies(assets, libraryPath))
                 {
-                    _log.LogWarning(
+                    log.LogWarning(
                         "The file {File} doesn't exist in the NuGet cache directory but it does exist as a target in the assets files. {WarnMessage}",
                         nupkgFilePath, AbsentNupkgWarnMsg);
                     continue;
diff --git a/SDV.DependenciesAnalyzer/Common/CaseInsensitiveMap.cs b/SDV.DependenciesAnalyzer/Common/CaseInsensitiveMap.cs
@@ -1,8 +1,3 @@
 ﻿namespace SDV.DependenciesAnalyzer.Common;
 
-public class CaseInsensitiveMap<T> : Dictionary<string, T>
-{
-    public CaseInsensitiveMap() : base(StringComparer.OrdinalIgnoreCase)
-    {
-    }
-}
+public class CaseInsensitiveMap<T>() : Dictionary<string, T>(StringComparer.OrdinalIgnoreCase);
diff --git a/SDV.DependenciesAnalyzer/Dependencies/DependenciesUtils.cs b/SDV.DependenciesAnalyzer/Dependencies/DependenciesUtils.cs
@@ -4,17 +4,10 @@
 
 namespace SDV.DependenciesAnalyzer.Dependencies;
 
-public class DependenciesUtils
+public class DependenciesUtils(ILogger log)
 {
-    private readonly ILogger _log;
-    private TreeGeneratorConfiguration _configuration;
+    private TreeGeneratorConfiguration _configuration = new(string.Empty, [], []);
 
-    public DependenciesUtils(ILogger log)
-    {
-        _log = log;
-        _configuration = new TreeGeneratorConfiguration(string.Empty, [], []);
-    }
-    
     public DependencyTree[] CreateDependencyTree(IExtractor extractor, TreeGeneratorConfiguration configuration)
     {
         _configuration = configuration;
@@ -35,7 +28,7 @@ public DependencyTree[] CreateDependencyTree(IExtractor extractor, TreeGenerator
             }
             else
             {
-                _log.LogWarning("Unexpected dependency found in root dependencies array: {RootId}", rootId);
+                log.LogWarning("Unexpected dependency found in root dependencies array: {RootId}", rootId);
             }
         }
 
@@ -60,7 +53,7 @@ private IEnumerable<DependencyTree> FindChildrenDependencies(string id,
             }
             else
             {
-                _log.LogWarning("Unexpected dependency found in children array: {ChildId}", childId);
+                log.LogWarning("Unexpected dependency found in children array: {ChildId}", childId);
             }
         }
     }
diff --git a/SDV.DependenciesAnalyzer/Exceptions/NugetDepsTreeException.cs b/SDV.DependenciesAnalyzer/Exceptions/NugetDepsTreeException.cs
@@ -1,8 +1,3 @@
 ﻿namespace SDV.DependenciesAnalyzer.Exceptions;
 
-public class NugetDepsTreeException : Exception
-{
-    public NugetDepsTreeException(string message) : base(message)
-    {
-    }
-}
+public class NugetDepsTreeException(string message) : Exception(message);
diff --git a/SDV.DependenciesAnalyzer/Models/Project.cs b/SDV.DependenciesAnalyzer/Models/Project.cs
@@ -1,14 +1,8 @@
 ﻿namespace SDV.DependenciesAnalyzer.Models;
 
-public class Project
+public class Project(string name, DependencyTree[] dependencies)
 {
-    public Project(string name, DependencyTree[] dependencies)
-    {
-        Name = name;
-        Dependencies = dependencies;
-    }
+    public string Name { get; } = name;
 
-    public string Name { get; }
-
-    public DependencyTree[] Dependencies { get; }
+    public DependencyTree[] Dependencies { get; } = dependencies;
 }
diff --git a/SDV.DependenciesAnalyzer/Models/Tree.cs b/SDV.DependenciesAnalyzer/Models/Tree.cs
@@ -1,13 +1,7 @@
 ﻿namespace SDV.DependenciesAnalyzer.Models;
 
-public class Tree
+public class Tree(string solutionName)
 {
-    public Tree(string solutionName)
-    {
-        SolutionName = solutionName;
-        Projects = new List<Project>();
-    }
-
-    public string SolutionName { get; }
-    public List<Project> Projects { get; }
+    public string SolutionName { get; } = solutionName;
+    public List<Project> Projects { get; } = [];
 }
diff --git a/SDV.DependenciesAnalyzer/PackagesConfig/Dfs.cs b/SDV.DependenciesAnalyzer/PackagesConfig/Dfs.cs
@@ -1,17 +1,8 @@
 ﻿namespace SDV.DependenciesAnalyzer.PackagesConfig;
 
-public class Dfs
+public class Dfs(bool visited, bool notRoot, bool circular)
 {
-    public Dfs(bool visited, bool notRoot, bool circular)
-    {
-        Visited = visited;
-        NotRoot = notRoot;
-        Circular = circular;
-    }
-
-    public bool Circular { get; set; }
-
-    public bool NotRoot { get; set; }
-
-    public bool Visited { get; set; }
+    public bool Circular { get; set; } = circular;
+    public bool NotRoot { get; set; } = notRoot;
+    public bool Visited { get; set; } = visited;
 }
diff --git a/SDV.DependenciesAnalyzer/PackagesConfig/NugetPackage.cs b/SDV.DependenciesAnalyzer/PackagesConfig/NugetPackage.cs
@@ -2,16 +2,9 @@
 
 namespace SDV.DependenciesAnalyzer.PackagesConfig;
 
-public class NugetPackage
+public class NugetPackage(string id, string version)
 {
-    public string Id { get; }
-    public string Version { get; }
-    public CaseInsensitiveMap<bool> Dependencies { get; }
-
-    public NugetPackage(string id, string version)
-    {
-        Id = id;
-        Version = version;
-        Dependencies = new CaseInsensitiveMap<bool>();
-    }
+    public string Id { get; } = id;
+    public string Version { get; } = version;
+    public CaseInsensitiveMap<bool> Dependencies { get; } = new();
 }
diff --git a/SDV.DependenciesAnalyzer/PackagesConfig/PackagesExtractor.cs b/SDV.DependenciesAnalyzer/PackagesConfig/PackagesExtractor.cs
@@ -7,21 +7,14 @@
 
 namespace SDV.DependenciesAnalyzer.PackagesConfig;
 
-public class PackagesExtractorBuilder : IExtractorBuilder
+public class PackagesExtractorBuilder(ILogger log) : IExtractorBuilder
 {
-    private readonly ILogger _log;
-
-    public PackagesExtractorBuilder(ILogger log)
-    {
-        _log = log;
-    }
-
     public bool IsCompatible(string projectName, string dependenciesSource)
     {
         const string packagesFileName = "packages.config";
         if (dependenciesSource.EndsWith(packagesFileName))
         {
-            _log.LogInformation("Found {File} file for project: {Project}", dependenciesSource, projectName);
+            log.LogInformation("Found {File} file for project: {Project}", dependenciesSource, projectName);
             return true;
         }
 
@@ -30,7 +23,7 @@ public bool IsCompatible(string projectName, string dependenciesSource)
 
     public IExtractor GetExtractor(string dependenciesSource, string csprojPath, string solutionPath)
     {
-        return PackagesExtractor.NewExtractor(dependenciesSource, csprojPath, solutionPath, _log);
+        return PackagesExtractor.NewExtractor(dependenciesSource, csprojPath, solutionPath, log);
     }
 
     private class PackagesExtractor : IExtractor
diff --git a/SDV.DependenciesAnalyzer/SDV.DependenciesAnalyzer.csproj b/SDV.DependenciesAnalyzer/SDV.DependenciesAnalyzer.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Version>1.0.5</Version>
+        <Version>1.1.0</Version>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
-      <PackageReference Include="NuGet.Packaging" Version="6.13.2" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
+      <PackageReference Include="NuGet.Packaging" Version="7.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/SDV.DependenciesAnalyzer/Structure/Dependency.cs b/SDV.DependenciesAnalyzer/Structure/Dependency.cs
@@ -2,14 +2,8 @@
 
 namespace SDV.DependenciesAnalyzer.Structure;
 
-public class Dependency : IDependencyDetails
+public class Dependency(string id, string version) : IDependencyDetails
 {
-    public Dependency(string id, string version)
-    {
-        Id = id;
-        Version = version;
-    }
-    
-    public string Id { get; }
-    public string Version { get; }
+    public string Id { get; } = id;
+    public string Version { get; } = version;
 }
diff --git a/SDV.DependenciesAnalyzer/Structure/ProjectBuilder.cs b/SDV.DependenciesAnalyzer/Structure/ProjectBuilder.cs
@@ -8,22 +8,14 @@
 
 namespace SDV.DependenciesAnalyzer.Structure;
 
-public class ProjectBuilder
+public class ProjectBuilder(ILogger log)
 {
-    private readonly ILogger _log;
-    private readonly IExtractorBuilder[] _extractorBuilders;
-    private readonly DependenciesUtils _dependenciesUtils;
-
-    public ProjectBuilder(ILogger log)
-    {
-        _log = log;
-        _dependenciesUtils = new DependenciesUtils(log);
-        _extractorBuilders = new IExtractorBuilder[]
-        {
-            new AssetsExtractorBuilder(log),
-            new PackagesExtractorBuilder(log)
-        };
-    }
+    private readonly IExtractorBuilder[] _extractorBuilders =
+    [
+        new AssetsExtractorBuilder(log),
+        new PackagesExtractorBuilder(log)
+    ];
+    private readonly DependenciesUtils _dependenciesUtils = new(log);
 
     public Project Load(string name, string csprojPath, string dependenciesSource, string solutionPath)
     {
@@ -35,19 +27,18 @@ public DependencyTree[] CreateDependencyTree(Project project, TreeGeneratorConfi
     {
         return project.Extractor is not null
             ? _dependenciesUtils.CreateDependencyTree(project.Extractor, configuration)
-            : Array.Empty<DependencyTree>();
+            : [];
     }
 
     private IExtractor? GetCompatibleExtractor(string projectName, string dependenciesSource, string csprojPath, string solutionPath)
     {
         var builder = _extractorBuilders.FirstOrDefault(e => e.IsCompatible(projectName, dependenciesSource));
-        if (builder is null)
-        {
-            _log.LogWarning("Unsupported project dependencies for project: {ProjectName}", projectName);
-            return null;
-        }
+        if (builder is not null) 
+            return builder.GetExtractor(dependenciesSource, csprojPath, solutionPath);
+
+        log.LogWarning("Unsupported project dependencies for project: {ProjectName}", projectName);
+        return null;
 
-        return builder.GetExtractor(dependenciesSource, csprojPath, solutionPath);
     }
 
     public class Project
diff --git a/SDV.DependenciesAnalyzer/Structure/SolutionBuilder.cs b/SDV.DependenciesAnalyzer/Structure/SolutionBuilder.cs
diff --git a/SDV.GraphGenerator/Interfaces/IGraphBuilder.cs b/SDV.GraphGenerator/Interfaces/IGraphBuilder.cs
diff --git a/SDV.GraphGenerator/SDV.GraphGenerator.csproj b/SDV.GraphGenerator/SDV.GraphGenerator.csproj
diff --git a/SDV.GraphGenerator/Services/GraphBuilder.cs b/SDV.GraphGenerator/Services/GraphBuilder.cs
diff --git a/SDV.GraphGenerator/Services/GraphDataGenerator.cs b/SDV.GraphGenerator/Services/GraphDataGenerator.cs
diff --git a/SDV.GraphGenerator/Services/Models/GraphProject.cs b/SDV.GraphGenerator/Services/Models/GraphProject.cs
diff --git a/SDV.GraphGenerator/package-lock.json b/SDV.GraphGenerator/package-lock.json
diff --git a/SDV.GraphGenerator/package.json b/SDV.GraphGenerator/package.json

Original file line number	Diff line number	Diff line change
`@@ -8,20 +8,13 @@`
`8`	`8`
`9`	`9`	`namespace SDV.DependenciesAnalyzer.AssetsJson;`
`10`	`10`
`11`		`-public class AssetsExtractorBuilder : IExtractorBuilder`
	`11`	`+public class AssetsExtractorBuilder(ILogger log) : IExtractorBuilder`
`12`	`12`	`{`
`13`		`- private readonly ILogger _log;`
`14`		`-`
`15`		`- public AssetsExtractorBuilder(ILogger log)`
`16`		`- {`
`17`		`- _log = log;`
`18`		`- }`
`19`		`-`
`20`	`13`	`public bool IsCompatible(string projectName, string dependenciesSource)`
`21`	`14`	`{`
`22`	`15`	`if (dependenciesSource.EndsWith("project.assets.json"))`
`23`	`16`	`{`
`24`		`- _log.LogInformation("Found {File} file for project: {Project}", dependenciesSource, projectName);`
	`17`	`+ log.LogInformation("Found {File} file for project: {Project}", dependenciesSource, projectName);`
`25`	`18`	`return true;`
`26`	`19`	`}`
`27`	`20`
`@@ -30,7 +23,7 @@ public bool IsCompatible(string projectName, string dependenciesSource)`
`30`	`23`
`31`	`24`	`public IExtractor GetExtractor(string dependenciesSource, string csprojPath, string solutionPath)`
`32`	`25`	`{`
`33`		`- return AssetsExtractor.NewExtractor(dependenciesSource, _log);`
	`26`	`+ return AssetsExtractor.NewExtractor(dependenciesSource, log);`
`34`	`27`	`}`
`35`	`28`
`36`	`29`	`private class AssetsExtractor : IExtractor`
Original file line number	Diff line number	Diff line change
`@@ -4,17 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace SDV.DependenciesAnalyzer.Dependencies;`
`6`	`6`
`7`		`-public class DependenciesUtils`
	`7`	`+public class DependenciesUtils(ILogger log)`
`8`	`8`	`{`
`9`		`- private readonly ILogger _log;`
`10`		`- private TreeGeneratorConfiguration _configuration;`
	`9`	`+ private TreeGeneratorConfiguration _configuration = new(string.Empty, [], []);`
`11`	`10`
`12`		`- public DependenciesUtils(ILogger log)`
`13`		`- {`
`14`		`- _log = log;`
`15`		`- _configuration = new TreeGeneratorConfiguration(string.Empty, [], []);`
`16`		`- }`
`17`		`-`
`18`	`11`	`public DependencyTree[] CreateDependencyTree(IExtractor extractor, TreeGeneratorConfiguration configuration)`
`19`	`12`	`{`
`20`	`13`	`_configuration = configuration;`
`@@ -35,7 +28,7 @@ public DependencyTree[] CreateDependencyTree(IExtractor extractor, TreeGenerator`
`35`	`28`	`}`
`36`	`29`	`else`
`37`	`30`	`{`
`38`		`- _log.LogWarning("Unexpected dependency found in root dependencies array: {RootId}", rootId);`
	`31`	`+ log.LogWarning("Unexpected dependency found in root dependencies array: {RootId}", rootId);`
`39`	`32`	`}`
`40`	`33`	`}`
`41`	`34`
`@@ -60,7 +53,7 @@ private IEnumerable<DependencyTree> FindChildrenDependencies(string id,`
`60`	`53`	`}`
`61`	`54`	`else`
`62`	`55`	`{`
`63`		`- _log.LogWarning("Unexpected dependency found in children array: {ChildId}", childId);`
	`56`	`+ log.LogWarning("Unexpected dependency found in children array: {ChildId}", childId);`
`64`	`57`	`}`
`65`	`58`	`}`
`66`	`59`	`}`