Merge pull request #8180 from NuGet/dev

[ReleasePrep][2020.09.02]RI dev to master

Author: agr

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

@@ -2,6 +2,10 @@
 
 .bg-variant(@color) {
   background-color: @color;
+  & a {
+    color: darken(@link-color, 10%);
+  }
+
   a&:hover,
   a&:focus {
     background-color: darken(@color, 10%);

src/Bootstrap/dist/css/bootstrap.css

@@ -5,6 +5,7 @@
 @import "common-licenses.less";
 @import "common-list-packages.less";
 @import "common-multi-select-dropdown.less";
+@import "common-readme.less";
 @import "common-user-package-list.less";
 @import "page-about.less";
 @import "page-account-settings.less";

src/Bootstrap/less/mixins/background-variant.less

@@ -0,0 +1,12 @@
+.readme {
+    .readme-container{
+        display: block;
+        padding: 10.5px;
+        background-color: @pre-bg;
+        border: 1px solid #ccc;
+        word-break: normal;
+        margin-bottom: @default-margin-bottom;
+        overflow: auto;
+        max-height: 450px;
+    }
+}

src/Bootstrap/less/theme/all.less

@@ -83,6 +83,10 @@
       margin-left: 10px;
       margin-right: 10px;
     }
+
+    #reset-advanced-search {
+      color: darken(@link-color, 10%);
+    }
   }
 
   @media (min-width: @screen-sm) {

src/Bootstrap/less/theme/common-readme.less

@@ -88,9 +88,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Autofac">
-      <Version>4.6.2</Version>
-    </PackageReference>
     <PackageReference Include="CsvHelper">
       <Version>7.1.1</Version>
     </PackageReference>
@@ -110,4 +107,4 @@
   </PropertyGroup>
   <Import Project="$(SignPath)\sign.targets" Condition="Exists('$(SignPath)\sign.targets')" />
   <Import Project="$(SignPath)\sign.microbuild.targets" Condition="Exists('$(SignPath)\sign.microbuild.targets')" />
-</Project>
+</Project>

src/Bootstrap/less/theme/page-list-packages.less

@@ -40,6 +40,16 @@ public class FeatureFlagService : IFeatureFlagService
         private const string PackageRenamesFeatureName = GalleryPrefix + "PackageRenames";
         private const string EmbeddedReadmeFlightName = GalleryPrefix + "EmbeddedReadmes";
 
+        private const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllNonHijacked";
+        private const string ODataV1GetSpecificNonHijackedFeatureName = GalleryPrefix + "ODataV1GetSpecificNonHijacked";
+        private const string ODataV1FindPackagesByIdNonHijackedFeatureName = GalleryPrefix + "ODataV1FindPackagesByIdNonHijacked";
+        private const string ODataV1SearchNonHijackedFeatureName = GalleryPrefix + "ODataV1SearchNonHijacked";
+
+        private const string ODataV2GetAllNonHijackedFeatureName = GalleryPrefix + "ODataV2GetAllNonHijacked";
+        private const string ODataV2GetSpecificNonHijackedFeatureName = GalleryPrefix + "ODataV2GetSpecificNonHijacked";
+        private const string ODataV2FindPackagesByIdNonHijackedFeatureName = GalleryPrefix + "ODataV2FindPackagesByIdNonHijacked";
+        private const string ODataV2SearchNonHijackedFeatureName = GalleryPrefix + "ODataV2SearchNonHijacked";
+
         private readonly IFeatureFlagClient _client;
 
         public FeatureFlagService(IFeatureFlagClient client)
@@ -118,11 +128,6 @@ public bool IsForceFlatContainerIconsEnabled()
             return _client.IsEnabled(ForceFlatContainerIconsFeatureName, defaultValue: false);
         }
 
