Merge pull request #60 from gep13/more-package-info

AdmiringWorm · web-flow · commit e77eab325540 · 2026-02-27T10:36:54.000Z
(#59) Add property to IChocolateyPackageSearchMetadata
diff --git a/build/common.project.props b/build/common.project.props
@@ -50,7 +50,7 @@
     <MicroBuildDirectory>$(SolutionPackagesFolder)microsoft.visualstudioeng.microbuild.core\1.0.0\build\</MicroBuildDirectory>
     <MicrosoftDotNetBuildTasksFeedFilePath>$(SolutionPackagesFolder)microsoft.dotnet.build.tasks.feed\6.0.0-beta.20528.5\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Feed.dll</MicrosoftDotNetBuildTasksFeedFilePath>
     <MicrosoftDotNetMaestroTasksFilePath>$(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.21378.2\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll</MicrosoftDotNetMaestroTasksFilePath>
-    <NoWarn>$(NoWarn);NU5105;MSB3277</NoWarn>
+    <NoWarn>$(NoWarn);NU5105;MSB3277;CA1416</NoWarn>
     <!-- additional warnings new in .NET 6 that we need to disable when building with source-build -->
     <NoWarn Condition="'$(DotNetBuildFromSource)' == 'true'">$(NoWarn);CS1998;CA1416;CS0618;CS1574</NoWarn>
   </PropertyGroup>
@@ -295,7 +295,7 @@
                                $(RepositoryRootDirectory)src\NuGet.Core\NuGet.Versioning\NuGet.Versioning.csproj;
                                $(RepositoryRootDirectory)src\NuGet.Core\NuGet.Credentials\NuGet.Credentials.csproj;
                                $(RepositoryRootDirectory)src\NuGet.Core\NuGet.LibraryModel\\NuGet.LibraryModel.csproj;"/>
-    
+
     <CoreUnitTestProjects Include="$(RepositoryRootDirectory)test\NuGet.Core.Tests\NuGet.Commands.Test\NuGet.Commands.Test.csproj;
                                    $(RepositoryRootDirectory)test\NuGet.Core.Tests\NuGet.Common.Test\NuGet.Common.Test.csproj;
                                    $(RepositoryRootDirectory)test\NuGet.Core.Tests\NuGet.Configuration.Test\NuGet.Configuration.Test.csproj;
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Internal.Contracts/PublicAPI.Unshipped.txt b/src/NuGet.Clients/NuGet.VisualStudio.Internal.Contracts/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+NuGet.VisualStudio.Internal.Contracts.TransitivePackageSearchMetadata.AvailableVersionSource.get -> string!
+NuGet.VisualStudio.Internal.Contracts.TransitivePackageSearchMetadata.AvailableVersionSource.set -> void
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Internal.Contracts/TransitivePackageSearchMetadata.cs b/src/NuGet.Clients/NuGet.VisualStudio.Internal.Contracts/TransitivePackageSearchMetadata.cs
@@ -63,6 +63,12 @@ public partial class TransitivePackageSearchMetadata : IPackageSearchMetadata
 
         public bool PrefixReserved => _packageSearchMetadata.PrefixReserved;
 
+        public string AvailableVersionSource
+        {
+            get => _packageSearchMetadata.AvailableVersionSource;
+            set => _packageSearchMetadata.AvailableVersionSource = value;
+        }
+
         public LicenseMetadata LicenseMetadata => _packageSearchMetadata.LicenseMetadata;
 
         public IEnumerable<PackageVulnerabilityMetadata> Vulnerabilities => _packageSearchMetadata.Vulnerabilities;
diff --git a/src/NuGet.Core/NuGet.Protocol/Model/ChocolateyLocalPackageSearchMetadata.cs b/src/NuGet.Core/NuGet.Protocol/Model/ChocolateyLocalPackageSearchMetadata.cs
@@ -187,5 +187,10 @@ public Uri BugTrackerUrl
         /// Not applicable to local packages
         /// </remarks>
         public string PackageScanFlagResult => null;
+
+        /// <remarks>
+        /// Not applicable to local packages
+        /// </remarks>
+        public string AvailableVersionSource { get; set; }
     }
 }
diff --git a/src/NuGet.Core/NuGet.Protocol/Model/ChocolateyPackageSearchMetadata.cs b/src/NuGet.Core/NuGet.Protocol/Model/ChocolateyPackageSearchMetadata.cs
@@ -76,5 +76,7 @@ public partial class PackageSearchMetadata : IPackageSearchMetadata
         public DateTime? PackageScanResultDate { get; set; }
         [JsonIgnore]
         public string PackageScanFlagResult { get; set; }
+        [JsonIgnore]
+        public string AvailableVersionSource { get; set; }
     }
 }
diff --git a/src/NuGet.Core/NuGet.Protocol/Model/ChocolateyPackageSearchMetadataV2Feed.cs b/src/NuGet.Core/NuGet.Protocol/Model/ChocolateyPackageSearchMetadataV2Feed.cs
@@ -85,6 +85,7 @@ public IEnumerable<DownloadCache> DownloadCache
         public string PackageScanStatus { get; private set; }
         public DateTime? PackageScanResultDate { get; private set; }
         public string PackageScanFlagResult { get; private set; }
+        public string AvailableVersionSource { get; set; }
 
         private void FinishInitialization(V2FeedPackageInfo package)
         {
diff --git a/src/NuGet.Core/NuGet.Protocol/Model/IChocolateyPackageSearchMetadata.cs b/src/NuGet.Core/NuGet.Protocol/Model/IChocolateyPackageSearchMetadata.cs
@@ -44,5 +44,7 @@ public partial interface IPackageSearchMetadata
         string PackageScanStatus { get; }
         DateTime? PackageScanResultDate { get; }
         string PackageScanFlagResult { get; }
+
+        string AvailableVersionSource { get; set; }
     }
 }
