diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile index f221a4d79..5ca86590f 100644 --- a/services/Archival/FilterLists.Archival.Api/Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile @@ -10,6 +10,7 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ COPY Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj Directory/FilterLists.Directory.Api.Contracts/ COPY Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj Archival/FilterLists.Archival.Domain/ @@ -22,6 +23,7 @@ RUN dotnet restore # build API WORKDIR /app COPY /.editorconfig . +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/. SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ COPY Directory/FilterLists.Directory.Api.Contracts/. Directory/FilterLists.Directory.Api.Contracts/ COPY Archival/FilterLists.Archival.Domain/. Archival/FilterLists.Archival.Domain/ diff --git a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile index 1d3b79382..ff59bea31 100644 --- a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile @@ -8,6 +8,7 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ COPY Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj Directory/FilterLists.Directory.Api.Contracts/ COPY Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj Archival/FilterLists.Archival.Domain/ @@ -20,6 +21,7 @@ RUN dotnet restore # build API WORKDIR /app COPY /.editorconfig . +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/. SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ COPY Directory/FilterLists.Directory.Api.Contracts/. Directory/FilterLists.Directory.Api.Contracts/ COPY Archival/FilterLists.Archival.Domain/. Archival/FilterLists.Archival.Domain/ diff --git a/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj b/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj index aba03b91b..26c8c1ea1 100644 --- a/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj +++ b/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj @@ -16,4 +16,8 @@ https://filterlists.com + + + + \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Domain/ListArchives/IListArchiveRepository.cs b/services/Archival/FilterLists.Archival.Domain/ListArchives/IListArchiveRepository.cs index b52974799..26aa1a5fe 100644 --- a/services/Archival/FilterLists.Archival.Domain/ListArchives/IListArchiveRepository.cs +++ b/services/Archival/FilterLists.Archival.Domain/ListArchives/IListArchiveRepository.cs @@ -1,4 +1,4 @@ -using FilterLists.Archival.Domain.SeedWork; +using FilterLists.SharedKernel.Domain.SeedWork; namespace FilterLists.Archival.Domain.ListArchives; diff --git a/services/Archival/FilterLists.Archival.Domain/ListArchives/ListFileExtension.cs b/services/Archival/FilterLists.Archival.Domain/ListArchives/ListFileExtension.cs index 4d98c0792..7a5a2d01e 100644 --- a/services/Archival/FilterLists.Archival.Domain/ListArchives/ListFileExtension.cs +++ b/services/Archival/FilterLists.Archival.Domain/ListArchives/ListFileExtension.cs @@ -1,5 +1,5 @@ using FilterLists.Archival.Domain.Extensions; -using FilterLists.Archival.Domain.SeedWork; +using FilterLists.SharedKernel.Domain.SeedWork; namespace FilterLists.Archival.Domain.ListArchives; diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile b/services/Directory/FilterLists.Directory.Api/Dockerfile index 09aa5926d..7184fb458 100644 --- a/services/Directory/FilterLists.Directory.Api/Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/Dockerfile @@ -10,6 +10,7 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ 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/ @@ -23,6 +24,7 @@ RUN dotnet restore # build API WORKDIR /app COPY /.editorconfig . +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/. SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ 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/ diff --git a/services/Directory/FilterLists.Directory.Api/dev.Dockerfile b/services/Directory/FilterLists.Directory.Api/dev.Dockerfile index babff1374..3d69fad87 100644 --- a/services/Directory/FilterLists.Directory.Api/dev.Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/dev.Dockerfile @@ -9,6 +9,7 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ 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/ @@ -22,6 +23,7 @@ RUN dotnet restore # build API WORKDIR /app COPY /.editorconfig . +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/. SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ 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/ diff --git a/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile b/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile index f85303d63..550e57473 100644 --- a/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile @@ -5,6 +5,7 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"] # restore WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ 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/ @@ -18,6 +19,7 @@ RUN dotnet restore # build WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/. SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ 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/ diff --git a/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj index 9f193f411..4ecde6273 100644 --- a/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj +++ b/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj @@ -16,4 +16,8 @@ https://filterlists.com + + + + \ No newline at end of file diff --git a/services/FilterLists.sln b/services/FilterLists.sln index b728e09a6..1157c1a61 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -71,6 +71,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Domain EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "Directory\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{EE844873-71D7-4B9D-93BF-DF65B9E4770D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Domain.SeedWork", "SharedKernel\FilterLists.SharedKernel.Domain.SeedWork\FilterLists.SharedKernel.Domain.SeedWork.csproj", "{D30024F5-B73C-452E-8EE3-C3A6D238BF23}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -129,6 +131,10 @@ Global {EE844873-71D7-4B9D-93BF-DF65B9E4770D}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE844873-71D7-4B9D-93BF-DF65B9E4770D}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE844873-71D7-4B9D-93BF-DF65B9E4770D}.Release|Any CPU.Build.0 = Release|Any CPU + {D30024F5-B73C-452E-8EE3-C3A6D238BF23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D30024F5-B73C-452E-8EE3-C3A6D238BF23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D30024F5-B73C-452E-8EE3-C3A6D238BF23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D30024F5-B73C-452E-8EE3-C3A6D238BF23}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -147,6 +153,7 @@ Global {4D3D2508-CCC6-4C0B-B5E4-734DD5EC588F} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} {6402E81A-75C2-422F-933B-AAC1ED8C4128} = {5E52FEF9-9605-4ACB-8A42-A20E06331599} {EE844873-71D7-4B9D-93BF-DF65B9E4770D} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} + {D30024F5-B73C-452E-8EE3-C3A6D238BF23} = {59197818-6C72-4A3C-A595-49F3D7D2EB18} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {758B57EF-7505-4BE2-90A2-E2DE2EC32909} diff --git a/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj b/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj new file mode 100644 index 000000000..e3f337746 --- /dev/null +++ b/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj @@ -0,0 +1,19 @@ + + + + net6.0 + enable + enable + + + + Collin M. Barrett + FilterLists + FilterLists Shared Kernel Domain SeedWork + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2021 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + + + \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Domain/SeedWork/IUnitOfWork.cs b/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/IUnitOfWork.cs similarity index 54% rename from services/Archival/FilterLists.Archival.Domain/SeedWork/IUnitOfWork.cs rename to services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/IUnitOfWork.cs index 0dcebe9c8..a1aa12628 100644 --- a/services/Archival/FilterLists.Archival.Domain/SeedWork/IUnitOfWork.cs +++ b/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/IUnitOfWork.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Archival.Domain.SeedWork; +namespace FilterLists.SharedKernel.Domain.SeedWork; public interface IUnitOfWork : IDisposable { diff --git a/services/Archival/FilterLists.Archival.Domain/SeedWork/ValueObject.cs b/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ValueObject.cs similarity index 87% rename from services/Archival/FilterLists.Archival.Domain/SeedWork/ValueObject.cs rename to services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ValueObject.cs index d2a7512b6..7f7a4c4b7 100644 --- a/services/Archival/FilterLists.Archival.Domain/SeedWork/ValueObject.cs +++ b/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/ValueObject.cs @@ -1,6 +1,8 @@ -namespace FilterLists.Archival.Domain.SeedWork; +namespace FilterLists.SharedKernel.Domain.SeedWork; -/// https://enterprisecraftsmanship.com/posts/value-object-better-implementation/ +/// +/// https://enterprisecraftsmanship.com/posts/value-object-better-implementation/ +/// public abstract class ValueObject { protected abstract IEnumerable GetEqualityComponents();