From 145295c3e9367199cb09de70fbd2920f189f88f7 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 15 Sep 2020 17:47:35 -0500 Subject: [PATCH] =?UTF-8?q?refactor(services):=20=E2=99=BB=20extract=20See?= =?UTF-8?q?dWork=20proj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/dependabot.yml | 6 +++++ .../FilterLists.Archival.Api/Dockerfile | 2 ++ .../FilterLists.Archival.Api/dev.Dockerfile | 2 ++ ...FilterLists.Archival.Infrastructure.csproj | 1 + .../Persistence/IArchiveFiles.cs | 1 + services/FilterLists.sln | 7 +++++ .../FilterLists.SharedKernel.SeedWork.csproj | 26 +++++++++++++++++++ .../IUnitOfWork.cs | 2 +- 8 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 services/SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj rename services/{Archival/FilterLists.Archival.Infrastructure/Persistence => SharedKernel/FilterLists.SharedKernel.SeedWork}/IUnitOfWork.cs (64%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e0468c425..856bb15b6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,6 +18,12 @@ updates: interval: daily time: "11:00" open-pull-requests-limit: 99 +- package-ecosystem: nuget + directory: "/services/SharedKernel/FilterLists.SharedKernel.SeedWork" + schedule: + interval: daily + time: "11:00" + open-pull-requests-limit: 99 - package-ecosystem: docker directory: "/services/Archival/FilterLists.Archival.Api" schedule: diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile index 270b3c09b..f83af0a9d 100644 --- a/services/Archival/FilterLists.Archival.Api/Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile @@ -12,6 +12,7 @@ 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 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 @@ -24,6 +25,7 @@ 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 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 485e4c378..e1f7d0cb4 100644 --- a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile @@ -11,6 +11,7 @@ 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 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,6 +24,7 @@ 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 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.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj index c05d1a26a..4978eb40b 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj +++ b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj @@ -30,6 +30,7 @@ + \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Infrastructure/Persistence/IArchiveFiles.cs b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/IArchiveFiles.cs index 0d1ace4c4..1edbe8e2f 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/Persistence/IArchiveFiles.cs +++ b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/IArchiveFiles.cs @@ -1,6 +1,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using FilterLists.SharedKernel.SeedWork; namespace FilterLists.Archival.Infrastructure.Persistence { diff --git a/services/FilterLists.sln b/services/FilterLists.sln index e08386a15..96f8cbdce 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -67,6 +67,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Ap 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.SharedKernel.SeedWork", "SharedKernel\FilterLists.SharedKernel.SeedWork\FilterLists.SharedKernel.SeedWork.csproj", "{FE809E6A-CEC4-4944-A69B-690C30776631}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -125,6 +127,10 @@ Global {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -143,6 +149,7 @@ Global {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {758B57EF-7505-4BE2-90A2-E2DE2EC32909} diff --git a/services/SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj b/services/SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj new file mode 100644 index 000000000..02be0e12c --- /dev/null +++ b/services/SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj @@ -0,0 +1,26 @@ + + + + netstandard2.1 + latest + enable + + + + Collin M. Barrett + FilterLists + FilterLists Shared Kernel SeedWork + 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/Archival/FilterLists.Archival.Infrastructure/Persistence/IUnitOfWork.cs b/services/SharedKernel/FilterLists.SharedKernel.SeedWork/IUnitOfWork.cs similarity index 64% rename from services/Archival/FilterLists.Archival.Infrastructure/Persistence/IUnitOfWork.cs rename to services/SharedKernel/FilterLists.SharedKernel.SeedWork/IUnitOfWork.cs index 77636e172..d1b893047 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/Persistence/IUnitOfWork.cs +++ b/services/SharedKernel/FilterLists.SharedKernel.SeedWork/IUnitOfWork.cs @@ -1,6 +1,6 @@ using System; -namespace FilterLists.Archival.Infrastructure.Persistence +namespace FilterLists.SharedKernel.SeedWork { public interface IUnitOfWork : IDisposable {