From 908e7293d231f2465d3ca5f211db4d10840c1f72 Mon Sep 17 00:00:00 2001 From: "Nigusu Yenework (from Dev Box)" Date: Fri, 17 Nov 2023 09:48:15 -0800 Subject: [PATCH] Fix style --- .../Commands/PackageSearch/PackageSearchResultJsonPrinter.cs | 2 +- .../PackageSearch/PackageSearchResultPackageDetailed.cs | 2 ++ src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.resx | 2 +- .../PackageSearchResultJsonPrinterTests.cs | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultJsonPrinter.cs b/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultJsonPrinter.cs index 04a74b7ee92..ba180835e19 100644 --- a/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultJsonPrinter.cs +++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultJsonPrinter.cs @@ -28,7 +28,6 @@ public async void Add(PackageSource source, IEnumerable foreach (IPackageSearchMetadata metadata in completedSearch) { - if (_verbosity == PackageSearchVerbosity.Minimal) { packageSearchResult.AddPackage(new PackageSearchResultPackageMinimal(metadata)); @@ -43,6 +42,7 @@ public async void Add(PackageSource source, IEnumerable packageSearchResult.AddPackage(new PackageSearchResultPackageNormal(metadata)); } } + _packageSearchResults.Add(packageSearchResult); } diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultPackageDetailed.cs b/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultPackageDetailed.cs index ed6b44f5cfb..b6a956a2490 100644 --- a/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultPackageDetailed.cs +++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultPackageDetailed.cs @@ -29,10 +29,12 @@ public PackageSearchResultPackageDetailed() : base() public PackageSearchResultPackageDetailed(IPackageSearchMetadata packageSearchMetadata, string deprecation) : base(packageSearchMetadata) { Description = packageSearchMetadata.Description; + if (packageSearchMetadata.Vulnerabilities != null && packageSearchMetadata.Vulnerabilities.Any()) { Vulnerable = true; } + Deprecation = deprecation; ProjectUrl = packageSearchMetadata.ProjectUrl; } diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.resx b/src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.resx index dfdccbaf9da..b09950f36ef 100644 --- a/src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.resx +++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.resx @@ -844,7 +844,7 @@ Non-HTTPS access will be removed in a future version. Consider migrating to 'HTT Invalid value `{0}` for option {1}. - 0 - The invalid value. 1- the option. + 0 - The invalid value. 1 - the option. The specified source '{0}' is invalid. Provide a valid source. diff --git a/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/PackageSearchResultJsonPrinterTests.cs b/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/PackageSearchResultJsonPrinterTests.cs index e8409d22aea..04832e35f99 100644 --- a/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/PackageSearchResultJsonPrinterTests.cs +++ b/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/PackageSearchResultJsonPrinterTests.cs @@ -49,6 +49,7 @@ public void Add_MultiplePackageSearchMetadata_RendersCorrectNumberOfPackages(int ""packages"": [] }} ]"; + var expectedOneJson = $@"[ {{ ""sourceName"": ""MockSource"",