Merge pull request #9317 from NuGet/dev

lyndaidaii · web-flow · commit f3d98cff8673 · 2022-11-28T14:13:56.000-08:00
[ReleasePre][2022.11.22] FI of dev into main
diff --git a/src/Bootstrap/dist/css/bootstrap.css b/src/Bootstrap/dist/css/bootstrap.css
diff --git a/src/Bootstrap/less/list-group.less b/src/Bootstrap/less/list-group.less
@@ -128,3 +128,8 @@ button.list-group-item {
   margin-bottom: 0;
   line-height: 1.3;
 }
+
+ul.list-packages {
+  list-style-type: none;
+  padding-left: 0;
+}
diff --git a/src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj b/src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj
@@ -74,7 +74,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Build.Tasks.Pack">
-      <Version>6.0.0</Version>
+      <Version>6.4.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/NuGet.Services.Entities/NuGet.Services.Entities.csproj b/src/NuGet.Services.Entities/NuGet.Services.Entities.csproj
@@ -8,15 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFramework">
-      <Version>6.4.0-preview3-19553-01</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="NuGet.Frameworks">
-      <Version>6.0.0</Version>
-    </PackageReference>
+    <PackageReference Include="EntityFramework" Version="6.4.0-preview3-19553-01" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NuGet.Frameworks" Version="6.4.0" />
+	<!-- This was lifted to a top-level dependency to resolve a Component Governance alert. -->
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/NuGetGallery.Core/Frameworks/SupportedFrameworks.cs b/src/NuGetGallery.Core/Frameworks/SupportedFrameworks.cs
@@ -33,6 +33,13 @@ public static class SupportedFrameworks
         public static readonly NuGetFramework Net60Tizen = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "tizen", EmptyVersion);
         public static readonly NuGetFramework Net60TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "tvos", EmptyVersion);
         public static readonly NuGetFramework Net60Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "windows", EmptyVersion);
+        public static readonly NuGetFramework Net70Android = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "android", EmptyVersion);
+        public static readonly NuGetFramework Net70Ios = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "ios", EmptyVersion);
+        public static readonly NuGetFramework Net70MacOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "macos", EmptyVersion);
+        public static readonly NuGetFramework Net70MacCatalyst = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "maccatalyst", EmptyVersion);
+        public static readonly NuGetFramework Net70Tizen = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "tizen", EmptyVersion);
+        public static readonly NuGetFramework Net70TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "tvos", EmptyVersion);
+        public static readonly NuGetFramework Net70Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "windows", EmptyVersion);
         public static readonly NuGetFramework NetCore = new NuGetFramework(FrameworkIdentifiers.NetCore, EmptyVersion);
         public static readonly NuGetFramework NetMf = new NuGetFramework(FrameworkIdentifiers.NetMicro, EmptyVersion);
         public static readonly NuGetFramework UAP = new NuGetFramework(FrameworkIdentifiers.UAP, EmptyVersion);
@@ -51,7 +58,9 @@ static SupportedFrameworks()
                 MonoAndroid, MonoMac, MonoTouch,
                 Native,
                 Net11, Net2, Net35, Net4, Net403, Net45, Net451, Net452, Net46, Net461, Net462, Net463, Net47, Net471, Net472, Net48,
-                Net50, Net50Windows, Net60, Net60Android, Net60Ios, Net60MacCatalyst, Net60MacOs, Net60TvOs, Net60Windows,
+                Net50, Net50Windows,
+                Net60, Net60Android, Net60Ios, Net60MacCatalyst, Net60MacOs, Net60TvOs, Net60Windows,
+                Net70, Net70Android, Net70Ios, Net70MacCatalyst, Net70MacOs, Net70TvOs, Net70Windows,
                 NetCore, NetCore45, NetCore451,
                 NetCoreApp10, NetCoreApp11, NetCoreApp20, NetCoreApp21, NetCoreApp22, NetCoreApp30, NetCoreApp31,
                 NetMf,
diff --git a/src/NuGetGallery.Core/NuGetGallery.Core.csproj b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
@@ -47,7 +47,7 @@
       <Version>5.2.6</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Packaging">
-      <Version>6.0.0</Version>
+      <Version>6.4.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.FeatureFlags">
       <Version>2.106.0</Version>
