diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ed087417c..7de6c15bb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: - package-ecosystem: nuget - directory: "/services/sharedKernel/src/FilterLists.SharedKernel.Logging" + directory: "/services/SharedKernel/src/FilterLists.SharedKernel.Logging" schedule: interval: daily time: "11:00" diff --git a/services/FilterLists.sln b/services/FilterLists.sln index 268043db3..1b42ba8fd 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -60,7 +60,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Infras EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedKernel", "SharedKernel", "{59197818-6C72-4A3C-A595-49F3D7D2EB18}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.SharedKernel.Logging", "sharedKernel\src\FilterLists.SharedKernel.Logging\FilterLists.SharedKernel.Logging.csproj", "{5485F55E-DFED-4DA0-8A00-220B081FAC96}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.SharedKernel.Logging", "SharedKernel\src\FilterLists.SharedKernel.Logging\FilterLists.SharedKernel.Logging.csproj", "{5485F55E-DFED-4DA0-8A00-220B081FAC96}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/services/sharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs b/services/SharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs similarity index 100% rename from services/sharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs rename to services/SharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs diff --git a/services/sharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs b/services/SharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs similarity index 100% rename from services/sharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs rename to services/SharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs diff --git a/services/sharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj b/services/SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj similarity index 100% rename from services/sharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj rename to services/SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj diff --git a/services/sharedKernel/src/FilterLists.SharedKernel.Logging/HostRunner.cs b/services/SharedKernel/src/FilterLists.SharedKernel.Logging/HostRunner.cs similarity index 100% rename from services/sharedKernel/src/FilterLists.SharedKernel.Logging/HostRunner.cs rename to services/SharedKernel/src/FilterLists.SharedKernel.Logging/HostRunner.cs diff --git a/services/archival/src/FilterLists.Archival.Api/Dockerfile b/services/archival/src/FilterLists.Archival.Api/Dockerfile index 43e7b5bfe..ea8cb2885 100644 --- a/services/archival/src/FilterLists.Archival.Api/Dockerfile +++ b/services/archival/src/FilterLists.Archival.Api/Dockerfile @@ -7,7 +7,7 @@ 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 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 @@ -16,7 +16,7 @@ RUN dotnet restore # build API WORKDIR /app -COPY sharedKernel/src/FilterLists.SharedKernel.Logging/. sharedKernel/src/FilterLists.SharedKernel.Logging/ +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 diff --git a/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev b/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev index 8420b23fb..75f65e6a9 100644 --- a/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev +++ b/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev @@ -7,7 +7,7 @@ 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 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 @@ -16,7 +16,7 @@ RUN dotnet restore # build API WORKDIR /app -COPY sharedKernel/src/FilterLists.SharedKernel.Logging/. sharedKernel/src/FilterLists.SharedKernel.Logging/ +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 diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj index 14436114d..ef47de519 100644 --- a/services/archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj +++ b/services/archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj @@ -39,7 +39,7 @@ - + diff --git a/services/directory/src/FilterLists.Directory.Api/Dockerfile b/services/directory/src/FilterLists.Directory.Api/Dockerfile index bdc4476b5..35ac8e72f 100644 --- a/services/directory/src/FilterLists.Directory.Api/Dockerfile +++ b/services/directory/src/FilterLists.Directory.Api/Dockerfile @@ -8,7 +8,7 @@ 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 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/ @@ -19,7 +19,7 @@ RUN dotnet restore # build API WORKDIR /app -COPY sharedKernel/src/FilterLists.SharedKernel.Logging/. sharedKernel/src/FilterLists.SharedKernel.Logging/ +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/ diff --git a/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev b/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev index 9a703b76e..60b009f6a 100644 --- a/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev +++ b/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev @@ -8,7 +8,7 @@ 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 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/ @@ -19,7 +19,7 @@ RUN dotnet restore # build API WORKDIR /app -COPY sharedKernel/src/FilterLists.SharedKernel.Logging/. sharedKernel/src/FilterLists.SharedKernel.Logging/ +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/ diff --git a/services/directory/src/FilterLists.Directory.Api/Dockerfile.migrate b/services/directory/src/FilterLists.Directory.Api/Dockerfile.migrate index 7a59c8b21..c0b3eebc7 100644 --- a/services/directory/src/FilterLists.Directory.Api/Dockerfile.migrate +++ b/services/directory/src/FilterLists.Directory.Api/Dockerfile.migrate @@ -4,7 +4,7 @@ ENTRYPOINT ["dotnet", "test", "--logger:trx"] # restore WORKDIR /app -COPY sharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj sharedKernel/src/FilterLists.SharedKernel.Logging/ +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/ @@ -16,7 +16,7 @@ RUN dotnet restore # build WORKDIR /app -COPY sharedKernel/src/FilterLists.SharedKernel.Logging/. sharedKernel/src/FilterLists.SharedKernel.Logging/ +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/ diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj index 518350b53..bdff05a04 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj +++ b/services/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj @@ -34,7 +34,7 @@ - +