dotnet list package works with unlisted and prerelease packages (#7038)

Author: zivkan

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageReferenceCommands/ListPackage/ListPackageCommandRunner.cs

@@ -422,7 +422,7 @@ internal async Task<Dictionary<string, List<IPackageSearchMetadata>>> GetPackage
                     : (Environment.ProcessorCount / listPackageArgs.PackageSources.Count) + 1;
 
             await ThrottledForEachAsync(allPackages,
-                async (packageId, cancellationToken) => await GetPackageVersionsAsync(packageId, listPackageArgs, cancellationToken),
+                async (packageId, cancellationToken) => await GetPackageMetadataAsync(packageId, listPackageArgs, cancellationToken),
                 packageMetadata => packageMetadataById[packageMetadata.Key] = packageMetadata.Value,
                 maxParallel,
                 listPackageArgs.CancellationToken);
@@ -559,7 +559,10 @@ internal async Task UpdatePackagesWithSourceMetadata(
                         // Get latest metadata *only* if this is a report requiring "outdated" metadata
                         if (listPackageArgs.ReportType == ReportType.Outdated && matchingPackage.Count > 0)
                         {
-                            var latestVersion = matchingPackage.Where(newVersion => MeetsConstraints(newVersion.Identity.Version, topLevelPackage, listPackageArgs)).Max(i => i.Identity.Version);
+                            var latestVersion = matchingPackage
+                                .Where(package => package.IsListed)
+                                .Where(newVersion => MeetsConstraints(newVersion.Identity.Version, topLevelPackage, listPackageArgs))
+                                .Max(i => i.Identity.Version);
 
                             if (latestVersion is not null)
                             {
@@ -595,7 +598,10 @@ internal async Task UpdatePackagesWithSourceMetadata(
                         // Get latest metadata *only* if this is a report requiring "outdated" metadata
                         if (listPackageArgs.ReportType == ReportType.Outdated && matchingPackage.Count > 0)
                         {
-                            var latestVersion = matchingPackage.Where(newVersion => MeetsConstraints(newVersion.Identity.Version, transitivePackage, listPackageArgs)).Max(i => i.Identity.Version);
+                            var latestVersion = matchingPackage
+                                .Where(newVersion => newVersion.IsListed)
+                                .Where(newVersion => MeetsConstraints(newVersion.Identity.Version, transitivePackage, listPackageArgs))
+                                .Max(i => i.Identity.Version);
 
                             transitivePackage.LatestPackageMetadata = matchingPackage.First(p => p.Identity.Version == latestVersion);
                             transitivePackage.UpdateLevel = GetUpdateLevel(transitivePackage.ResolvedPackageMetadata.Identity.Version, transitivePackage.LatestPackageMetadata.Identity.Version);
@@ -645,14 +651,13 @@ private UpdateLevel GetUpdateLevel(NuGetVersion resolvedVersion, NuGetVersion la
         }
 
         /// <summary>
-        /// Prepares the calls to sources for latest versions and updates
-        /// the list of tasks with the requests
+        /// Gets the package metadata for a specific package from all sources
         /// </summary>
         /// <param name="package">The package to get the latest version for</param>
         /// <param name="listPackageArgs">List args for the token and source provider></param>
         /// <param name="cancellationToken"></param>
         /// <returns>A list of tasks for all latest versions for packages from all sources</returns>
-        private async Task<KeyValuePair<string, List<IPackageSearchMetadata>>> GetPackageVersionsAsync(
+        private async Task<KeyValuePair<string, List<IPackageSearchMetadata>>> GetPackageMetadataAsync(
             string package,
             ListPackageArgs listPackageArgs,
             CancellationToken cancellationToken)
@@ -661,7 +666,7 @@ private async Task<KeyValuePair<string, List<IPackageSearchMetadata>>> GetPackag
             var sources = listPackageArgs.PackageSources;
 
             await ThrottledForEachAsync(sources,
-                async (source, innerCancellationToken) => await GetLatestVersionPerSourceAsync(source, listPackageArgs, package, innerCancellationToken),
+                async (source, innerCancellationToken) => await GetPackageMetadataAsync(source, listPackageArgs, package, innerCancellationToken),
                 continuation: results.AddRange,
                 maxParallel: listPackageArgs.PackageSources.Count,
                 cancellationToken);
@@ -670,14 +675,14 @@ await ThrottledForEachAsync(sources,
         }
 
         /// <summary>
-        /// Gets the highest version of a package from a specific source
+        /// Gets package metadata for a specific package from a specific source
         /// </summary>
         /// <param name="packageSource">The source to look for packages at</param>
         /// <param name="listPackageArgs">The list args for the cancellation token</param>
         /// <param name="package">Package to look for updates for</param>
         /// <param name="cancellationToken"></param>
         /// <returns>An updated package with the highest version at a single source</returns>
-        private async Task<IEnumerable<IPackageSearchMetadata>> GetLatestVersionPerSourceAsync(
+        private async Task<IEnumerable<IPackageSearchMetadata>> GetPackageMetadataAsync(
             PackageSource packageSource,
             ListPackageArgs listPackageArgs,
             string package,
@@ -687,11 +692,16 @@ private async Task<IEnumerable<IPackageSearchMetadata>> GetLatestVersionPerSourc
             var packageMetadataResource = await sourceRepository.GetResourceAsync<PackageMetadataResource>(cancellationToken);
 
             using var sourceCacheContext = new SourceCacheContext();
+            // This is used for --outdated, --deprecated, and --vulnerable.
+            // So, we need the package metadata for the currently installed version,
+            // even if it's pre-release or unlisted.
+            // This means that the logic for --outdated has to do filtering based on IsListed and
+            // prerelease.
             IEnumerable<IPackageSearchMetadata> packages =
                 await packageMetadataResource.GetMetadataAsync(
                     package,
-                    includePrerelease: listPackageArgs.Prerelease,
-                    includeUnlisted: false,
+                    includePrerelease: true,
+                    includeUnlisted: true,
                     sourceCacheContext: sourceCacheContext,
                     log: listPackageArgs.Logger,
                     token: listPackageArgs.CancellationToken);
@@ -710,7 +720,7 @@ await packageMetadataResource.GetMetadataAsync(
         /// <returns>Whether the new version meets the constraints or not</returns>
         private bool MeetsConstraints(NuGetVersion newVersion, InstalledPackageReference package, ListPackageArgs listPackageArgs)
         {
-            var result = !newVersion.IsPrerelease || listPackageArgs.Prerelease || package.ResolvedPackageMetadata.Identity.Version.IsPrerelease;
+            var result = !newVersion.IsPrerelease || listPackageArgs.Prerelease;
 
             if (listPackageArgs.HighestPatch)
             {

test/NuGet.Clients.Tests/NuGet.CommandLine.Test/Util.cs

@@ -559,7 +559,12 @@ public static void CreatePackage(string repositoryPath, string id, string versio
         /// </summary>
         public static JObject CreateSinglePackageRegistrationBlob(MockServer server, string id, string version)
         {
-            return FeedUtilities.CreatePackageRegistrationBlob(server.Uri, id, new KeyValuePair<string, bool>[] { new KeyValuePair<string, bool>(version, true) }, new HashSet<PackageIdentity>());
+            return FeedUtilities.CreatePackageRegistrationBlob(
+                server.Uri,
+                id,
+                new KeyValuePair<string, bool>[] { new KeyValuePair<string, bool>(version, true) },
+                new HashSet<PackageIdentity>(),
+                null);
         }
 
         public static string CreateProjFileContent(

test/NuGet.Core.FuncTests/Dotnet.Integration.Test/DotnetIntegrationTestFixture.cs

@@ -182,7 +182,8 @@ internal CommandRunnerResult RunDotnet(string workingDirectory, string args = ""
                 // the one set by the _inner_ (test environment-specific) dotnet cli call we're about to make.
                 // We need to ensure that this points to the correct SDK directory because this value
                 // is used to locate many Tasks - especially those located by relative path or name.
-                ["MSBuildExtensionsPath"] = SdkDirectory.FullName
+                ["MSBuildExtensionsPath"] = SdkDirectory.FullName,
+                ["PATH"] = $"{_cliDirectory}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}"
             };
 
             if (enableDiagnostics)