Refactor BaGet.Core (loic-sharma#259)

⚠️ This change changes the namespace of most core types! These are breaking changes, BaGet's version has been bumped to `0.2.x-prerelease` to reflect this!

Author: loic-sharma

src/BaGet.AWS/S3StorageService.cs

@@ -5,7 +5,7 @@
 using Amazon.S3;
 using Amazon.S3.Model;
 using BaGet.AWS.Configuration;
-using BaGet.Core.Services;
+using BaGet.Core.Storage;
 using Microsoft.Extensions.Options;
 
 namespace BaGet.AWS
@@ -70,7 +70,7 @@ public Task<Uri> GetDownloadUriAsync(string path, CancellationToken cancellation
             return Task.FromResult(new Uri(url));
         }
 
-        public async Task<PutResult> PutAsync(string path, Stream content, string contentType, CancellationToken cancellationToken = default)
+        public async Task<StoragePutResult> PutAsync(string path, Stream content, string contentType, CancellationToken cancellationToken = default)
         {
             // TODO: Uploads should be idempotent. This should fail if and only if the blob
             // already exists but has different content.
@@ -92,7 +92,7 @@ await _client.PutObjectAsync(new PutObjectRequest
                 }, cancellationToken);
             }
 
-            return PutResult.Success;
+            return StoragePutResult.Success;
         }
 
         public async Task DeleteAsync(string path, CancellationToken cancellationToken = default)

src/BaGet.Azure/BlobStorageService.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using BaGet.Core.Extensions;
-using BaGet.Core.Services;
+using BaGet.Core.Storage;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 
@@ -43,7 +43,7 @@ public Task<Uri> GetDownloadUriAsync(string path, CancellationToken cancellation
             return Task.FromResult(result);
         }
 
-        public async Task<PutResult> PutAsync(
+        public async Task<StoragePutResult> PutAsync(
             string path,
             Stream content,
             string contentType,
@@ -63,16 +63,16 @@ await blob.UploadFromStreamAsync(
                     operationContext: null,
                     cancellationToken: cancellationToken);
 
-                return PutResult.Success;
+                return StoragePutResult.Success;
             }
             catch (StorageException e) when (IsAlreadyExistsException(e))
             {
                 using (var targetStream = await blob.OpenReadAsync(cancellationToken))
                 {
                     content.Position = 0;
                     return content.Matches(targetStream)
-                        ? PutResult.AlreadyExists
-                        : PutResult.Conflict;
+                        ? StoragePutResult.AlreadyExists
+                        : StoragePutResult.Conflict;
                 }
             }
         }

src/BaGet.Azure/Search/AzureSearchService.cs

@@ -2,15 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using BaGet.Core.Services;
 using BaGet.Core.Entities;
+using BaGet.Core.Indexing;
+using BaGet.Core.Search;
 using Microsoft.Azure.Search;
 using NuGet.Versioning;
 
 namespace BaGet.Azure.Search
 {
-    using SearchParameters = Microsoft.Azure.Search.Models.SearchParameters;
     using QueryType = Microsoft.Azure.Search.Models.QueryType;
+    using SearchParameters = Microsoft.Azure.Search.Models.SearchParameters;
 
     public class AzureSearchService : ISearchService
     {

src/BaGet.Azure/Search/BatchIndexer.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using BaGet.Core.Entities;
-using BaGet.Core.Services;
+using BaGet.Core.State;
 using Microsoft.Azure.Search;
 using Microsoft.Azure.Search.Models;
 using Microsoft.Extensions.Logging;

src/BaGet.Core.Server/Controllers/PackageController.cs

@@ -3,10 +3,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using BaGet.Core.Mirror;
-using BaGet.Core.Services;
+using BaGet.Core.State;
+using BaGet.Core.Storage;
 using BaGet.Protocol;
 using Microsoft.AspNetCore.Mvc;
-using NuGet.Packaging.Core;
 using NuGet.Versioning;
 
 namespace BaGet.Controllers
@@ -108,4 +108,4 @@ public async Task<IActionResult> DownloadReadme(string id, string version, Cance
             return File(readmeStream, "text/markdown");
         }
     }
-}
+}

