refactor(services): ♻🎨 rm un-useful 'src' and 'tests' sub-dirs

.github/dependabot.yml

@@ -1,73 +1,73 @@
 version: 2
 updates:
 - package-ecosystem: nuget
-  directory: "/services/SharedKernel/src/FilterLists.SharedKernel.Logging"
+  directory: "/services/SharedKernel/FilterLists.SharedKernel.Logging"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: docker
-  directory: "/services/Archival/src/FilterLists.Archival.Api"
+  directory: "/services/Archival/FilterLists.Archival.Api"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Archival/src/FilterLists.Archival.Api"
+  directory: "/services/Archival/FilterLists.Archival.Api"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Archival/src/FilterLists.Archival.Application"
+  directory: "/services/Archival/FilterLists.Archival.Application"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Archival/src/FilterLists.Archival.Infrastructure"
+  directory: "/services/Archival/FilterLists.Archival.Infrastructure"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: docker
-  directory: "/services/Directory/src/FilterLists.Directory.Api"
+  directory: "/services/Directory/FilterLists.Directory.Api"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Directory/src/FilterLists.Directory.Api"
+  directory: "/services/Directory/FilterLists.Directory.Api"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations"
+  directory: "/services/Directory/FilterLists.Directory.Infrastructure.Migrations"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Directory/src/FilterLists.Directory.Infrastructure"
+  directory: "/services/Directory/FilterLists.Directory.Infrastructure"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Directory/src/FilterLists.Directory.Application"
+  directory: "/services/Directory/FilterLists.Directory.Application"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Directory/src/FilterLists.Directory.Domain"
+  directory: "/services/Directory/FilterLists.Directory.Domain"
   schedule:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 99
 - package-ecosystem: nuget
-  directory: "/services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests"
+  directory: "/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests"
   schedule:
     interval: daily
     time: "11:00"

docker-compose.directory.migrations.tests.yml

@@ -4,10 +4,10 @@ services:
   directory-migrations-tests:
     build:
       context: ./services
-      dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile.migrate
+      dockerfile: Directory/FilterLists.Directory.Api/Dockerfile.migrate
       target: test-migrations
     volumes:
-      - directory-migrations-tests-results:/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/TestResults
+      - directory-migrations-tests-results:/FilterLists.Directory.Infrastructure.Migrations.Tests/TestResults
     depends_on:
       - directory-db
     environment:

docker-compose.override.yml

@@ -13,14 +13,14 @@ services:
   archival-api:
     build:
       context: ./services
-      dockerfile: Archival/src/FilterLists.Archival.Api/Dockerfile.dev
+      dockerfile: Archival/FilterLists.Archival.Api/Dockerfile.dev
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
 
   directory-api:
     build:
       context: ./services
-      dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile.dev
+      dockerfile: Directory/FilterLists.Directory.Api/Dockerfile.dev
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
 

docker-compose.prod.build.yml

@@ -7,12 +7,12 @@ services:
   archival-api:
     build:
       context: ./services
-      dockerfile: Archival/src/FilterLists.Archival.Api/Dockerfile
+      dockerfile: Archival/FilterLists.Archival.Api/Dockerfile
 
   directory-api:
     build:
       context: ./services
-      dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile
+      dockerfile: Directory/FilterLists.Directory.Api/Dockerfile
 
   web:
     build:

services/.dockerignore

@@ -31,5 +31,5 @@ README.md
 **/azure-pipelines*.yaml
 **/*.sln
 **/*.sln.DotSettings
