From c520b37c905acc8681fcb4a70349a3449ce6cb61 Mon Sep 17 00:00:00 2001 From: Matt Parker <61717342+MattParkerDev@users.noreply.github.com> Date: Sun, 2 Nov 2025 15:52:03 +1000 Subject: [PATCH] refactor --- .../Features/Evaluation/ProjectEvaluation.cs | 29 +++++++++---------- .../Features/Nuget/NugetClientService.cs | 4 +-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/SharpIDE.Application/Features/Evaluation/ProjectEvaluation.cs b/src/SharpIDE.Application/Features/Evaluation/ProjectEvaluation.cs index 3c8fce9..be3f558 100644 --- a/src/SharpIDE.Application/Features/Evaluation/ProjectEvaluation.cs +++ b/src/SharpIDE.Application/Features/Evaluation/ProjectEvaluation.cs @@ -57,21 +57,6 @@ public static class ProjectEvaluation return Guid.Parse(userSecretsId); } - public class InstalledPackage - { - public required string Name { get; set; } - public required string RequestedVersion { get; set; } - public required string? ResolvedVersion { get; set; } - public required string TargetFramework { get; set; } - public required bool IsTopLevel { get; set; } - public required bool IsAutoReferenced { get; set; } - public List? DependentPackages { get; set; } - } - public class DependentPackage - { - public required string PackageName { get; set; } - public required VersionRange RequestedVersion { get; set; } - } public static async Task> GetPackageReferencesForProject(SharpIdeProjectModel projectModel, bool includeTransitive = true) { using var _ = SharpIdeOtel.Source.StartActivity($"{nameof(ProjectEvaluation)}.{nameof(GetPackageReferencesForProject)}"); @@ -141,4 +126,18 @@ public static class ProjectEvaluation return packages; } +public class InstalledPackage +{ + public required string Name { get; set; } + public required string RequestedVersion { get; set; } + public required string? ResolvedVersion { get; set; } + public required string TargetFramework { get; set; } + public required bool IsTopLevel { get; set; } + public required bool IsAutoReferenced { get; set; } + public List? DependentPackages { get; set; } +} +public class DependentPackage +{ + public required string PackageName { get; set; } + public required VersionRange RequestedVersion { get; set; } } diff --git a/src/SharpIDE.Application/Features/Nuget/NugetClientService.cs b/src/SharpIDE.Application/Features/Nuget/NugetClientService.cs index 4a82d7e..b0c01e9 100644 --- a/src/SharpIDE.Application/Features/Nuget/NugetClientService.cs +++ b/src/SharpIDE.Application/Features/Nuget/NugetClientService.cs @@ -9,7 +9,7 @@ using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence; namespace SharpIDE.Application.Features.Nuget; -public record InstalledNugetPackageInfo(bool IsTransitive, NuGetVersion Version, List? DependentPackages); +public record InstalledNugetPackageInfo(bool IsTransitive, NuGetVersion Version, List? DependentPackages); public record IdePackageResult(string PackageId, List PackageFromSources, InstalledNugetPackageInfo? InstalledNugetPackageInfo); public record struct IdePackageFromSourceResult(IPackageSearchMetadata PackageSearchMetadata, PackageSource Source); public class NugetClientService @@ -109,7 +109,7 @@ public class NugetClientService return metadataList; } - public async Task> GetPackagesForInstalledPackages(string directoryPath, List installedPackages, CancellationToken cancellationToken = default) + public async Task> GetPackagesForInstalledPackages(string directoryPath, List installedPackages, CancellationToken cancellationToken = default) { var settings = Settings.LoadDefaultSettings(root: directoryPath); var packageSourceProvider = new PackageSourceProvider(settings);