prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(services): ♻ mv Directory API contracts from SharedKernel to Directory, rm unused Directory.Domain proj (for now)

Browse source
This commit is contained in:
Collin M. Barrett 2020-09-24 08:10:13 -05:00
parent 0b85283c0b
commit 66141c9dfb
25 changed files with 42 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/Archival/FilterLists.Archival.Api/Dockerfile
View file

@ -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

6
services/Archival/FilterLists.Archival.Api/dev.Dockerfile
View file

@ -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

4
services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs
View file

@ -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;

2
services/Archival/FilterLists.Archival.Application/Commands/EnqueueArchiveAllLists.cs
View file

@ -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;

4
services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs
View file

@ -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);
}

2
services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj
View file

@ -29,7 +29,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharedKernel\FilterLists.SharedKernel.Apis.Clients\FilterLists.SharedKernel.Apis.Clients.csproj" />
<ProjectReference Include="..\..\Directory\FilterLists.Directory.Api.Contracts\FilterLists.Directory.Api.Contracts.csproj" />
<ProjectReference Include="..\..\SharedKernel\FilterLists.SharedKernel.Logging\FilterLists.SharedKernel.Logging.csproj" />
<ProjectReference Include="..\..\SharedKernel\FilterLists.SharedKernel.SeedWork\FilterLists.SharedKernel.SeedWork.csproj" />
</ItemGroup>

6
services/Archival/azure-pipelines.api.yaml
View file

@ -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/*,

6
services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/ConfigurationExtensions.cs → services/Directory/FilterLists.Directory.Api.Contracts/ConfigurationExtensions.cs
View file

@ -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<IDirectoryApi>()

6
services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj → services/Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj
View file

@ -9,7 +9,7 @@
<PropertyGroup>
<Authors>Collin M. Barrett</Authors>
<Company>FilterLists</Company>
<Product>FilterLists Shared Kernel API Clients</Product>
<Product>FilterLists Directory API Contracts</Product>
<Description>The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</Description>
<Copyright>Copyright (c) 2020 Collin M. Barrett</Copyright>
<RepositoryUrl>https://github.com/collinbarrett/FilterLists</RepositoryUrl>
@ -25,8 +25,4 @@
<PackageReference Include="Refit.HttpClientFactory" Version="5.2.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FilterLists.SharedKernel.Apis.Contracts\FilterLists.SharedKernel.Apis.Contracts.csproj" />
</ItemGroup>
</Project>

4
services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/IDirectoryApi.cs → services/Directory/FilterLists.Directory.Api.Contracts/IDirectoryApi.cs
View file

@ -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
{

2
services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/Directory/ListDetailsVm.cs → services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
View file

@ -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
{

2
services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/Directory/ListVm.cs → services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs
View file

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace FilterLists.SharedKernel.Apis.Contracts.Directory
namespace FilterLists.Directory.Api.Contracts.Models
{
public class ListVm
{

2
services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/Options/ApiOptions.cs → services/Directory/FilterLists.Directory.Api.Contracts/Options/ApiOptions.cs
View file

@ -1,4 +1,4 @@
namespace FilterLists.SharedKernel.Apis.Clients.Options
namespace FilterLists.Directory.Api.Contracts.Options
{
internal class ApiOptions
{

2
services/Directory/FilterLists.Directory.Api/Controllers/ListsController.cs
View file

@ -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;

6
services/Directory/FilterLists.Directory.Api/Dockerfile
View file

@ -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/. .

6
services/Directory/FilterLists.Directory.Api/dev.Dockerfile
View file

@ -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/. .

4
services/Directory/FilterLists.Directory.Api/migrate.Dockerfile
View file

@ -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

2
services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
View file

@ -26,7 +26,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj" />
<ProjectReference Include="..\FilterLists.Directory.Api.Contracts\FilterLists.Directory.Api.Contracts.csproj" />
<ProjectReference Include="..\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj" />
</ItemGroup>

2
services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
View file

@ -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;

2
services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
View file

@ -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;

26
services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj
View file

@ -1,26 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<Authors>Collin M. Barrett</Authors>
<Company>FilterLists</Company>
<Product>FilterLists Directory</Product>
<Description>The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</Description>
<Copyright>Copyright (c) 2020 Collin M. Barrett</Copyright>
<RepositoryUrl>https://github.com/collinbarrett/FilterLists</RepositoryUrl>
<PackageProjectUrl>https://filterlists.com</PackageProjectUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

2
services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
View file

@ -26,9 +26,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharedKernel\FilterLists.SharedKernel.Apis.Contracts\FilterLists.SharedKernel.Apis.Contracts.csproj" />
<ProjectReference Include="..\..\SharedKernel\FilterLists.SharedKernel.Logging\FilterLists.SharedKernel.Logging.csproj" />
<ProjectReference Include="..\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj" />
</ItemGroup>
</Project>

10
services/Directory/azure-pipelines.api.yaml
View file

@ -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,

28
services/FilterLists.sln
View file

@ -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}

26
services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj
View file

@ -1,26 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<Authors>Collin M. Barrett</Authors>
<Company>FilterLists</Company>
<Product>FilterLists Shared Kernel API Contracts</Product>
<Description>The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</Description>
<Copyright>Copyright (c) 2020 Collin M. Barrett</Copyright>
<RepositoryUrl>https://github.com/collinbarrett/FilterLists</RepositoryUrl>
<PackageProjectUrl>https://filterlists.com</PackageProjectUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>