diff --git a/src/NuGet.Core/NuGet.Protocol/Model/PackageSearchMetadataBuilder.cs b/src/NuGet.Core/NuGet.Protocol/Model/PackageSearchMetadataBuilder.cs
@@ -77,6 +77,7 @@ public partial class ClonedPackageSearchMetadata : IPackageSearchMetadata
             [Obsolete("PackagePath is recommended in place of PackageReader")]
             public Func<PackageReaderBase> PackageReader { get; set; }
             public string PackagePath { get; set; }
+            public string AvailableVersionSource { get; set; }
         }
 
         private PackageSearchMetadataBuilder(IPackageSearchMetadata metadata)
@@ -168,6 +169,7 @@ public IPackageSearchMetadata Build()
                 PackageScanStatus = _metadata.PackageScanStatus,
                 PackageScanResultDate = _metadata.PackageScanResultDate,
                 PackageScanFlagResult = _metadata.PackageScanFlagResult,
+                AvailableVersionSource = _metadata.AvailableVersionSource
 
                 //////////////////////////////////////////////////////////
                 // End - Chocolatey Specific Modification
diff --git a/src/NuGet.Core/NuGet.Protocol/PublicAPI/net472/PublicAPI.Unshipped.txt b/src/NuGet.Core/NuGet.Protocol/PublicAPI/net472/PublicAPI.Unshipped.txt
@@ -0,0 +1,10 @@
+NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.get -> string
+NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.set -> void
diff --git a/src/NuGet.Core/NuGet.Protocol/PublicAPI/netcoreapp5.0/PublicAPI.Unshipped.txt b/src/NuGet.Core/NuGet.Protocol/PublicAPI/netcoreapp5.0/PublicAPI.Unshipped.txt
@@ -0,0 +1,10 @@
+NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.get -> string
+NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.set -> void
diff --git a/src/NuGet.Core/NuGet.Protocol/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/NuGet.Core/NuGet.Protocol/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1,10 @@
+NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.Core.Types.IPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.Core.Types.PackageSearchMetadataBuilder.ClonedPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.LocalPackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.get -> string
+NuGet.Protocol.PackageSearchMetadata.AvailableVersionSource.set -> void
+NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.get -> string
+NuGet.Protocol.PackageSearchMetadataV2Feed.AvailableVersionSource.set -> void
diff --git a/test/NuGet.Clients.Tests/NuGet.PackageManagement.UI.Test/ChocolateyTestPackageSearchMetadata.cs b/test/NuGet.Clients.Tests/NuGet.PackageManagement.UI.Test/ChocolateyTestPackageSearchMetadata.cs
@@ -43,5 +43,6 @@ partial class TestPackageSearchMetadata : IPackageSearchMetadata
         public string PackageScanStatus { get; set; }
         public DateTime? PackageScanResultDate { get; set; }
         public string PackageScanFlagResult { get; set; }
+        public string AvailableVersionSource { get; set; }
     }
 }
diff --git a/test/TestUtilities/Test.Utility/Protocol/ChocolateyV3PackageSearchMetadataFixture.cs b/test/TestUtilities/Test.Utility/Protocol/ChocolateyV3PackageSearchMetadataFixture.cs
@@ -45,6 +45,7 @@ public partial class MockPackageSearchMetadata : IPackageSearchMetadata
             public string PackageScanStatus => null;
             public DateTime? PackageScanResultDate => null;
             public string PackageScanFlagResult => null;
+            public string AvailableVersionSource => null;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`#nullable enable`
	`2`	`+NuGet.VisualStudio.Internal.Contracts.TransitivePackageSearchMetadata.AvailableVersionSource.get -> string!`
	`3`	`+NuGet.VisualStudio.Internal.Contracts.TransitivePackageSearchMetadata.AvailableVersionSource.set -> void`
Original file line number	Diff line number	Diff line change
`@@ -187,5 +187,10 @@ public Uri BugTrackerUrl`
`187`	`187`	`/// Not applicable to local packages`
`188`	`188`	`/// </remarks>`
`189`	`189`	`public string PackageScanFlagResult => null;`
	`190`	`+`
	`191`	`+ /// <remarks>`
	`192`	`+ /// Not applicable to local packages`
	`193`	`+ /// </remarks>`
	`194`	`+ public string AvailableVersionSource { get; set; }`
`190`	`195`	`}`
`191`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,5 +76,7 @@ public partial class PackageSearchMetadata : IPackageSearchMetadata`
`76`	`76`	`public DateTime? PackageScanResultDate { get; set; }`
`77`	`77`	`[JsonIgnore]`
`78`	`78`	`public string PackageScanFlagResult { get; set; }`
	`79`	`+ [JsonIgnore]`
	`80`	`+ public string AvailableVersionSource { get; set; }`
`79`	`81`	`}`
`80`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public IEnumerable<DownloadCache> DownloadCache`
`85`	`85`	`public string PackageScanStatus { get; private set; }`
`86`	`86`	`public DateTime? PackageScanResultDate { get; private set; }`
`87`	`87`	`public string PackageScanFlagResult { get; private set; }`
	`88`	`+ public string AvailableVersionSource { get; set; }`
`88`	`89`
`89`	`90`	`private void FinishInitialization(V2FeedPackageInfo package)`
`90`	`91`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,7 @@ public partial interface IPackageSearchMetadata`
`44`	`44`	`string PackageScanStatus { get; }`
`45`	`45`	`DateTime? PackageScanResultDate { get; }`
`46`	`46`	`string PackageScanFlagResult { get; }`
	`47`	`+`
	`48`	`+ string AvailableVersionSource { get; set; }`
`47`	`49`	`}`
`48`	`50`	`}`