-        private bool IsEnabled(string flight, User user, bool defaultValue)
-        {
-            return _client.IsEnabled(flight, user, defaultValue);
-        }
-
         public bool IsODataDatabaseReadOnlyEnabled()
         {
             return _client.IsEnabled(ODataReadOnlyDatabaseFeatureName, defaultValue: false);
@@ -197,5 +202,45 @@ public bool AreEmbeddedReadmesEnabled(User user)
         {
             return _client.IsEnabled(EmbeddedReadmeFlightName, user, defaultValue: false);
         }
+
+        public bool IsODataV1GetAllEnabled()
+        {
+            return _client.IsEnabled(ODataV1GetAllNonHijackedFeatureName, defaultValue: true);
+        }
+
+        public bool IsODataV1GetSpecificNonHijackedEnabled()
+        {
+            return _client.IsEnabled(ODataV1GetSpecificNonHijackedFeatureName, defaultValue: true);
+        }
+
+        public bool IsODataV1FindPackagesByIdNonHijackedEnabled()
+        {
+            return _client.IsEnabled(ODataV1FindPackagesByIdNonHijackedFeatureName, defaultValue: true);
+        }
+
+        public bool IsODataV1SearchNonHijackedEnabled()
+        {
+            return _client.IsEnabled(ODataV1SearchNonHijackedFeatureName, defaultValue: true);
+        }
+
+        public bool IsODataV2GetAllNonHijackedEnabled()
+        {
+            return _client.IsEnabled(ODataV2GetAllNonHijackedFeatureName, defaultValue: true);
+        }
+
+        public bool IsODataV2GetSpecificNonHijackedEnabled()
+        {
+            return _client.IsEnabled(ODataV2GetSpecificNonHijackedFeatureName, defaultValue: true);
+        }
+
+        public bool IsODataV2FindPackagesByIdNonHijackedEnabled()
+        {
+            return _client.IsEnabled(ODataV2FindPackagesByIdNonHijackedFeatureName, defaultValue: true);
+        }
+
+        public bool IsODataV2SearchNonHijackedEnabled()
+        {
+            return _client.IsEnabled(ODataV2SearchNonHijackedFeatureName, defaultValue: true);
+        }
     }
 }

src/GalleryTools/GalleryTools.csproj

@@ -151,5 +151,45 @@ public interface IFeatureFlagService
         /// Whether the user is able to publish the package with an embedded readme file.
         /// </summary>
         bool AreEmbeddedReadmesEnabled(User user);
+
+        /// <summary>
+        /// Whether the /Packages() endpoint is enabled for the V1 OData API.
+        /// </summary>
+        bool IsODataV1GetAllEnabled();
+
+        /// <summary>
+        /// Whether the /Packages(Id=,Version=) endpoint is enabled for non-hijacked queries for the V1 OData API.
+        /// </summary>
+        bool IsODataV1GetSpecificNonHijackedEnabled();
+
+        /// <summary>
+        /// Whether the /FindPackagesById() endpoint is enabled for non-hijacked queries for the V1 OData API.
+        /// </summary>
+        bool IsODataV1FindPackagesByIdNonHijackedEnabled();
+
+        /// <summary>
+        /// Whether the /Search() endpoint is enabled for non-hijacked queries for the V1 OData API.
+        /// </summary>
+        bool IsODataV1SearchNonHijackedEnabled();
+
+        /// <summary>
+        /// Whether the /Packages() endpoint is enabled for non-hijacked queries for the V2 OData API.
+        /// </summary>
+        bool IsODataV2GetAllNonHijackedEnabled();
+
+        /// <summary>
+        /// Whether the /Packages(Id=,Version=) endpoint is enabled for non-hijacked queries for the V2 OData API.
+        /// </summary>
+        bool IsODataV2GetSpecificNonHijackedEnabled();
+
+        /// <summary>
+        /// Whether the /FindPackagesById() endpoint is enabled for non-hijacked queries for the V2 OData API.
+        /// </summary>
+        bool IsODataV2FindPackagesByIdNonHijackedEnabled();
+
+        /// <summary>
+        /// Whether the /Search() endpoint is enabled for non-hijacked queries for the V2 OData API.
+        /// </summary>
+        bool IsODataV2SearchNonHijackedEnabled();
     }
 }

src/NuGetGallery.Services/Configuration/FeatureFlagService.cs

@@ -692,6 +692,7 @@ public virtual Package EnrichPackageFromNuGetPackage(
             package.EmbeddedLicenseType = GetEmbeddedLicenseType(packageMetadata);
             package.LicenseExpression = GetLicenseExpression(packageMetadata);
             package.HasEmbeddedIcon = !string.IsNullOrWhiteSpace(packageMetadata.IconFile);
+            package.HasReadMe = !string.IsNullOrWhiteSpace(packageMetadata.ReadmeFile);
             package.EmbeddedReadmeType = GetEmbeddedReadmeType(packageMetadata);
 
             return package;
@@ -750,7 +751,7 @@ private static EmbeddedReadmeFileType GetEmbeddedReadmeType(PackageMetadata pack
 
             var extension = Path.GetExtension(packageMetadata.ReadmeFile);
 
-            if (MarkdownFileExtension.Equals(extension, StringComparison.OrdinalIgnoreCase) || string.Empty == extension)
+            if (MarkdownFileExtension.Equals(extension, StringComparison.OrdinalIgnoreCase))
             {
                 return EmbeddedReadmeFileType.Markdown;
             }