From 86c7b43edb2c6f35b31346fe1103f494e785be45 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Thu, 24 Sep 2020 16:45:57 -0500 Subject: [PATCH] =?UTF-8?q?refactor(archival):=20=E2=99=BB=20absorb=20Seed?= =?UTF-8?q?Work=20for=20now?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FilterLists.Archival.Api/Dockerfile | 2 -- .../FilterLists.Archival.Api/dev.Dockerfile | 2 -- ...FilterLists.Archival.Infrastructure.csproj | 1 - .../SeedWork}/IUnitOfWork.cs | 0 services/Archival/azure-pipelines.api.yaml | 2 -- services/FilterLists.sln | 7 ----- .../FilterLists.SharedKernel.SeedWork.csproj | 26 ------------------- 7 files changed, 40 deletions(-) rename services/{SharedKernel/FilterLists.SharedKernel.SeedWork => Archival/FilterLists.Archival.Infrastructure/SeedWork}/IUnitOfWork.cs (100%) delete mode 100644 services/SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile index 25fda50f5..7db35fa50 100644 --- a/services/Archival/FilterLists.Archival.Api/Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile @@ -11,7 +11,6 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app 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/ @@ -23,7 +22,6 @@ RUN dotnet restore WORKDIR /app COPY /.editorconfig . 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/ diff --git a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile index e299c7b0c..d0ade5482 100644 --- a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile @@ -10,7 +10,6 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app 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/ @@ -22,7 +21,6 @@ RUN dotnet restore WORKDIR /app COPY /.editorconfig . 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/ diff --git a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj index 59cb672ae..92b05a320 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj +++ b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj @@ -31,7 +31,6 @@ - \ No newline at end of file diff --git a/services/SharedKernel/FilterLists.SharedKernel.SeedWork/IUnitOfWork.cs b/services/Archival/FilterLists.Archival.Infrastructure/SeedWork/IUnitOfWork.cs similarity index 100% rename from services/SharedKernel/FilterLists.SharedKernel.SeedWork/IUnitOfWork.cs rename to services/Archival/FilterLists.Archival.Infrastructure/SeedWork/IUnitOfWork.cs diff --git a/services/Archival/azure-pipelines.api.yaml b/services/Archival/azure-pipelines.api.yaml index 11ad893c8..e0250c3c1 100644 --- a/services/Archival/azure-pipelines.api.yaml +++ b/services/Archival/azure-pipelines.api.yaml @@ -7,7 +7,6 @@ trigger: [ services/Archival/azure-pipelines.api.yaml, 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/*, @@ -27,7 +26,6 @@ pr: [ services/Archival/azure-pipelines.api.yaml, 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/*, diff --git a/services/FilterLists.sln b/services/FilterLists.sln index 93bb24ba9..b84859506 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -64,8 +64,6 @@ 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.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 @@ -114,10 +112,6 @@ 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 - {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 @@ -137,7 +131,6 @@ 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} - {FE809E6A-CEC4-4944-A69B-690C30776631} = {59197818-6C72-4A3C-A595-49F3D7D2EB18} {4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/services/SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj b/services/SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj deleted file mode 100644 index 02be0e12c..000000000 --- a/services/SharedKernel/FilterLists.SharedKernel.SeedWork/FilterLists.SharedKernel.SeedWork.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - 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