diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile index d735e7b30..25fda50f5 100644 --- a/services/Archival/FilterLists.Archival.Api/Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile @@ -10,10 +10,9 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app -COPY SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj SharedKernel/FilterLists.SharedKernel.Apis.Contracts/ -COPY SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj SharedKernel/FilterLists.SharedKernel.Apis.Clients/ COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ COPY SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj SharedKernel/FilterLists.SharedKernel.SeedWork/ +COPY Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj Directory/FilterLists.Directory.Api.Contracts/ COPY Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj Archival/FilterLists.Archival.Infrastructure/ COPY Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj Archival/FilterLists.Archival.Application/ WORKDIR /app/Archival/FilterLists.Archival.Api @@ -23,10 +22,9 @@ RUN dotnet restore # build API WORKDIR /app COPY /.editorconfig . -COPY SharedKernel/FilterLists.SharedKernel.Apis.Contracts/. SharedKernel/FilterLists.SharedKernel.Apis.Contracts/ -COPY SharedKernel/FilterLists.SharedKernel.Apis.Clients/. SharedKernel/FilterLists.SharedKernel.Apis.Clients/ COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ COPY SharedKernel/FilterLists.SharedKernel.SeedWork/. SharedKernel/FilterLists.SharedKernel.SeedWork/ +COPY Directory/FilterLists.Directory.Api.Contracts/. Directory/FilterLists.Directory.Api.Contracts/ COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archival.Infrastructure/ COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/ WORKDIR /app/Archival/FilterLists.Archival.Api diff --git a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile index d74e17174..e299c7b0c 100644 --- a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile @@ -9,10 +9,9 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app -COPY SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj SharedKernel/FilterLists.SharedKernel.Apis.Contracts/ -COPY SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj SharedKernel/FilterLists.SharedKernel.Apis.Clients/ COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ COPY SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj SharedKernel/FilterLists.SharedKernel.SeedWork/ +COPY Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj Directory/FilterLists.Directory.Api.Contracts/ COPY Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj Archival/FilterLists.Archival.Infrastructure/ COPY Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj Archival/FilterLists.Archival.Application/ WORKDIR /app/Archival/FilterLists.Archival.Api @@ -22,10 +21,9 @@ RUN dotnet restore # build API WORKDIR /app COPY /.editorconfig . -COPY SharedKernel/FilterLists.SharedKernel.Apis.Contracts/. SharedKernel/FilterLists.SharedKernel.Apis.Contracts/ -COPY SharedKernel/FilterLists.SharedKernel.Apis.Clients/. SharedKernel/FilterLists.SharedKernel.Apis.Clients/ COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ COPY SharedKernel/FilterLists.SharedKernel.SeedWork/. SharedKernel/FilterLists.SharedKernel.SeedWork/ +COPY Directory/FilterLists.Directory.Api.Contracts/. Directory/FilterLists.Directory.Api.Contracts/ COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archival.Infrastructure/ COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/ WORKDIR /app/Archival/FilterLists.Archival.Api diff --git a/services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs b/services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs index 8953bc132..b03de745c 100644 --- a/services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs +++ b/services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs @@ -9,8 +9,8 @@ using FilterLists.Archival.Application.Models; using FilterLists.Archival.Infrastructure.Clients; using FilterLists.Archival.Infrastructure.Persistence; -using FilterLists.SharedKernel.Apis.Clients; -using FilterLists.SharedKernel.Apis.Contracts.Directory; +using FilterLists.Directory.Api.Contracts; +using FilterLists.Directory.Api.Contracts.Models; using MediatR; using Microsoft.Extensions.Logging; using File = FilterLists.Archival.Application.Models.File; diff --git a/services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs b/services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs index abce8fdd6..aefad5fed 100644 --- a/services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs +++ b/services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; using FilterLists.Archival.Infrastructure.Scheduling; -using FilterLists.SharedKernel.Apis.Clients; +using FilterLists.Directory.Api.Contracts; using MediatR; using Microsoft.Extensions.Logging; diff --git a/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs index 18f4b50a0..217ae4bf1 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs +++ b/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs @@ -3,7 +3,7 @@ using FilterLists.Archival.Infrastructure.Logging; using FilterLists.Archival.Infrastructure.Persistence; using FilterLists.Archival.Infrastructure.Scheduling; -using FilterLists.SharedKernel.Apis.Clients; +using FilterLists.Directory.Api.Contracts; using FilterLists.SharedKernel.Logging; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; @@ -25,7 +25,7 @@ public static void AddInfrastructureServices(this IServiceCollection services, I services.AddArchivalLogging(configuration); services.AddSchedulingServices(configuration); - services.AddApiClients(configuration); + services.AddDirectoryApiClient(configuration); services.AddClients(); services.AddPersistenceServices(configuration); } diff --git a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj index ad098ebbe..59cb672ae 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj +++ b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj @@ -29,7 +29,7 @@ - + diff --git a/services/Archival/azure-pipelines.api.yaml b/services/Archival/azure-pipelines.api.yaml index 312f9467c..11ad893c8 100644 --- a/services/Archival/azure-pipelines.api.yaml +++ b/services/Archival/azure-pipelines.api.yaml @@ -6,10 +6,9 @@ trigger: include: [ services/Archival/azure-pipelines.api.yaml, - services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/*, - services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/*, services/SharedKernel/FilterLists.SharedKernel.Logging/*, services/SharedKernel/FilterLists.SharedKernel.SeedWork/*, + services/Directory/FilterLists.Directory.Api.Contracts/*, services/Archival/FilterLists.Archival.Infrastructure/*, services/Archival/FilterLists.Archival.Application/*, services/Archival/FilterLists.Archival.Api/*, @@ -27,10 +26,9 @@ pr: include: [ services/Archival/azure-pipelines.api.yaml, - services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/*, - services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/*, services/SharedKernel/FilterLists.SharedKernel.Logging/*, services/SharedKernel/FilterLists.SharedKernel.SeedWork/*, + services/Directory/FilterLists.Directory.Api.Contracts/*, services/Archival/FilterLists.Archival.Infrastructure/*, services/Archival/FilterLists.Archival.Application/*, services/Archival/FilterLists.Archival.Api/*, diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/ConfigurationExtensions.cs b/services/Directory/FilterLists.Directory.Api.Contracts/ConfigurationExtensions.cs similarity index 80% rename from services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/ConfigurationExtensions.cs rename to services/Directory/FilterLists.Directory.Api.Contracts/ConfigurationExtensions.cs index 574610dec..504122a58 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/ConfigurationExtensions.cs +++ b/services/Directory/FilterLists.Directory.Api.Contracts/ConfigurationExtensions.cs @@ -1,15 +1,15 @@ using System; -using FilterLists.SharedKernel.Apis.Clients.Options; +using FilterLists.Directory.Api.Contracts.Options; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Polly; using Refit; -namespace FilterLists.SharedKernel.Apis.Clients +namespace FilterLists.Directory.Api.Contracts { public static class ConfigurationExtensions { - public static void AddApiClients(this IServiceCollection services, IConfiguration configuration) + public static void AddDirectoryApiClient(this IServiceCollection services, IConfiguration configuration) { // TODO: use SystemTextJsonContentSerializer() once less feature-limited services.AddRefitClient() diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj b/services/Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj similarity index 84% rename from services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj rename to services/Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj index f421b1738..047951f35 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj +++ b/services/Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj @@ -9,7 +9,7 @@ Collin M. Barrett FilterLists - FilterLists Shared Kernel API Clients + FilterLists Directory API Contracts The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. Copyright (c) 2020 Collin M. Barrett https://github.com/collinbarrett/FilterLists @@ -25,8 +25,4 @@ - - - - \ No newline at end of file diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/IDirectoryApi.cs b/services/Directory/FilterLists.Directory.Api.Contracts/IDirectoryApi.cs similarity index 78% rename from services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/IDirectoryApi.cs rename to services/Directory/FilterLists.Directory.Api.Contracts/IDirectoryApi.cs index 9fcd94c6c..279a95370 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/IDirectoryApi.cs +++ b/services/Directory/FilterLists.Directory.Api.Contracts/IDirectoryApi.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using FilterLists.SharedKernel.Apis.Contracts.Directory; +using FilterLists.Directory.Api.Contracts.Models; using Refit; -namespace FilterLists.SharedKernel.Apis.Clients +namespace FilterLists.Directory.Api.Contracts { public interface IDirectoryApi { diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/Directory/ListDetailsVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs similarity index 96% rename from services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/Directory/ListDetailsVm.cs rename to services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs index f1a61daa5..2a2b5d2e1 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/Directory/ListDetailsVm.cs +++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace FilterLists.SharedKernel.Apis.Contracts.Directory +namespace FilterLists.Directory.Api.Contracts.Models { public class ListDetailsVm { diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/Directory/ListVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs similarity index 89% rename from services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/Directory/ListVm.cs rename to services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs index 368efcbfd..544141eff 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/Directory/ListVm.cs +++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FilterLists.SharedKernel.Apis.Contracts.Directory +namespace FilterLists.Directory.Api.Contracts.Models { public class ListVm { diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/Options/ApiOptions.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Options/ApiOptions.cs similarity index 71% rename from services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/Options/ApiOptions.cs rename to services/Directory/FilterLists.Directory.Api.Contracts/Options/ApiOptions.cs index 2457c8ba0..df3bf7fa3 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/Options/ApiOptions.cs +++ b/services/Directory/FilterLists.Directory.Api.Contracts/Options/ApiOptions.cs @@ -1,4 +1,4 @@ -namespace FilterLists.SharedKernel.Apis.Clients.Options +namespace FilterLists.Directory.Api.Contracts.Options { internal class ApiOptions { diff --git a/services/Directory/FilterLists.Directory.Api/Controllers/ListsController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/ListsController.cs index b0bafa535..06745b443 100644 --- a/services/Directory/FilterLists.Directory.Api/Controllers/ListsController.cs +++ b/services/Directory/FilterLists.Directory.Api/Controllers/ListsController.cs @@ -2,8 +2,8 @@ using System.Net; using System.Threading; using System.Threading.Tasks; +using FilterLists.Directory.Api.Contracts.Models; using FilterLists.Directory.Application.Queries; -using FilterLists.SharedKernel.Apis.Contracts.Directory; using MediatR; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Caching.Memory; diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile b/services/Directory/FilterLists.Directory.Api/Dockerfile index 23c6396e2..fd027ee0c 100644 --- a/services/Directory/FilterLists.Directory.Api/Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/Dockerfile @@ -10,11 +10,10 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app -COPY SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj SharedKernel/FilterLists.SharedKernel.Apis.Contracts/ COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ -COPY Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/FilterLists.Directory.Domain/ COPY Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/FilterLists.Directory.Infrastructure/ COPY Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj Directory/FilterLists.Directory.Api.Contracts/ COPY Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/FilterLists.Directory.Application/ WORKDIR /app/Directory/FilterLists.Directory.Api COPY Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj . @@ -23,11 +22,10 @@ RUN dotnet restore # build API WORKDIR /app COPY /.editorconfig . -COPY SharedKernel/FilterLists.SharedKernel.Apis.Contracts/. SharedKernel/FilterLists.SharedKernel.Apis.Contracts/ COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ -COPY Directory/FilterLists.Directory.Domain/. Directory/FilterLists.Directory.Domain/ COPY Directory/FilterLists.Directory.Infrastructure/. Directory/FilterLists.Directory.Infrastructure/ COPY Directory/FilterLists.Directory.Infrastructure.Migrations/. Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Api.Contracts/. Directory/FilterLists.Directory.Api.Contracts/ COPY Directory/FilterLists.Directory.Application/. Directory/FilterLists.Directory.Application/ WORKDIR /app/Directory/FilterLists.Directory.Api COPY Directory/FilterLists.Directory.Api/. . diff --git a/services/Directory/FilterLists.Directory.Api/dev.Dockerfile b/services/Directory/FilterLists.Directory.Api/dev.Dockerfile index f332d04f3..784b2dda4 100644 --- a/services/Directory/FilterLists.Directory.Api/dev.Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/dev.Dockerfile @@ -9,11 +9,10 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app -COPY SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj SharedKernel/FilterLists.SharedKernel.Apis.Contracts/ COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ -COPY Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/FilterLists.Directory.Domain/ COPY Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/FilterLists.Directory.Infrastructure/ COPY Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj Directory/FilterLists.Directory.Api.Contracts/ COPY Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/FilterLists.Directory.Application/ WORKDIR /app/Directory/FilterLists.Directory.Api COPY Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj . @@ -22,11 +21,10 @@ RUN dotnet restore # build API WORKDIR /app COPY /.editorconfig . -COPY SharedKernel/FilterLists.SharedKernel.Apis.Contracts/. SharedKernel/FilterLists.SharedKernel.Apis.Contracts/ COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ -COPY Directory/FilterLists.Directory.Domain/. Directory/FilterLists.Directory.Domain/ COPY Directory/FilterLists.Directory.Infrastructure/. Directory/FilterLists.Directory.Infrastructure/ COPY Directory/FilterLists.Directory.Infrastructure.Migrations/. Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Api.Contracts/. Directory/FilterLists.Directory.Api.Contracts/ COPY Directory/FilterLists.Directory.Application/. Directory/FilterLists.Directory.Application/ WORKDIR /app/Directory/FilterLists.Directory.Api COPY Directory/FilterLists.Directory.Api/. . diff --git a/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile b/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile index ec522e3b5..9bb80442f 100644 --- a/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile @@ -6,9 +6,9 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"] # restore WORKDIR /app COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ -COPY Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/FilterLists.Directory.Domain/ COPY Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/FilterLists.Directory.Infrastructure/ COPY Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj Directory/FilterLists.Directory.Api.Contracts/ COPY Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/FilterLists.Directory.Application/ COPY Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj Directory/FilterLists.Directory.Api/ WORKDIR /app/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests @@ -18,9 +18,9 @@ RUN dotnet restore # build WORKDIR /app COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ -COPY Directory/FilterLists.Directory.Domain/. Directory/FilterLists.Directory.Domain/ COPY Directory/FilterLists.Directory.Infrastructure/. Directory/FilterLists.Directory.Infrastructure/ COPY Directory/FilterLists.Directory.Infrastructure.Migrations/. Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Api.Contracts/. Directory/FilterLists.Directory.Api.Contracts/ COPY Directory/FilterLists.Directory.Application/. Directory/FilterLists.Directory.Application/ COPY Directory/FilterLists.Directory.Api/. Directory/FilterLists.Directory.Api/ WORKDIR /app/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests diff --git a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj index 366946511..02f6008ee 100644 --- a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj +++ b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj @@ -26,7 +26,7 @@ - + diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs index 91ddf135f..0f810d5b1 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using AutoMapper; using AutoMapper.QueryableExtensions; +using FilterLists.Directory.Api.Contracts.Models; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; -using FilterLists.SharedKernel.Apis.Contracts.Directory; using MediatR; using Microsoft.EntityFrameworkCore; diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs index e38d110bb..d01f848fa 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs @@ -4,9 +4,9 @@ using System.Threading.Tasks; using AutoMapper; using AutoMapper.QueryableExtensions; +using FilterLists.Directory.Api.Contracts.Models; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; -using FilterLists.SharedKernel.Apis.Contracts.Directory; using MediatR; using Microsoft.EntityFrameworkCore; diff --git a/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj deleted file mode 100644 index bdba735a4..000000000 --- a/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - netstandard2.1 - latest - enable - - - - Collin M. Barrett - FilterLists - FilterLists Directory - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj index 617dbe879..afc365db7 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj @@ -26,9 +26,7 @@ - - \ No newline at end of file diff --git a/services/Directory/azure-pipelines.api.yaml b/services/Directory/azure-pipelines.api.yaml index 8b783260f..a02e593c6 100644 --- a/services/Directory/azure-pipelines.api.yaml +++ b/services/Directory/azure-pipelines.api.yaml @@ -6,12 +6,11 @@ trigger: include: [ services/Directory/azure-pipelines.api.yaml, - services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/*, services/SharedKernel/FilterLists.SharedKernel.Logging/*, - services/Directory/FilterLists.Directory.Domain/*, services/Directory/FilterLists.Directory.Infrastructure/*, services/Directory/FilterLists.Directory.Infrastructure.Migrations/*, - services/Directory/FilterLists.Directory.Application/*, + services/Directory/FilterLists.Directory.Api.Contracts/*, + services/Directory/FilterLists.Directory.Application/*, services/Directory/FilterLists.Directory.Api/*, docker-compose.yml, docker-compose.prod.yml, @@ -27,12 +26,11 @@ pr: include: [ services/Directory/azure-pipelines.api.yaml, - services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/*, services/SharedKernel/FilterLists.SharedKernel.Logging/*, - services/Directory/FilterLists.Directory.Domain/*, services/Directory/FilterLists.Directory.Infrastructure/*, services/Directory/FilterLists.Directory.Infrastructure.Migrations/*, - services/Directory/FilterLists.Directory.Application/*, + services/Directory/FilterLists.Directory.Api.Contracts/*, + services/Directory/FilterLists.Directory.Application/*, services/Directory/FilterLists.Directory.Api/*, docker-compose.yml, docker-compose.prod.yml, diff --git a/services/FilterLists.sln b/services/FilterLists.sln index 62a66b06d..93bb24ba9 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Directory", "Directory", "{ Directory\azure-pipelines.migrate.yaml = Directory\azure-pipelines.migrate.yaml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "Directory\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Application", "Directory\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure", "Directory\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj", "{74C798F8-892A-40F2-8D2E-395E83853771}" @@ -66,12 +64,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedKernel", "SharedKerne EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Logging", "SharedKernel\FilterLists.SharedKernel.Logging\FilterLists.SharedKernel.Logging.csproj", "{5485F55E-DFED-4DA0-8A00-220B081FAC96}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Apis.Contracts", "SharedKernel\FilterLists.SharedKernel.Apis.Contracts\FilterLists.SharedKernel.Apis.Contracts.csproj", "{D8B65709-B68E-42D6-8500-68EE309177D5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Apis.Clients", "SharedKernel\FilterLists.SharedKernel.Apis.Clients\FilterLists.SharedKernel.Apis.Clients.csproj", "{FF6F3D83-A96C-412C-BAFF-63BA89ADD31F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.SeedWork", "SharedKernel\FilterLists.SharedKernel.SeedWork\FilterLists.SharedKernel.SeedWork.csproj", "{FE809E6A-CEC4-4944-A69B-690C30776631}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api.Contracts", "Directory\FilterLists.Directory.Api.Contracts\FilterLists.Directory.Api.Contracts.csproj", "{4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -82,10 +78,6 @@ Global {FE50F471-7DC0-44AB-8DAB-2909E3207FF9}.Debug|Any CPU.Build.0 = Debug|Any CPU {FE50F471-7DC0-44AB-8DAB-2909E3207FF9}.Release|Any CPU.ActiveCfg = Release|Any CPU {FE50F471-7DC0-44AB-8DAB-2909E3207FF9}.Release|Any CPU.Build.0 = Release|Any CPU - {05496C09-DA31-4543-9EC4-D56BCADBB027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05496C09-DA31-4543-9EC4-D56BCADBB027}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05496C09-DA31-4543-9EC4-D56BCADBB027}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05496C09-DA31-4543-9EC4-D56BCADBB027}.Release|Any CPU.Build.0 = Release|Any CPU {CB1BCB34-C2A1-4E94-A90E-359FB4720B96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB1BCB34-C2A1-4E94-A90E-359FB4720B96}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB1BCB34-C2A1-4E94-A90E-359FB4720B96}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -122,25 +114,20 @@ Global {5485F55E-DFED-4DA0-8A00-220B081FAC96}.Debug|Any CPU.Build.0 = Debug|Any CPU {5485F55E-DFED-4DA0-8A00-220B081FAC96}.Release|Any CPU.ActiveCfg = Release|Any CPU {5485F55E-DFED-4DA0-8A00-220B081FAC96}.Release|Any CPU.Build.0 = Release|Any CPU - {D8B65709-B68E-42D6-8500-68EE309177D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8B65709-B68E-42D6-8500-68EE309177D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8B65709-B68E-42D6-8500-68EE309177D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8B65709-B68E-42D6-8500-68EE309177D5}.Release|Any CPU.Build.0 = Release|Any CPU - {FF6F3D83-A96C-412C-BAFF-63BA89ADD31F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF6F3D83-A96C-412C-BAFF-63BA89ADD31F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF6F3D83-A96C-412C-BAFF-63BA89ADD31F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF6F3D83-A96C-412C-BAFF-63BA89ADD31F}.Release|Any CPU.Build.0 = Release|Any CPU {FE809E6A-CEC4-4944-A69B-690C30776631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FE809E6A-CEC4-4944-A69B-690C30776631}.Debug|Any CPU.Build.0 = Debug|Any CPU {FE809E6A-CEC4-4944-A69B-690C30776631}.Release|Any CPU.ActiveCfg = Release|Any CPU {FE809E6A-CEC4-4944-A69B-690C30776631}.Release|Any CPU.Build.0 = Release|Any CPU + {4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {FE50F471-7DC0-44AB-8DAB-2909E3207FF9} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} - {05496C09-DA31-4543-9EC4-D56BCADBB027} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} {CB1BCB34-C2A1-4E94-A90E-359FB4720B96} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} {74C798F8-892A-40F2-8D2E-395E83853771} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} {4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} @@ -150,9 +137,8 @@ Global {11669839-E666-477B-A1B6-276041AD3768} = {5E52FEF9-9605-4ACB-8A42-A20E06331599} {A0B77015-E8C4-41D3-B63D-BF818026298C} = {5E52FEF9-9605-4ACB-8A42-A20E06331599} {5485F55E-DFED-4DA0-8A00-220B081FAC96} = {59197818-6C72-4A3C-A595-49F3D7D2EB18} - {D8B65709-B68E-42D6-8500-68EE309177D5} = {59197818-6C72-4A3C-A595-49F3D7D2EB18} - {FF6F3D83-A96C-412C-BAFF-63BA89ADD31F} = {59197818-6C72-4A3C-A595-49F3D7D2EB18} {FE809E6A-CEC4-4944-A69B-690C30776631} = {59197818-6C72-4A3C-A595-49F3D7D2EB18} + {4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {758B57EF-7505-4BE2-90A2-E2DE2EC32909} diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj b/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj deleted file mode 100644 index df25b3bc7..000000000 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - netstandard2.1 - latest - enable - - - - Collin M. Barrett - FilterLists - FilterLists Shared Kernel API Contracts - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file