diff --git a/src/NuGetGallery.Core/Services/AssetFrameworkHelper.cs b/src/NuGetGallery.Core/Services/AssetFrameworkHelper.cs
@@ -39,12 +39,12 @@ public static IEnumerable<NuGetFramework> GetAssetFrameworks(string packageId, I
                 var conventions = new ManagedCodeConventions(runtimeGraph);
 
                 // Let's test for tools packages first--they're a special case
-                var groups = Enumerable.Empty<ContentItemGroup>();
+                var groups = new List<ContentItemGroup>();
                 if (packageTypes.Count == 1 && (packageTypes[0] == PackageType.DotnetTool ||
                                                 packageTypes[0] == PackageType.DotnetCliTool))
                 {
                     // Only a package that is a tool package (and nothing else) will be matched against tools pattern set
-                    groups = items.FindItemGroups(conventions.Patterns.ToolsAssemblies);
+                    items.PopulateItemGroups(conventions.Patterns.ToolsAssemblies, groups);
                 }
                 else
                 {
@@ -67,14 +67,25 @@ public static IEnumerable<NuGetFramework> GetAssetFrameworks(string packageId, I
                     };
 
                     // We'll create a set of "groups" --these are content items which satisfy file pattern sets
-                    var standardGroups = patterns
-                        .SelectMany(p => items.FindItemGroups(p));
+                    foreach (var pattern in patterns)
+                    {
+                        items.PopulateItemGroups(pattern, groups);
+                    }
 
                     // Filter out MSBuild assets that don't match the package ID and append to groups we already have
-                    var msbuildGroups = msbuildPatterns
-                        .SelectMany(p => items.FindItemGroups(p))
-                        .Where(g => HasBuildItemsForPackageId(g.Items, packageId));
-                    groups = standardGroups.Concat(msbuildGroups);
+                    var msbuildGroups = new List<ContentItemGroup>();
+                    foreach (var pattern in msbuildPatterns)
+                    {
+                        items.PopulateItemGroups(pattern, msbuildGroups);
+                    }
+
+                    foreach (var group in msbuildGroups)
+                    {
+                        if (HasBuildItemsForPackageId(group.Items, packageId))
+                        {
+                            groups.Add(group);
+                        }
+                    }
                 }
 
                 // Now that we have a collection of groups which have made it through the pattern set filter, let's transform them into TFMs
diff --git a/src/NuGetGallery.Services/NuGetGallery.Services.csproj b/src/NuGetGallery.Services/NuGetGallery.Services.csproj
@@ -85,7 +85,7 @@
       <Version>4.2.2</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Protocol">
-      <Version>6.0.0</Version>
+      <Version>6.4.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
       <Version>2.106.0</Version>
diff --git a/src/NuGetGallery/App_Code/ViewHelpers.cshtml b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
@@ -588,10 +588,10 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);
 
 @helper Breadcrumb(bool showDivider, params Func<MvcHtmlString, HelperResult>[] segments)
 {
-    <h1 role="list" class="ms-font-xl breadcrumb-title">
+    <h1 class="ms-font-xl breadcrumb-title">
         @for (int i = 0; i < segments.Length; i++)
         {
-            <span role="listitem" class="ms-noWrap">@segments[i](MvcHtmlString.Empty)</span>
+            <span class="ms-noWrap">@segments[i](MvcHtmlString.Empty)</span>
 
             if (i < segments.Length - 1)
             {
@@ -661,6 +661,7 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);
 
             window.onload = function () {
                 $('div.g-recaptcha iframe').attr({ tabindex: "1" });
+                $('div.g-recaptcha iframe').attr({ role: "document" });
             }
         </script>
     }
diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -72,9 +72,9 @@
             {
                 Id = "dotnet-cli",
                 CommandPrefix = "> ",
-                InstallPackageCommands = new [] { string.Format("dotnet new --install {0}::{1}", Model.Id, Model.Version) },
+                InstallPackageCommands = new [] { string.Format("dotnet new install {0}::{1}", Model.Id, Model.Version) },
                 AlertLevel = AlertLevel.Info,
-                AlertMessage = "This package contains a <a href='https://aka.ms/dotnet-new'>.NET Core Template Package</a> you can call from the shell/command line.",
+                AlertMessage = "This package contains a <a href='https://aka.ms/dotnet-new'>.NET Template Package</a> you can call from the shell/command line.",
             }
         };
     }