-Directory/src/FilterLists.Directory.Api/appsettings.Development.json
+Directory/FilterLists.Directory.Api/appsettings.Development.json
 Directory/data/*

services/Archival/FilterLists.Archival.Api/Dockerfile

@@ -0,0 +1,29 @@
+# init base
+FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base
+WORKDIR /app
+
+# init build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
+
+# restore API
+WORKDIR /app
+COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/
+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
+COPY Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj .
+RUN dotnet restore
+
+# build API
+WORKDIR /app
+COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/
+COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archival.Infrastructure/
+COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/
+WORKDIR /app/Archival/FilterLists.Archival.Api
+COPY Archival/FilterLists.Archival.Api/. .
+RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64
+
+# package final
+FROM base AS final
+COPY --from=build /app/publish .
+ENTRYPOINT ./FilterLists.Archival.Api

services/Archival/FilterLists.Archival.Api/Dockerfile.dev

@@ -0,0 +1,29 @@
+# init base for Visual Studio debugging
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base
+WORKDIR /app
+
+# init build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
+
+# restore API
+WORKDIR /app
+COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/
+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
+COPY Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj .
+RUN dotnet restore
+
+# build API
+WORKDIR /app
+COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/
+COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archival.Infrastructure/
+COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/
+WORKDIR /app/Archival/FilterLists.Archival.Api
+COPY Archival/FilterLists.Archival.Api/. .
+RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64
+
+# package final
+FROM base AS final
+COPY --from=build /app/publish .
+ENTRYPOINT ./FilterLists.Archival.Api

services/Archival/src/FilterLists.Archival.Api/Dockerfile

@@ -1,29 +0,0 @@
-# init base
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base
-WORKDIR /app
-
-# init build
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
-
-# restore API
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj Archival/src/FilterLists.Archival.Infrastructure/
-COPY Archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj Archival/src/FilterLists.Archival.Application/
-WORKDIR /app/Archival/src/FilterLists.Archival.Api
-COPY Archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj .
-RUN dotnet restore
-
-# build API
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Archival/src/FilterLists.Archival.Infrastructure/. Archival/src/FilterLists.Archival.Infrastructure/
-COPY Archival/src/FilterLists.Archival.Application/. Archival/src/FilterLists.Archival.Application/
-WORKDIR /app/Archival/src/FilterLists.Archival.Api
-COPY Archival/src/FilterLists.Archival.Api/. .
-RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64
-
-# package final
-FROM base AS final
-COPY --from=build /app/publish .
-ENTRYPOINT ./FilterLists.Archival.Api

services/Archival/src/FilterLists.Archival.Api/Dockerfile.dev

@@ -1,29 +0,0 @@
-# init base for Visual Studio debugging
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base
-WORKDIR /app
-
-# init build
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
-
-# restore API
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj Archival/src/FilterLists.Archival.Infrastructure/
-COPY Archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj Archival/src/FilterLists.Archival.Application/
-WORKDIR /app/Archival/src/FilterLists.Archival.Api
-COPY Archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj .
-RUN dotnet restore
-
-# build API
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Archival/src/FilterLists.Archival.Infrastructure/. Archival/src/FilterLists.Archival.Infrastructure/
-COPY Archival/src/FilterLists.Archival.Application/. Archival/src/FilterLists.Archival.Application/
-WORKDIR /app/Archival/src/FilterLists.Archival.Api
-COPY Archival/src/FilterLists.Archival.Api/. .
-RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64
-
-# package final
-FROM base AS final
-COPY --from=build /app/publish .
-ENTRYPOINT ./FilterLists.Archival.Api

services/Directory/FilterLists.Directory.Api/Dockerfile

@@ -0,0 +1,34 @@
+# init base
+FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+# init build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
+
+# restore API
+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.Application/FilterLists.Directory.Application.csproj Directory/FilterLists.Directory.Application/
+WORKDIR /app/Directory/FilterLists.Directory.Api
+COPY Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj .
+RUN dotnet restore
+
+# build API
+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.Application/. Directory/FilterLists.Directory.Application/
+WORKDIR /app/Directory/FilterLists.Directory.Api
+COPY Directory/FilterLists.Directory.Api/. .
+RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64
+
+# package final
+FROM base AS final
+COPY --from=build /app/publish .
+ENTRYPOINT ./FilterLists.Directory.Api

services/Directory/FilterLists.Directory.Api/Dockerfile.dev

@@ -0,0 +1,34 @@
+# init base for Visual Studio debugging
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base
+WORKDIR /app
+EXPOSE 80
+
+# init build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
+
+# restore API
+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.Application/FilterLists.Directory.Application.csproj Directory/FilterLists.Directory.Application/
+WORKDIR /app/Directory/FilterLists.Directory.Api
+COPY Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj .
+RUN dotnet restore
+
+# build API
+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.Application/. Directory/FilterLists.Directory.Application/
+WORKDIR /app/Directory/FilterLists.Directory.Api
+COPY Directory/FilterLists.Directory.Api/. .
+RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64
+
+# package final
+FROM base AS final
+COPY --from=build /app/publish .
+ENTRYPOINT ./FilterLists.Directory.Api

services/Directory/FilterLists.Directory.Api/Dockerfile.migrate

@@ -0,0 +1,27 @@
+# init test-migrations
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS test-migrations
+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.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
+COPY Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj .
+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.Application/. Directory/FilterLists.Directory.Application/
+COPY Directory/FilterLists.Directory.Api/. Directory/FilterLists.Directory.Api/
+WORKDIR /app/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests
+COPY Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/. .
+RUN dotnet build -c Release --no-restore -r linux-musl-x64

services/Directory/azure-pipelines.api.yaml

@@ -6,11 +6,11 @@ trigger:
     include:
       [
         services/Directory/azure-pipelines.api.yaml,
-        services/Directory/src/FilterLists.Directory.Domain/*,
-        services/Directory/src/FilterLists.Directory.Infrastructure/*,
-        services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/*,
-        services/Directory/src/FilterLists.Directory.Application/*,
-        services/Directory/src/FilterLists.Directory.Api/*,
+        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/*,
         docker-compose.yml,
         docker-compose.prod.yml,
         .env,
@@ -25,11 +25,11 @@ pr:
     include:
       [
         services/Directory/azure-pipelines.api.yaml,
-        services/Directory/src/FilterLists.Directory.Domain/*,
-        services/Directory/src/FilterLists.Directory.Infrastructure/*,
-        services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/*,
-        services/Directory/src/FilterLists.Directory.Application/*,
-        services/Directory/src/FilterLists.Directory.Api/*,
+        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/*,
         docker-compose.yml,
         docker-compose.prod.yml,
         .env,
@@ -53,7 +53,7 @@ steps:
       containerRegistry: github-container-registry
       repository: collinbarrett/filterlists-directory-api
       command: build
-      Dockerfile: services/Directory/src/FilterLists.Directory.Api/Dockerfile
+      Dockerfile: services/Directory/FilterLists.Directory.Api/Dockerfile
       buildContext: ./services
       tags: |
         latest

services/Directory/azure-pipelines.migrate.yaml

@@ -131,7 +131,7 @@ steps:
     condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), succeeded())
     inputs:
       targetType: inline
-      workingDirectory: services/Directory/src/FilterLists.Directory.Infrastructure.Migrations
+      workingDirectory: services/Directory/FilterLists.Directory.Infrastructure.Migrations
       script: |
         DIFF=$(git status -s -- . | wc -l)
         echo "$DIFF file(s) changed"

services/Directory/src/FilterLists.Directory.Api/Dockerfile

@@ -1,34 +0,0 @@
-# init base
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base
-WORKDIR /app
-EXPOSE 80
-
-# init build
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
-
-# restore API
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/src/FilterLists.Directory.Domain/
-COPY Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/src/FilterLists.Directory.Infrastructure/
-COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/src/FilterLists.Directory.Infrastructure.Migrations/
-COPY Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/src/FilterLists.Directory.Application/
-WORKDIR /app/Directory/src/FilterLists.Directory.Api
-COPY Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj .
-RUN dotnet restore
-
-# build API
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Directory/src/FilterLists.Directory.Domain/. Directory/src/FilterLists.Directory.Domain/
-COPY Directory/src/FilterLists.Directory.Infrastructure/. Directory/src/FilterLists.Directory.Infrastructure/
-COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/. Directory/src/FilterLists.Directory.Infrastructure.Migrations/
-COPY Directory/src/FilterLists.Directory.Application/. Directory/src/FilterLists.Directory.Application/
-WORKDIR /app/Directory/src/FilterLists.Directory.Api
-COPY Directory/src/FilterLists.Directory.Api/. .
-RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64
-
-# package final
-FROM base AS final
-COPY --from=build /app/publish .
-ENTRYPOINT ./FilterLists.Directory.Api

services/Directory/src/FilterLists.Directory.Api/Dockerfile.dev

@@ -1,34 +0,0 @@
-# init base for Visual Studio debugging
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base
-WORKDIR /app
-EXPOSE 80
-
-# init build
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build
-
-# restore API
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/src/FilterLists.Directory.Domain/
-COPY Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/src/FilterLists.Directory.Infrastructure/
-COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/src/FilterLists.Directory.Infrastructure.Migrations/
-COPY Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/src/FilterLists.Directory.Application/
-WORKDIR /app/Directory/src/FilterLists.Directory.Api
-COPY Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj .
-RUN dotnet restore
-
-# build API
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Directory/src/FilterLists.Directory.Domain/. Directory/src/FilterLists.Directory.Domain/
-COPY Directory/src/FilterLists.Directory.Infrastructure/. Directory/src/FilterLists.Directory.Infrastructure/
-COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/. Directory/src/FilterLists.Directory.Infrastructure.Migrations/
-COPY Directory/src/FilterLists.Directory.Application/. Directory/src/FilterLists.Directory.Application/
-WORKDIR /app/Directory/src/FilterLists.Directory.Api
-COPY Directory/src/FilterLists.Directory.Api/. .
-RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64
-
-# package final
-FROM base AS final
-COPY --from=build /app/publish .
-ENTRYPOINT ./FilterLists.Directory.Api

services/Directory/src/FilterLists.Directory.Api/Dockerfile.migrate

@@ -1,27 +0,0 @@
-# init test-migrations
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS test-migrations
-ENTRYPOINT ["dotnet", "test", "--logger:trx"]
-
-# restore
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/src/FilterLists.Directory.Domain/
-COPY Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/src/FilterLists.Directory.Infrastructure/
-COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/src/FilterLists.Directory.Infrastructure.Migrations/
-COPY Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/src/FilterLists.Directory.Application/
-COPY Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj Directory/src/FilterLists.Directory.Api/
-WORKDIR /app/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests
-COPY Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj .
-RUN dotnet restore
-
-# build
-WORKDIR /app
-COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/
-COPY Directory/src/FilterLists.Directory.Domain/. Directory/src/FilterLists.Directory.Domain/
-COPY Directory/src/FilterLists.Directory.Infrastructure/. Directory/src/FilterLists.Directory.Infrastructure/
-COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/. Directory/src/FilterLists.Directory.Infrastructure.Migrations/
-COPY Directory/src/FilterLists.Directory.Application/. Directory/src/FilterLists.Directory.Application/
-COPY Directory/src/FilterLists.Directory.Api/. Directory/src/FilterLists.Directory.Api/
-WORKDIR /app/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests
-COPY Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/. .
-RUN dotnet build -c Release --no-restore -r linux-musl-x64

services/FilterLists.sln

@@ -48,7 +48,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{8F419098-3
 		Directory\data\Tag.json = Directory\data\Tag.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations.Tests", "Directory\tests\FilterLists.Directory.Infrastructure.Migrations.Tests\FilterLists.Directory.Infrastructure.Migrations.Tests.csproj", "{8B07EF04-5516-40BB-B21B-CEC6F90EC631}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations.Tests", "Directory\FilterLists.Directory.Infrastructure.Migrations.Tests\FilterLists.Directory.Infrastructure.Migrations.Tests.csproj", "{8B07EF04-5516-40BB-B21B-CEC6F90EC631}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Archival", "Archival", "{5E52FEF9-9605-4ACB-8A42-A20E06331599}"
 EndProject

services/FilterLists.sln.DotSettings

@@ -1,7 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                        xmlns:s="clr-namespace:System;assembly=mscorlib"
-                        xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml"
-                        xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=FilterLists_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="FilterLists Cleanup"&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" /&gt;&lt;RemoveCodeRedundanciesVB&gt;True&lt;/RemoveCodeRedundanciesVB&gt;&lt;Xaml.RedundantFreezeAttribute&gt;True&lt;/Xaml.RedundantFreezeAttribute&gt;&lt;Xaml.RemoveRedundantModifiersAttribute&gt;True&lt;/Xaml.RemoveRedundantModifiersAttribute&gt;&lt;Xaml.RemoveRedundantNameAttribute&gt;True&lt;/Xaml.RemoveRedundantNameAttribute&gt;&lt;Xaml.RemoveRedundantResource&gt;True&lt;/Xaml.RemoveRedundantResource&gt;&lt;Xaml.RemoveRedundantCollectionProperty&gt;True&lt;/Xaml.RemoveRedundantCollectionProperty&gt;&lt;Xaml.RemoveRedundantAttachedPropertySetter&gt;True&lt;/Xaml.RemoveRedundantAttachedPropertySetter&gt;&lt;Xaml.RemoveRedundantStyledValue&gt;True&lt;/Xaml.RemoveRedundantStyledValue&gt;&lt;Xaml.RemoveRedundantNamespaceAlias&gt;True&lt;/Xaml.RemoveRedundantNamespaceAlias&gt;&lt;Xaml.RemoveForbiddenResourceName&gt;True&lt;/Xaml.RemoveForbiddenResourceName&gt;&lt;Xaml.RemoveRedundantGridDefinitionsAttribute&gt;True&lt;/Xaml.RemoveRedundantGridDefinitionsAttribute&gt;&lt;Xaml.RemoveRedundantGridSpanAttribut&gt;True&lt;/Xaml.RemoveRedundantGridSpanAttribut&gt;&lt;Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;True&lt;/Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;&lt;Xaml.RemoveRedundantBindingModeAttribute&gt;True&lt;/Xaml.RemoveRedundantBindingModeAttribute&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;VBOptimizeImports&gt;True&lt;/VBOptimizeImports&gt;&lt;VBShortenReferences&gt;True&lt;/VBShortenReferences&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;VBReformatCode&gt;True&lt;/VBReformatCode&gt;&lt;VBFormatDocComments&gt;True&lt;/VBFormatDocComments&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">FilterLists Cleanup</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">NEVER</s:String>
@@ -10,5 +7,9 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_BINARY_EXPRESSIONS/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Primariness/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Syntaxes/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>