Merge pull request #9834 from NuGet/dev

zhhyu · web-flow · commit 34a324427aac · 2024-02-28T19:34:18.000-08:00
[ReleasePrep][2024.02.27] RI of dev into main
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <NuGetClientPackageVersion>6.6.1</NuGetClientPackageVersion>
-    <ServerCommonPackageVersion>2.115.0</ServerCommonPackageVersion>
-    <NuGetJobsPackageVersion>4.3.0-dev-8972385</NuGetJobsPackageVersion>
+    <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
+    <ServerCommonPackageVersion>2.117.0</ServerCommonPackageVersion>
+    <NuGetJobsPackageVersion>4.3.0-dev-9116469</NuGetJobsPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
diff --git a/src/NuGetGallery.Core/Services/CorePackageService.cs b/src/NuGetGallery.Core/Services/CorePackageService.cs
@@ -300,23 +300,23 @@ protected IQueryable<Package> GetPackagesByIdQueryable(
             string id, 
             PackageDeprecationFieldsToInclude deprecationFields = PackageDeprecationFieldsToInclude.None)
         {
-            bool includeDeprecation;
+            bool includeDeprecations;
             bool includeDeprecationRelationships;
 
             switch (deprecationFields)
             {
                 case PackageDeprecationFieldsToInclude.None:
-                    includeDeprecation = false;
+                    includeDeprecations = false;
                     includeDeprecationRelationships = false;
                     break;
 
                 case PackageDeprecationFieldsToInclude.Deprecation:
-                    includeDeprecation = true;
+                    includeDeprecations = true;
                     includeDeprecationRelationships = false;
                     break;
 
                 case PackageDeprecationFieldsToInclude.DeprecationAndRelationships:
-                    includeDeprecation = true;
+                    includeDeprecations = true;
                     includeDeprecationRelationships = true;
                     break;
 
@@ -330,8 +330,9 @@ protected IQueryable<Package> GetPackagesByIdQueryable(
                 includePackageRegistration: true,
                 includeUser: true,
                 includeSymbolPackages: true,
-                includeDeprecation: includeDeprecation,
-                includeDeprecationRelationships: includeDeprecationRelationships);
+                includeDeprecations: includeDeprecations,
+                includeDeprecationRelationships: includeDeprecationRelationships,
+                includeSupportedFrameworks: false);
         }
 
         protected IQueryable<Package> GetPackagesByIdQueryable(
@@ -340,8 +341,9 @@ protected IQueryable<Package> GetPackagesByIdQueryable(
             bool includePackageRegistration,
             bool includeUser,
             bool includeSymbolPackages,
-            bool includeDeprecation,
-            bool includeDeprecationRelationships)
+            bool includeDeprecations,
+            bool includeDeprecationRelationships,
+            bool includeSupportedFrameworks)
         {
             var packages = _packageRepository
                 .GetAll()
@@ -373,11 +375,16 @@ protected IQueryable<Package> GetPackagesByIdQueryable(
                     .Include(p => p.Deprecations.Select(d => d.AlternatePackage.PackageRegistration))
                     .Include(p => p.Deprecations.Select(d => d.AlternatePackageRegistration));
             }
-            else if (includeDeprecation)
+            else if (includeDeprecations)
             {
                 packages = packages.Include(p => p.Deprecations);
             }
 
+            if (includeSupportedFrameworks)
+            {
+                packages = packages.Include(p => p.SupportedFrameworks);
+            }
+
             return packages;
         }
 
diff --git a/src/NuGetGallery.Services/PackageManagement/IPackageService.cs b/src/NuGetGallery.Services/PackageManagement/IPackageService.cs
@@ -32,14 +32,28 @@ public interface IPackageService : ICorePackageService
         /// Includes deprecation fields based on <paramref name="deprecationFields"/>.
         /// </summary>
         IReadOnlyCollection<Package> FindPackagesById(
-            string id, 
+            string id,
             PackageDeprecationFieldsToInclude deprecationFields = PackageDeprecationFieldsToInclude.None);
 
         /// <summary>
         /// Returns all packages with an <see cref="Package.Id"/> of <paramref name="id"/>.
         /// Includes the <see cref="Package.PackageRegistration"/> fields based on <paramref name="includePackageRegistration"/>.
         /// </summary>
