Merge pull request #6750 from NuGet/dev

[ReleasePrep][2018.12.10]RI of dev into master

Author: zhhyu

src/GalleryTools/Commands/UpdateIsLatestCommand.cs

@@ -0,0 +1,83 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.CommandLineUtils;
+using NuGet.Services.Entities;
+using NuGetGallery;
+
+namespace GalleryTools.Commands
+{
+    public static class UpdateIsLatestCommand
+    {
+        public static void Configure(CommandLineApplication config)
+        {
+            config.Description = "Update IsLatest(Stable)(SemVer2) properties of all packages in the target NuGetGallery database. !!Please make sure you have created a back-up of your database first!!";
+            config.HelpOption("-? | -h | --help");
+
+            var connectionstringOption = config.Option(
+                "--connectionstring",
+                "The SQL connectionstring of the target NuGetGallery database.",
+                CommandOptionType.SingleValue);
+
+            config.OnExecute(async () => await ExecuteAsync(connectionstringOption));
+        }
+
+        private static async Task<int> ExecuteAsync(
+            CommandOption connectionStringOption)
+        {
+            if (!connectionStringOption.HasValue())
+            {
+                Console.Error.WriteLine($"The {connectionStringOption.Template} option is required.");
+                return 1;
+            }
+
+            Console.Write("Testing database connectivity...");
+
+            using (var sqlConnection = new SqlConnection(connectionStringOption.Value()))
+            {
+                try
+                {
+                    await sqlConnection.OpenAsync();
+                    Console.WriteLine(" OK");
+                }
+                catch (Exception exception)
+                {
+                    Console.WriteLine(" Failed");
+                    Console.Error.WriteLine(exception.Message);
+                    return -1;
+                }
+
+                using (var entitiesContext = new EntitiesContext(sqlConnection, readOnly: false))
+                {
+                    var packageRegistrationRepository = new EntityRepository<PackageRegistration>(entitiesContext);
+
+                    var packageService = new CorePackageService(
+                        new EntityRepository<Package>(entitiesContext),
+                        packageRegistrationRepository,
+                        new EntityRepository<Certificate>(entitiesContext));
+
+                    Console.WriteLine("Retrieving package registrations...");
+                    var packageRegistrations = packageRegistrationRepository.GetAll().ToList();
+                    Console.WriteLine($"Processing {packageRegistrations.Count} records...");
+
+                    double counter = 0;
+                    foreach (var packageRegistration in packageRegistrations.OrderBy(pr => pr.Id))
+                    {
+                        var pct = 100 * counter++ / packageRegistrations.Count;
+
+                        Console.Write($"  [{pct.ToString("N2")} %] Updating {packageRegistration.Id} ...");
+                        await packageService.UpdateIsLatestAsync(packageRegistration, commitChanges: true);
+                        Console.WriteLine($" OK");
+                    }
+                }
+            }
+
+            Console.WriteLine("DONE");
+            return 0;
+        }
+    }
+}

src/GalleryTools/Commands/VerifyApiKeyCommand.cs

@@ -1,11 +1,10 @@
-using System;
-using System.Collections.Generic;
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
 using NuGet.Services.Entities;
-using NuGetGallery;
 using NuGetGallery.Infrastructure.Authentication;
 
 namespace GalleryTools.Commands
@@ -93,4 +92,4 @@ private static int Execute(
             return 0;
         }
     }
-}
+}

src/GalleryTools/GalleryTools.csproj

@@ -47,6 +47,7 @@
     <Compile Include="Commands\BackfillRepositoryMetadataCommand.cs" />
     <Compile Include="Commands\HashCommand.cs" />
     <Compile Include="Commands\ReflowCommand.cs" />
+    <Compile Include="Commands\UpdateIsLatestCommand.cs" />
     <Compile Include="Commands\VerifyApiKeyCommand.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/GalleryTools/Program.cs

@@ -18,6 +18,7 @@ public static int Main(params string[] args)
             commandLineApplication.Command("reflow", ReflowCommand.Configure);
             commandLineApplication.Command("fillrepodata", BackfillRepositoryMetadataCommand.Configure);
             commandLineApplication.Command("verifyapikey", VerifyApiKeyCommand.Configure);