src/BaGet.Core.Server/Controllers/PackagePublishController.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using BaGet.Core.Authentication;
 using BaGet.Core.Configuration;
-using BaGet.Core.Services;
+using BaGet.Core.Indexing;
+using BaGet.Core.State;
 using BaGet.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;

src/BaGet.Core.Server/Controllers/Registration/RegistrationIndexController.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using BaGet.Core.Entities;
 using BaGet.Core.Mirror;
-using BaGet.Core.Services;
+using BaGet.Core.State;
 using BaGet.Extensions;
 using BaGet.Protocol;
 using Microsoft.AspNetCore.Mvc;

src/BaGet.Core.Server/Controllers/Registration/RegistrationLeafController.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using BaGet.Core.Mirror;
-using BaGet.Core.Services;
+using BaGet.Core.State;
 using BaGet.Extensions;
 using BaGet.Protocol;
 using Microsoft.AspNetCore.Mvc;

src/BaGet.Core.Server/Controllers/SearchController.cs

@@ -1,15 +1,15 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using BaGet.Core.Services;
+using BaGet.Core.Search;
 using BaGet.Extensions;
 using BaGet.Protocol;
 using Microsoft.AspNetCore.Mvc;
 
 namespace BaGet.Controllers
 {
     using ProtocolSearchResult = Protocol.SearchResult;
-    using QuerySearchResult = Core.Services.SearchResult;
+    using QuerySearchResult = Core.Search.SearchResult;
 
     public class SearchController : Controller
     {

src/BaGet.Core.Server/Controllers/SymbolController.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using BaGet.Core.Authentication;
 using BaGet.Core.Configuration;
-using BaGet.Core.Services;
+using BaGet.Core.Indexing;
+using BaGet.Core.Storage;
 using BaGet.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;

src/BaGet.Core/Services/ApiKeyAuthenticationService.cs src/BaGet.Core/Authentication/ApiKeyAuthenticationService.cs

@@ -3,7 +3,7 @@
 using BaGet.Core.Configuration;
 using Microsoft.Extensions.Options;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Authentication
 {
     public class ApiKeyAuthenticationService : IAuthenticationService
     {

src/BaGet.Core/Services/IAuthenticationService.cs src/BaGet.Core/Authentication/IAuthenticationService.cs

@@ -1,6 +1,6 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Authentication
 {
     public interface IAuthenticationService
     {

src/BaGet.Core/Services/FrameworkCompatibilityService.cs src/BaGet.Core/Indexing/FrameworkCompatibilityService.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using NuGet.Frameworks;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Indexing
 {
     using static NuGet.Frameworks.FrameworkConstants;
 

src/BaGet.Core/Indexing/IFrameworkCompatibilityService.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace BaGet.Core.Indexing
+{
+    /// <summary>
+    /// Used to determine the compatibility matrix between frameworks.
+    /// </summary>
+    public interface IFrameworkCompatibilityService
+    {
+        /// <summary>
+        /// Given a framework, find all other compatible frameworks.
+        /// </summary>
+        /// <param name="framework">The input framework.</param>
+        /// <returns>The list of compatible frameworks.</returns>
+        IReadOnlyList<string> FindAllCompatibleFrameworks(string framework);
+    }
+}

src/BaGet.Core/Services/IPackageIndexingService.cs src/BaGet.Core/Indexing/IPackageIndexingService.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Indexing
 {
     /// <summary>
     /// The result of attempting to index a package.
@@ -39,4 +39,4 @@ public interface IPackageIndexingService
         /// <returns>The result of the attempted indexing operation.</returns>
         Task<PackageIndexingResult> IndexAsync(Stream stream, CancellationToken cancellationToken);
     }
-}
+}

src/BaGet.Core/Services/ISymbolIndexingService.cs src/BaGet.Core/Indexing/ISymbolIndexingService.cs

@@ -1,8 +1,8 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Indexing
 {
     /// <summary>
     /// The result of attempting to index a symbol package.
@@ -39,4 +39,4 @@ public interface ISymbolIndexingService
         /// <returns>The result of the attempted indexing operation.</returns>
         Task<SymbolIndexingResult> IndexAsync(Stream stream, CancellationToken cancellationToken);
     }
-}
+}

src/BaGet.Core/Services/PackageIndexingService.cs src/BaGet.Core/Indexing/PackageIndexingService.cs

@@ -7,14 +7,16 @@
 using BaGet.Core.Configuration;
 using BaGet.Core.Entities;
 using BaGet.Core.Extensions;
+using BaGet.Core.Search;
+using BaGet.Core.State;
+using BaGet.Core.Storage;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using NuGet.Packaging;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Indexing
 {
     using NuGetPackageType = NuGet.Packaging.Core.PackageType;
-    using BaGetPackageDependency = Entities.PackageDependency;
 
     public class PackageIndexingService : IPackageIndexingService
     {
@@ -254,17 +256,17 @@ private string[] ParseTags(string tags)
             return (repositoryUri, repository.Type);
         }
 
-        private List<BaGetPackageDependency> GetDependencies(NuspecReader nuspec)
+        private List<PackageDependency> GetDependencies(NuspecReader nuspec)
         {
-            var dependencies = new List<BaGetPackageDependency>();
+            var dependencies = new List<PackageDependency>();
 
             foreach (var group in nuspec.GetDependencyGroups())
             {
                 var targetFramework = group.TargetFramework.GetShortFolderName();
 
                 if (!group.Packages.Any())
                 {
-                    dependencies.Add(new BaGetPackageDependency
+                    dependencies.Add(new PackageDependency
                     {
                         Id = null,
                         VersionRange = null,
@@ -274,7 +276,7 @@ private List<BaGetPackageDependency> GetDependencies(NuspecReader nuspec)
 
                 foreach (var dependency in group.Packages)
                 {
-                    dependencies.Add(new BaGetPackageDependency
+                    dependencies.Add(new PackageDependency
                     {
                         Id = dependency.Id,
                         VersionRange = dependency.VersionRange?.ToString(),

src/BaGet.Core/Services/SymbolIndexingService.cs src/BaGet.Core/Indexing/SymbolIndexingService.cs

@@ -1,17 +1,17 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection.Metadata;
 using System.Threading;
 using System.Threading.Tasks;
 using BaGet.Core.Extensions;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using BaGet.Core.State;
+using BaGet.Core.Storage;
 using Microsoft.Extensions.Logging;
 using NuGet.Packaging;
-using NuGet.Packaging.Core;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Indexing
 {
     // Based off: https://github.com/NuGet/NuGetGallery/blob/master/src/NuGetGallery/Services/SymbolPackageUploadService.cs
     // Based off: https://github.com/NuGet/NuGet.Jobs/blob/master/src/Validation.Symbols/SymbolsValidatorService.cs#L44

src/BaGet.Core/Mirror/MirrorService.cs

@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using BaGet.Core.Entities;
-using BaGet.Core.Services;
+using BaGet.Core.Indexing;
+using BaGet.Core.State;
 using BaGet.Protocol;
 using Microsoft.Extensions.Logging;
 using NuGet.Versioning;

src/BaGet.Core/Services/DatabaseSearchService.cs src/BaGet.Core/Search/DatabaseSearchService.cs

@@ -3,9 +3,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using BaGet.Core.Entities;
+using BaGet.Core.Indexing;
 using Microsoft.EntityFrameworkCore;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Search
 {
     public class DatabaseSearchService : ISearchService
     {

src/BaGet.Core/Services/ISearchService.cs src/BaGet.Core/Search/ISearchService.cs

@@ -4,7 +4,7 @@
 using BaGet.Core.Entities;
 using NuGet.Versioning;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Search
 {
     public interface ISearchService
     {

src/BaGet.Core/Services/NullSearchService.cs src/BaGet.Core/Search/NullSearchService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using BaGet.Core.Entities;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.Search
 {
     /// <summary>
     /// A minimal search service implementation, used for advanced scenarios.

src/BaGet.Core/Services/IFrameworkCompatibilityService.cs

@@ -1,8 +1,8 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using NuGet.Versioning;
 
-namespace BaGet.Core.Services
+namespace BaGet.Core.State
 {
     public interface IPackageDeletionService
     {