cleanup test

NuGet · Feb 5, 2025 · 0900223 · 0900223
1 parent c04b00f
commit 0900223
Show file tree

Hide file tree

Showing 7 changed files with 5,572 additions and 253 deletions.
diff --git a/.../NuGet.CommandLine.XPlat/Commands/PackageReferenceCommands/ListPackage/ListPackageArgs.cs b/.../NuGet.CommandLine.XPlat/Commands/PackageReferenceCommands/ListPackage/ListPackageArgs.cs
@@ -26,7 +26,7 @@ internal class ListPackageArgs
         public bool HighestPatch { get; }
         public bool HighestMinor { get; }
         public CancellationToken CancellationToken { get; }
-        public List<PackageSource> AuditSources { get; }
+        public IReadOnlyList<PackageSource> AuditSources { get; }
 
         /// <summary>
         /// A constructor for the arguments of list package
@@ -55,7 +55,7 @@ public ListPackageArgs(
             bool prerelease,
             bool highestPatch,
             bool highestMinor,
-            List<PackageSource> auditSources,
+            IReadOnlyList<PackageSource> auditSources,
             ILogger logger,
             CancellationToken cancellationToken)
         {

diff --git a/...Get.CommandLine.XPlat/Commands/PackageReferenceCommands/ListPackage/ListPackageCommand.cs b/...Get.CommandLine.XPlat/Commands/PackageReferenceCommands/ListPackage/ListPackageCommand.cs
@@ -140,7 +140,7 @@ public static void Register(
                         prerelease.HasValue(),
                         highestPatch.HasValue(),
                         highestMinor.HasValue(),
-                        provider.LoadAuditSources().ToList(),
+                        provider.LoadAuditSources(),
                         logger,
                         CancellationToken.None);
 

diff --git a/...mmandLine.XPlat/Commands/PackageReferenceCommands/ListPackage/ListPackageCommandRunner.cs b/...mmandLine.XPlat/Commands/PackageReferenceCommands/ListPackage/ListPackageCommandRunner.cs
@@ -95,8 +95,10 @@ private async Task GetProjectMetadataAsync(
             var projectName = project.GetPropertyValue(ProjectName);
             ListPackageProjectModel projectModel = listPackageReportModel.CreateProjectReportData(projectPath: projectPath, projectName);
 
-            if (!IsProjectPackageReference(project, projectModel, projectPath))
+            if (!MSBuildAPIUtility.IsPackageReferenceProject(project))
             {
+                projectModel.AddProjectInformation(problemType: ProblemType.Error,
+                    string.Format(CultureInfo.CurrentCulture, Strings.Error_NotPRProject, projectPath));
                 return;
             }
 
@@ -157,7 +159,7 @@ private static async Task GetVulnerabilitiesFromAuditSourcesAsync(
             ListPackageProjectModel projectModel,
             List<FrameworkPackages> frameworks)
         {
-            var vulnerabilities = await GetVulnerabilityData(
+            List<IReadOnlyDictionary<string, IReadOnlyList<PackageVulnerabilityInfo>>> vulnerabilities = await GetVulnerabilityData(
                 projectModel,
                 listPackageReportModel,
                 listPackageArgs.AuditSources,
@@ -235,18 +237,6 @@ private static bool IsProjectAssetsFileValid(string assetsPath, string projectPa
             }
         }
 
-        private static bool IsProjectPackageReference(Project project, ListPackageProjectModel projectModel, string projectPath)
-        {
-            if (!MSBuildAPIUtility.IsPackageReferenceProject(project))
-            {
-                projectModel.AddProjectInformation(problemType: ProblemType.Error,
-                    string.Format(CultureInfo.CurrentCulture, Strings.Error_NotPRProject, projectPath));
-                return false;
-            }
-
-            return true;
-        }
-
         private static async Task<List<IReadOnlyDictionary<string, IReadOnlyList<PackageVulnerabilityInfo>>>> GetVulnerabilityData(
             ListPackageProjectModel projectModel,
             ListPackageReportModel reportModel,