@@ -268,13 +268,13 @@
                     </h1>
                     @if (Model.IsVerified.HasValue && Model.IsVerified.Value)
                     {
-                        <span class="prefix-reserve-title" aria-hidden="true">
-                            <img class="reserved-indicator" aria-hidden="true"
+                        <span class="prefix-reserve-title">
+                            <img class="reserved-indicator"
                                     src="~/Content/gallery/img/reserved-indicator.svg"
                                     @ViewHelpers.ImageFallback(Url.Absolute("~/Content/gallery/img/reserved-indicator-25x25.png"))
                                     data-content="@Strings.ReservedNamespace_ReservedIndicatorTooltip" tabindex="0"
                                     alt="@Strings.ReservedNamespace_ReservedIndicatorTooltip"/>
-                            <a href="https://docs.microsoft.com/en-us/nuget/nuget-org/id-prefix-reservation" class="prefix-reserve-label" ari-hidden="true">
+                            <a href="https://docs.microsoft.com/en-us/nuget/nuget-org/id-prefix-reservation" class="prefix-reserve-label">
                                 Prefix Reserved
                             </a>
                         </span>
diff --git a/src/NuGetGallery/Views/Shared/ListPackages.cshtml b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
@@ -41,7 +41,7 @@
 <section role="main" class="container main-container page-list-packages">
     <div class="row clearfix no-margin">
         <div class="col-md-10 no-padding">
-            <h1 role="alert">
+            <h1 tabindex="0">
                 @if (String.IsNullOrEmpty(Model.SearchTerm))
                 {
                     if (Model.TotalCount == 1)
@@ -151,7 +151,7 @@
         </div>
     }
 
-    <div class="list-packages" role="list">
+    <ul class="list-packages">
         @{
             var itemIndex = Model.PageIndex * Model.PageSize;
             var eventName = Model.IsPreviewSearch ? "preview-search-selection" : "search-selection";
@@ -161,7 +161,7 @@
             @Html.Partial("_ListPackage", package, new ViewDataDictionary { { "itemIndex", itemIndex }, { "eventName", eventName } })
             itemIndex++;
         }
-    </div>
+    </ul>
 
     <div class="row">
         <div class="col-xs-12 clearfix">
diff --git a/src/NuGetGallery/Views/Shared/_ListPackage.cshtml b/src/NuGetGallery/Views/Shared/_ListPackage.cshtml
@@ -26,7 +26,7 @@
     }
 }
 
-<article class="package" role="listitem">
+<li class="package">
 
     <div class="row">
         <div class="col-sm-1 hidden-xs hidden-sm col-package-icon">
@@ -131,4 +131,4 @@
             </div>
         </div>
     </div>
-</article>
+</li>
diff --git a/src/NuGetGallery/Views/Users/Profiles.cshtml b/src/NuGetGallery/Views/Users/Profiles.cshtml
@@ -97,12 +97,12 @@
 
             <hr class="profile-title-divider" />
 
-            <div class="list-packages" role="list">
+            <ul class="list-packages">
                 @foreach (var package in Model.PagedPackages)
                 {
                     @Html.Partial("_ListPackage", package)
                 }
-            </div>
+            </ul>
 
             @ViewHelpers.PreviousNextPager(Model.Pager)
         </article>
diff --git a/src/NuGetGallery/Web.config b/src/NuGetGallery/Web.config
@@ -576,6 +576,14 @@
   </system.diagnostics>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NuGet.Versioning" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.4.0.123" newVersion="6.4.0.123"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NuGet.Packaging" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.4.0.123" newVersion="6.4.0.123"/>
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-6.7.1.0" newVersion="6.7.1.0"/>
@@ -674,4 +682,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -128,3 +128,8 @@ button.list-group-item {`
`128`	`128`	`margin-bottom: 0;`
`129`	`129`	`line-height: 1.3;`
`130`	`130`	`}`
	`131`	`+`
	`132`	`+ul.list-packages {`
	`133`	`+ list-style-type: none;`
	`134`	`+ padding-left: 0;`
	`135`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -588,10 +588,10 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);`
`588`	`588`
`589`	`589`	`@helper Breadcrumb(bool showDivider, params Func<MvcHtmlString, HelperResult>[] segments)`
`590`	`590`	`{`
`591`		`- <h1 role="list" class="ms-font-xl breadcrumb-title">`
	`591`	`+ <h1 class="ms-font-xl breadcrumb-title">`
`592`	`592`	`@for (int i = 0; i < segments.Length; i++)`
`593`	`593`	`{`
`594`		`- <span role="listitem" class="ms-noWrap">@segments[i](MvcHtmlString.Empty)</span>`
	`594`	`+ <span class="ms-noWrap">@segments[i](MvcHtmlString.Empty)</span>`
`595`	`595`
`596`	`596`	`if (i < segments.Length - 1)`
`597`	`597`	`{`
`@@ -661,6 +661,7 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);`
`661`	`661`
`662`	`662`	`window.onload = function () {`
`663`	`663`	`$('div.g-recaptcha iframe').attr({ tabindex: "1" });`
	`664`	`+ $('div.g-recaptcha iframe').attr({ role: "document" });`
`664`	`665`	`}`
`665`	`666`	`</script>`
`666`	`667`	`}`