Tools/DependencyListGenerator- enable analysis

Author: Kielek

tools/DependencyListGenerator/DependencyListGenerator.csproj

@@ -7,6 +7,7 @@
     <Nullable>disable</Nullable>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\test\test-keypair.snk</AssemblyOriginatorKeyFile>
+    <AnalysisLevel>latest-All</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>

tools/DependencyListGenerator/DotNetOutdated/Models/FrameworkInfo.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace DependencyListGenerator.DotNetOutdated.Models;
+
+public record FrameworkInfo
+{
+    [JsonPropertyName("framework")]
+    public string Framework { get; init; } = string.Empty;
+
+    [JsonPropertyName("topLevelPackages")]
+    public IReadOnlyCollection<PackageReference> TopLevelPackages { get; init; } = [];
+
+    [JsonPropertyName("transitivePackages")]
+    public IReadOnlyCollection<PackageReference> TransitivePackages { get; init; } = [];
+}

tools/DependencyListGenerator/DotNetOutdated/Models/PackageListModel.cs

@@ -11,41 +11,5 @@ public record PackageListModel
     public string Parameters { get; init; } = string.Empty;
 
     [JsonPropertyName("projects")]
-    public ProjectInfo[] Projects { get; init; } = [];
-
-    public record ProjectInfo
-    {
-        [JsonPropertyName("path")]
-        public string Path { get; init; } = string.Empty;
-
-        [JsonPropertyName("frameworks")]
-        public FrameworkInfo[] Frameworks { get; init; } = [];
-    }
-
-    public record FrameworkInfo
-    {
-        [JsonPropertyName("framework")]
-        public string Framework { get; init; } = string.Empty;
-
-        [JsonPropertyName("topLevelPackages")]
-        public PackageReference[] TopLevelPackages { get; init; } = [];
-
-        [JsonPropertyName("transitivePackages")]
-        public PackageReference[] TransitivePackages { get; init; } = [];
-    }
-
-    public record PackageReference
-    {
-        [JsonPropertyName("id")]
-        public string Id { get; init; } = string.Empty;
-
-        [JsonPropertyName("requestedVersion")]
-        public string RequestedVersion { get; init; }
-
-        [JsonPropertyName("resolvedVersion")]
-        public string ResolvedVersion { get; init; } = string.Empty;
-
-        [JsonPropertyName("latestVersion")]
-        public string LatestVersion { get; init; }
-    }
+    public IReadOnlyCollection<ProjectInfo> Projects { get; init; } = [];
 }

tools/DependencyListGenerator/DotNetOutdated/Models/PackageReference.cs

@@ -0,0 +1,18 @@
+using System.Text.Json.Serialization;
+
+namespace DependencyListGenerator.DotNetOutdated.Models;
+
+public record PackageReference
+{
+    [JsonPropertyName("id")]
+    public string Id { get; init; } = string.Empty;
+
+    [JsonPropertyName("requestedVersion")]
+    public string RequestedVersion { get; init; }
+
+    [JsonPropertyName("resolvedVersion")]
+    public string ResolvedVersion { get; init; } = string.Empty;
+
+    [JsonPropertyName("latestVersion")]
+    public string LatestVersion { get; init; }
+}

tools/DependencyListGenerator/DotNetOutdated/Models/ProjectInfo.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace DependencyListGenerator.DotNetOutdated.Models;
+
+public record ProjectInfo
+{
+    [JsonPropertyName("path")]
+    public string Path { get; init; } = string.Empty;
+
+    [JsonPropertyName("frameworks")]
+    public IReadOnlyCollection<FrameworkInfo> Frameworks { get; init; } = [];
+}

tools/DependencyListGenerator/DotNetOutdated/Services/DotNetPackageListService.cs

@@ -4,22 +4,20 @@ namespace DependencyListGenerator.DotNetOutdated.Services;
 
 public class DotNetPackageListService
 {
-    private readonly DotNetRunner _dotNetRunner;
     private readonly IFileSystem _fileSystem;
 
-    public DotNetPackageListService(DotNetRunner dotNetRunner, IFileSystem fileSystem)
+    public DotNetPackageListService(IFileSystem fileSystem)
     {
-        _dotNetRunner = dotNetRunner;
         _fileSystem = fileSystem;
     }
 
     public RunStatus ListPackages(string projectPath)
     {
-        string[] arguments = new[]
-        {
+        string[] arguments =
+        [
             "list", $"\"{projectPath}\"", "package", "--include-transitive", "--format", "json", "--output-version", "1"
-        };
+        ];
 
-        return _dotNetRunner.Run(_fileSystem.Path.GetDirectoryName(projectPath), arguments);
+        return DotNetRunner.Run(_fileSystem.Path.GetDirectoryName(projectPath), arguments);
     }
 }

tools/DependencyListGenerator/DotNetOutdated/Services/DotNetRestoreService.cs

@@ -4,19 +4,17 @@ namespace DependencyListGenerator.DotNetOutdated.Services;
 
 public class DotNetRestoreService
 {
-    private readonly DotNetRunner _dotNetRunner;
     private readonly IFileSystem _fileSystem;
 
-    public DotNetRestoreService(DotNetRunner dotNetRunner, IFileSystem fileSystem)
+    public DotNetRestoreService(IFileSystem fileSystem)
     {
-        _dotNetRunner = dotNetRunner;
         _fileSystem = fileSystem;
     }
 
     public RunStatus Restore(string projectPath)
     {
-        string[] arguments = new[] { "restore", $"\"{projectPath}\"" };
+        string[] arguments = ["restore", $"\"{projectPath}\""];
 
-        return _dotNetRunner.Run(_fileSystem.Path.GetDirectoryName(projectPath), arguments);
+        return DotNetRunner.Run(_fileSystem.Path.GetDirectoryName(projectPath), arguments);
     }
 }

tools/DependencyListGenerator/DotNetOutdated/Services/DotNetRunner.cs

@@ -7,9 +7,9 @@ namespace DependencyListGenerator.DotNetOutdated.Services;
 /// <remarks>
 /// Credit for the stuff happening in here goes to the https://github.com/jaredcnance/dotnet-status project
 /// </remarks>
-public class DotNetRunner
+public static class DotNetRunner
 {
-    public RunStatus Run(string workingDirectory, string[] arguments)
+    public static RunStatus Run(string workingDirectory, string[] arguments)
     {
         var psi = new ProcessStartInfo(DotNetExe.FullPathOrDefault(), string.Join(" ", arguments))
         {

tools/DependencyListGenerator/DotNetOutdated/Services/ProjectAnalysisService.cs

@@ -22,7 +22,7 @@ public ProjectAnalysisService(DotNetRestoreService dotNetRestoreService, DotNetP
         _fileSystem = fileSystem;
     }
 
-    public List<Project> AnalyzeProject(string projectPath, bool runRestore)
+    public IReadOnlyCollection<Project> AnalyzeProject(string projectPath, bool runRestore)
     {
         if (runRestore)
         {