+            commandLineApplication.Command("updateIsLatest", UpdateIsLatestCommand.Configure);
 
             try
             {

src/NuGet.Services.Search.Client/Client/IServiceDiscoveryClient.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace NuGet.Services.Search.Client
+{
+    /// <summary>
+    /// This interface is used to discover the service client.
+    /// </summary>
+    public interface IServiceDiscoveryClient
+    {
+        /// <summary>
+        /// The function is used to retrieve the endpoint for the resource type.
+        /// </summary>
+        /// <param name="resourceType"> The resource type needed for retrieval</param>
+        Task<IEnumerable<Uri>> GetEndpointsForResourceType(string resourceType);
+    }
+}

src/NuGet.Services.Search.Client/Client/SearchClient.cs

@@ -74,7 +74,6 @@ public async Task<ServiceResponse<SearchResults>> Search(
             string query,
             string projectTypeFilter = null,
             bool includePrerelease = false,
-            string curatedFeed = null,
             SortOrder sortBy = SortOrder.Relevance,
             int skip = 0,
             int take = 10,
@@ -111,11 +110,6 @@ public async Task<ServiceResponse<SearchResults>> Search(
                 nameValue.Add("prerelease", "true");
             }
 
-            if (!String.IsNullOrEmpty(curatedFeed))
-            {
-                nameValue.Add("feed", curatedFeed);
-            }
-
             if (!isLuceneQuery)
             {
                 nameValue.Add("luceneQuery", "false");

src/NuGet.Services.Search.Client/Client/ServiceDiscoveryClient.cs

@@ -10,7 +10,7 @@
 
 namespace NuGet.Services.Search.Client
 {
-    public class ServiceDiscoveryClient
+    public class ServiceDiscoveryClient : IServiceDiscoveryClient
     {
         private readonly HttpClient _httpClient;
         private readonly Uri _serviceDiscoveryEndpoint;

src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj

@@ -48,6 +48,7 @@
     <Compile Include="Client\BaseUrlHealthIndicatorStore.cs" />
     <Compile Include="Client\IEndpointHealthIndicatorStore.cs" />
     <Compile Include="Client\IHealthIndicatorLogger.cs" />
+    <Compile Include="Client\IServiceDiscoveryClient.cs" />
     <Compile Include="Client\NullHealthIndicatorLogger.cs" />
     <Compile Include="Client\RetryingHttpClientWrapper.cs" />
     <Compile Include="Client\SearchClient.cs" />

src/NuGetGallery.Core/CoreConstants.cs

@@ -40,6 +40,7 @@ public static class Folders
             public const string StatusFolderName = "status";
             public const string SymbolPackagesFolderName = "symbol-packages";
             public const string SymbolPackageBackupsFolderName = "symbol-package-backups";
+            public const string FlatContainerFolderName = "v3-flatcontainer";
         }
 
         public const string NuGetSymbolPackageFileExtension = ".snupkg";

src/NuGetGallery.Core/Entities/EntitiesContext.cs

@@ -48,8 +48,6 @@ public EntitiesContext(DbConnection connection, bool readOnly)
         }
 
         public bool ReadOnly { get; private set; }
-        public IDbSet<CuratedFeed> CuratedFeeds { get; set; }
-        public IDbSet<CuratedPackage> CuratedPackages { get; set; }
         public IDbSet<PackageRegistration> PackageRegistrations { get; set; }
         public IDbSet<Credential> Credentials { get; set; }
         public IDbSet<Scope> Scopes { get; set; }
@@ -300,27 +298,6 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             modelBuilder.Entity<PackageFramework>()
                 .HasKey(pf => pf.Key);
 
-            modelBuilder.Entity<CuratedFeed>()
-                .HasKey(cf => cf.Key);
-
-            modelBuilder.Entity<CuratedFeed>()
-                .HasMany<CuratedPackage>(cf => cf.Packages)
-                .WithRequired(cp => cp.CuratedFeed)
-                .HasForeignKey(cp => cp.CuratedFeedKey);
-
-            modelBuilder.Entity<CuratedFeed>()
-                .HasMany<User>(cf => cf.Managers)
-                .WithMany()
-                .Map(c => c.ToTable("CuratedFeedManagers")
-                           .MapLeftKey("CuratedFeedKey")
-                           .MapRightKey("UserKey"));
-
-            modelBuilder.Entity<CuratedPackage>()
-                .HasKey(cp => cp.Key);
-
-            modelBuilder.Entity<CuratedPackage>()
-                .HasRequired(cp => cp.PackageRegistration);
-
             modelBuilder.Entity<PackageDelete>()
                 .HasKey(pd => pd.Key)
                 .HasMany(pd => pd.Packages)