Merge pull request #9027 from NuGet/dev

[ReleasePrep] RI dev to main

Author: agr

src/AccountDeleter/EmptyFeatureFlagService.cs

@@ -86,11 +86,6 @@ public bool IsDisplayVulnerabilitiesEnabled()
             throw new NotImplementedException();
         }
 
-        public bool IsDotnet20BannerEnabled()
-        {
-            throw new NotImplementedException();
-        }
-
         public bool IsForceFlatContainerIconsEnabled()
         {
             throw new NotImplementedException();

src/Bootstrap/dist/css/bootstrap-theme.css

@@ -3,7 +3,6 @@
 @table-product-width: 232px;
 
 .framework {
-  font-family: Segoe UI;
   font-size: 14px;
   line-height: 20px;
 }

src/Bootstrap/less/theme/common-supported-frameworks.less

@@ -14,67 +14,6 @@
     margin-top: 32px;
   }
 
-  .dotnet-20-banner {
-    .dotnet-20-image {
-      position: absolute;
-      top: 0;
-      left: 0;
-      height: 100%;
-      width: 100%;
-
-      img {
-        height: 100%;
-        width: 100%;
-        object-fit: cover;
-        background-color: #000;
-      }
-    }
-
-    .container {
-      .row {
-        color: white;
-
-        @media (max-width: @screen-md-max) {
-          margin-top: 48px;
-          margin-bottom: 48px;
-        }
-
-        @media (min-width: @screen-md-max) {
-          margin-top: 144px;
-          margin-bottom: 144px;
-        }
-
-        .banner-text {
-          backdrop-filter: blur(2px);
-
-          h2 {
-            margin-top: 0px;
-            font-weight: 600;
-          }
-
-          h3 {
-            margin-top: 0px;
-            font-weight: 400;
-          }
-
-          a {
-            padding: 5px 12px 5px 12px;
-            border: 1px solid white;
-            color: white;
-            font-weight: 600;
-          }
-
-          a:focus {
-            outline-color: #fff;
-            outline-style: dashed;
-            outline-width: 2px;
-            outline-offset: 3px;
-          }
-        }
-      }
-    }
-  }
-
   .what-is-nuget {
     font-size: 1.15em;
     padding-bottom: 75px;

src/Bootstrap/less/theme/page-home.less

@@ -274,10 +274,5 @@ public bool IsRecentPackagesNoIndexEnabled()
         {
             throw new NotImplementedException();
         }
-
-        public bool IsDotnet20BannerEnabled()
-        {
-            throw new NotImplementedException();
-        }
     }
 }

src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs

@@ -11,6 +11,11 @@ public static class NuGetFrameworkExtensions
     {
         public static string GetBadgeVersion(this NuGetFramework framework)
         {
+            if (framework.Version == FrameworkConstants.EmptyVersion)
+            {
+                return string.Empty;
+            }
+
             var builder = new StringBuilder();
             builder.Append(framework.Version.Major);
             builder.Append(".");

src/NuGetGallery.Core/Frameworks/NuGetFrameworkExtensions.cs

@@ -284,14 +284,22 @@ public static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool s
                 }
             }
 
-            return new PackageMetadata(
+            var packageMetadata = new PackageMetadata(
                 nuspecReader.GetMetadata().ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
                 nuspecReader.GetDependencyGroups(useStrictVersionCheck: strict),
                 nuspecReader.GetFrameworkAssemblyGroups(),
                 nuspecReader.GetPackageTypes(),
                 nuspecReader.GetMinClientVersion(),
                 nuspecReader.GetRepositoryMetadata(),
                 nuspecReader.GetLicenseMetadata());
+
+            // Fix null or empty description values for reflowed packages
+            if (!strict)
+            {
+                packageMetadata.Description = packageMetadata.Description ?? string.Empty;
+            }
+
+            return packageMetadata;
         }
 
         private class StrictNuspecReader : NuspecReader

src/NuGetGallery.Core/Packaging/PackageMetadata.cs

@@ -40,7 +40,6 @@ public class FeatureFlagService : IFeatureFlagService
         private const string GravatarProxyEnSubdomainFeatureName = GalleryPrefix + "GravatarProxyEnSubdomain";
         private const string ODataCacheDurationsFeatureName = GalleryPrefix + "ODataCacheDurations";
         private const string ShowEnable2FADialog = GalleryPrefix + "ShowEnable2FADialog";
-        private const string ShowDotnet20Banner = GalleryPrefix + "ShowDotnet20Banner";
         private const string Get2FADismissFeedback = GalleryPrefix + "Get2FADismissFeedback";
         private const string PackageRenamesFeatureName = GalleryPrefix + "PackageRenames";
         private const string PatternSetTfmHeuristicsFeatureName = GalleryPrefix + "PatternSetTfmHeuristics";
@@ -229,11 +228,6 @@ public bool IsShowEnable2FADialogEnabled()
             return _client.IsEnabled(ShowEnable2FADialog, defaultValue: false);
         }
 
-        public bool IsDotnet20BannerEnabled()
-        {
-            return _client.IsEnabled(ShowDotnet20Banner, defaultValue: false);
-        }
-
         public bool IsGet2FADismissFeedbackEnabled()
         {
             return _client.IsEnabled(Get2FADismissFeedback, defaultValue: false);

src/NuGetGallery.Services/Configuration/FeatureFlagService.cs

@@ -291,11 +291,5 @@ public interface IFeatureFlagService
         /// Whether or not recent packages has no index applied to block search engine indexing.
         /// </summary>
         bool IsRecentPackagesNoIndexEnabled();
-
-        /// <summary>
-        /// Whether to show the banner announcing .NET's 20 year celebration.
-        /// </summary>
-        /// <returns></returns>
-        bool IsDotnet20BannerEnabled();
     }
 }

src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs

@@ -32,7 +32,6 @@
     "NuGetGallery.ImageAllowlist": "Enabled",
     "NuGetGallery.ShowReportAbuseSafetyChanges": "Enabled",
     "NuGetGallery.ComputeTargetFramework": "Enabled",
-    "NuGetGallery.ShowDotnet20Banner": "Enabled"
   },
   "Flights": {
     "NuGetGallery.TyposquattingFlight": {