-        IReadOnlyCollection<Package> FindPackagesById(string id, bool includePackageRegistration);
+        IReadOnlyCollection<Package> FindPackagesById(
+            string id,
+            bool includePackageRegistration);
+
+        /// <summary>
+        /// Returns all packages with an <see cref="Package.Id"/> of <paramref name="id"/>.
+        /// Includes the <see cref="Package.PackageRegistration"/> fields based on <paramref name="includePackageRegistration"/>.
+        /// Includes the <see cref="Package.Deprecations"/> fields based on <paramref name="includeDeprecations"/>.
+        /// Includes the <see cref="Package.SupportedFrameworks"/> fields based on <paramref name="includeSupportedFrameworks);"/>.
+        /// </summary>
+        IReadOnlyCollection<Package> FindPackagesById(
+            string id,
+            bool includePackageRegistration,
+            bool includeDeprecations,
+            bool includeSupportedFrameworks);
 
         /// <summary>
         /// Gets the package with the given ID and version when exists;
diff --git a/src/NuGetGallery.Services/PackageManagement/PackageService.cs b/src/NuGetGallery.Services/PackageManagement/PackageService.cs
@@ -239,8 +239,33 @@ public virtual IReadOnlyCollection<Package> FindPackagesById(
                 includePackageRegistration: includePackageRegistration,
                 includeUser: false,
                 includeSymbolPackages: false,
-                includeDeprecation: false,
-                includeDeprecationRelationships: false);
+                includeDeprecations: false,
+                includeDeprecationRelationships: false,
+                includeSupportedFrameworks: false);
+
+            return packages.ToList();
+        }
+
+        public IReadOnlyCollection<Package> FindPackagesById(
+            string id,
+            bool includePackageRegistration,
+            bool includeDeprecations,
+            bool includeSupportedFrameworks)
+        {
+            if (id == null)
+            {
+                throw new ArgumentNullException(nameof(id));
+            }
+
+            var packages = GetPackagesByIdQueryable(
+                id,
+                includeLicenseReports: false,
+                includePackageRegistration: includePackageRegistration,
+                includeUser: false,
+                includeSymbolPackages: false,
+                includeDeprecations: includeDeprecations,
+                includeDeprecationRelationships: false,
+                includeSupportedFrameworks: includeSupportedFrameworks);
 
             return packages.ToList();
         }
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -925,7 +925,11 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version
             }
 
             // Load all packages with the ID.
-            var allVersions = _packageService.FindPackagesById(id, includePackageRegistration: true);
+            var allVersions = _packageService.FindPackagesById(id,
+                includePackageRegistration: true,
+                includeDeprecations: true,
+                includeSupportedFrameworks: true);
+
             var filterContext = new PackageFilterContext(RouteData?.Route, version);
             var package = _packageFilter.GetFiltered(allVersions, filterContext);
 
diff --git a/src/NuGetGallery/Scripts/gallery/page-downloads.js b/src/NuGetGallery/Scripts/gallery/page-downloads.js
@@ -7,16 +7,16 @@
 
     var chevronIcon;
     var olderVersionsElement;
-    
+
     function makeOlderVersionsCollapsible() {
-        const listContainer = document.getElementById('nuget-exe').children[1];   //children[0] is the headline, children[1] is the list of versions
-        const listContainerParent = document.getElementById('nuget-exe');
+        const listContainer = document.getElementById('win-x86-versions').children[1];   //children[0] is the headline, children[1] is the list of versions
+        const listContainerParent = document.getElementById('win-x86-versions');
         olderVersionsElement = document.createElement('div');
 
         // We want to display 2 versions to the users. Others should be collapsed.
         const allVersions = listContainer.querySelectorAll('li');
         var collapsedVersions = Array.from(allVersions).slice(2);
-        
+
         // If the first two versions in json file are the same, we only want to show the first.
         // The following code checks if they're the same, and if so, removes the second.
         // It checks if they're the same based on the last word, which is a version identifier.
@@ -33,7 +33,7 @@
         if (firstVersionLastWord === secondVersionLastWord) {
             listContainer.removeChild(secondElement);
         }
-        
+
         olderVersionsElement.setAttribute('class', 'older-versions-dropdown');
         olderVersionsElement.innerHTML = 'Older versions ' +
             '<button class="toggle-older-versions-button"' +
@@ -45,7 +45,8 @@
             'type="button">' +
             '<i class="ms-Icon ms-Icon--ChevronDown"' +
             'id="olderVersionsToggleChevron"></i>' +
-            '</button>';
+            '</button>' +
+            '<p> These versions are no longer supported and might have vulnerabilities. </p>';
 
         const versionsList = document.createElement('ul');
 
diff --git a/src/NuGetGallery/Scripts/gallery/page-list-packages.js b/src/NuGetGallery/Scripts/gallery/page-list-packages.js
@@ -1,11 +1,6 @@
 $(function() {
     'use strict';
 
-    $(".reserved-indicator").each(window.nuget.setPopovers);
-    $(".package-warning--vulnerable").each(window.nuget.setPopovers);
-    $(".package-warning--deprecated").each(window.nuget.setPopovers);
-    $(".frameworkfiltermode-info").each(window.nuget.setPopovers);
-
     const storage = window['localStorage'];
     const focusResultsColumnKey = 'focus_results_column';
 
@@ -206,6 +201,10 @@ $(function() {
         initializeFrameworkAndTfmCheckboxes();
     }
 
+    $(".reserved-indicator").each(window.nuget.setPopovers);
+    $(".package-warning--vulnerable").each(window.nuget.setPopovers);
+    $(".package-warning--deprecated").each(window.nuget.setPopovers);
+    $(".frameworkfiltermode-info").each(window.nuget.setPopovers);
     $(".framework-badge-asset").each(window.nuget.setPopovers);
     $(".framework-badge-computed").each(window.nuget.setPopovers);
 });
diff --git a/src/NuGetGallery/Services/MarkdownService.cs b/src/NuGetGallery/Services/MarkdownService.cs
@@ -20,6 +20,7 @@ public class MarkdownService : IMarkdownService
         private static readonly TimeSpan RegexTimeout = TimeSpan.FromMinutes(1);
         private static readonly Regex EncodedBlockQuotePattern = new Regex("^ {0,3}&gt;", RegexOptions.Multiline, RegexTimeout);
         private static readonly Regex LinkPattern = new Regex("<a href=([\"\']).*?\\1", RegexOptions.None, RegexTimeout);
+        private static readonly Regex JavaScriptPattern = new Regex("<a href=([\"\'])javascript:.*?\\1 rel=([\"'])noopener noreferrer nofollow\\1>", RegexOptions.None, RegexTimeout);
         private static readonly Regex HtmlCommentPattern = new Regex("<!--.*?-->", RegexOptions.Singleline, RegexTimeout);
         private static readonly Regex ImageTextPattern = new Regex("!\\[\\]\\(", RegexOptions.Singleline, RegexTimeout);
         private static readonly string altTextForImage = "alternate text is missing from this package README image";
@@ -285,6 +286,7 @@ private RenderedMarkdownResult GetHtmlFromMarkdownMarkdig(string markdownString,
                 renderer.Render(document);
                 output.Content = htmlWriter.ToString().Trim();
                 output.IsMarkdigMdSyntaxHighlightEnabled = _features.IsMarkdigMdSyntaxHighlightEnabled();
+                output.Content = JavaScriptPattern.Replace(htmlWriter.ToString(), "").Trim();
 
                 return output;
             }
diff --git a/src/NuGetGallery/Views/Packages/_SupportedFrameworksTable.cshtml b/src/NuGetGallery/Views/Packages/_SupportedFrameworksTable.cshtml
@@ -41,12 +41,12 @@
 </table>
 <div>
     <div>
-        <i class="frameworktableinfo-asset-icon"></i>
+        <i class="frameworktableinfo-computed-icon framework-badge-computed"></i>
         <span class="frameworktableinfo-text">Compatible target framework(s)</span>
     </div>
     <div>
-        <i class="frameworktableinfo-computed-icon framework-badge-computed"></i>
-        <span class="frameworktableinfo-text">Additional computed target framework(s)</span>
+        <i class="frameworktableinfo-asset-icon"></i>
+        <span class="frameworktableinfo-text">Included target framework(s) (in package)</span>
     </div>
     <span class="frameworktableinfo-text"><i>Learn more about <a href='https://docs.microsoft.com/dotnet/standard/frameworks' aria-label="Learn more about Target Frameworks">Target Frameworks</a> and <a href='https://docs.microsoft.com/dotnet/standard/net-standard' aria-label="Learn more about .NET Standard">.NET Standard</a>.</i></span>
-</div>
+</div>
diff --git a/src/NuGetGallery/Views/Pages/Downloads.cshtml b/src/NuGetGallery/Views/Pages/Downloads.cshtml
@@ -11,28 +11,22 @@
     </div>
     <div class="row">
         <div class="col-md-4">
-            <h2 class="ms-fontSize-xxl">NuGet.exe</h2>
+            <h2 class="ms-fontSize-xxl">Windows x86 Commandline</h2>
             <ul class="list-unstyled list-tools">
                 <li><a href="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe">nuget.exe - recommended latest</a></li>
             </ul>
         </div>
         <div class="col-md-4">
-            <h2 class="ms-fontSize-xxl">Visual Studio</h2>
-            <p>
-                NuGet Package Manager (PM UI and PM Console) is included with Visual Studio. Latest NuGet releases are delivered as part of Visual Studio updates. Note: nuget.exe itself is not included with any version of Visual Studio.
-            </p>
+            <h2 class="ms-fontSize-xxl">Visual Studio 2015</h2>
             <ul class="list-unstyled list-tools">
-                <li><a href="https://visualstudio.microsoft.com/downloads/">Download Visual Studio</a></li>
+                <li><a href="https://dist.nuget.org/visualstudio-2015-vsix/latest/NuGet.Tools.vsix">VS 2015 VSIX - latest</a></li>
             </ul>
         </div>
         <div class="col-md-4">
-            <h2 class="ms-fontSize-xxl">.NET SDK</h2>
+            <h2 class="ms-fontSize-xxl">Visual Studio 2017</h2>
             <p>
-                The CLI tool for .NET Core and .NET Standard libraries, and for any SDK-style project such as one that targets the .NET Framework. This CLI tool is included with the .NET Core SDK and provides core NuGet features on all platforms.
+                NuGet 4.x is included in the Visual Studio 2017 installation. Latest NuGet releases are delivered as part of Visual Studio updates.
             </p>
-            <ul class="list-unstyled list-tools">
-                <li><a href="https://dotnet.microsoft.com/en-us/download">Download .NET SDK</a></li>
-            </ul>
         </div>
     </div>
 </section>
@@ -46,21 +40,21 @@
     <div class="row">
         <div class="col-md-4">
             <!-- ko foreach: artifacts -->
-            <!-- ko if: name == "nuget-exe" -->
-            <div id="nuget-exe" data-bind="template: { name: 'tool-list-template', data: $data }"></div>
+            <!-- ko if: name == "win-x86-commandline" -->
+            <div id="win-x86-versions" data-bind="template: { name: 'tool-list-template', data: $data }"></div>
             <!-- /ko -->
             <!-- /ko -->
         </div>
         <div class="col-md-4">
             <!-- ko foreach: artifacts -->
-            <!-- ko if: name == "visualstudio-vsix" -->
+            <!-- ko if: name == "visualstudio-2017-vsix" -->
             <div data-bind="template: { name: 'tool-list-template', data: $data }"></div>
             <!-- /ko -->
             <!-- /ko -->
         </div>
         <div class="col-md-4">
             <!-- ko foreach: artifacts -->
-            <!-- ko if: name != "nuget-exe" && name != "visualstudio-vsix" -->
+            <!-- ko if: name != "win-x86-commandline" && name != "visualstudio-2017-vsix" -->
             <div data-bind="template: { name: 'tool-list-template', data: $data }"></div>
             <!-- /ko -->
             <!-- /ko -->
diff --git a/src/NuGetGallery/Views/Shared/ListPackages.cshtml b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
@@ -100,7 +100,7 @@
                                         <div class="framework-filter-mode-option" aria-label="ALL/ANY toggle that decides whether to show packages matching ALL of the selected Target Frameworks (TFMs), or ANY of them.">
                                             <p>
                                                 Framework Filter Mode
-                                                <i class="frameworkfiltermode-info ms-Icon ms-Icon--Info" title="Decides whether to show packages matching ALL of the selected Target Frameworks (TFMs), or ANY of them."></i>
+                                                <i class="frameworkfiltermode-info ms-Icon ms-Icon--Info" data-content="Decides whether to show packages matching ALL of the selected Target Frameworks (TFMs), or ANY of them."></i>
                                             </p>
                                             <div class="toggle-switch-control">
                                                 <input type="radio" id="all-selector" name="frameworkFilterMode" value="all" tabindex="0" @(Model.FrameworkFilterMode == "any" ? "" : "checked") />
diff --git a/src/NuGetGallery/Web.config b/src/NuGetGallery/Web.config
diff --git a/src/VerifyGitHubVulnerabilities/Verify/PackageVulnerabilitiesVerifier.cs b/src/VerifyGitHubVulnerabilities/Verify/PackageVulnerabilitiesVerifier.cs
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
