From 90459a64117c4faeec3f28ce7077b693c1b0425f Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 24 Aug 2020 18:31:16 -0500 Subject: [PATCH] refactor: add refs to some files in VS sln --- FilterLists.sln | 16 ++++++++++++---- .../src/FilterLists.Directory.Api/Dockerfile | 8 ++++---- docker-compose.dcproj | 1 + 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/FilterLists.sln b/FilterLists.sln index a8043deab..bf6361602 100644 --- a/FilterLists.sln +++ b/FilterLists.sln @@ -6,17 +6,25 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api", "directory\src\FilterLists.Directory.Api\FilterLists.Directory.Api.csproj", "{FE50F471-7DC0-44AB-8DAB-2909E3207FF9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Directory", "Directory", "{AE5D6471-1B6E-4B06-A313-34EF81F35342}" + ProjectSection(SolutionItems) = preProject + directory\.dockerignore = directory\.dockerignore + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Directory.Domain", "directory\src\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "directory\src\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Directory.Application", "directory\src\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Application", "directory\src\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Directory.Infrastructure", "directory\src\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj", "{74C798F8-892A-40F2-8D2E-395E83853771}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure", "directory\src\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj", "{74C798F8-892A-40F2-8D2E-395E83853771}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Directory.Infrastructure.Migrations", "directory\src\FilterLists.Directory.Infrastructure.Migrations\FilterLists.Directory.Infrastructure.Migrations.csproj", "{4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations", "directory\src\FilterLists.Directory.Infrastructure.Migrations\FilterLists.Directory.Infrastructure.Migrations.csproj", "{4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E}" EndProject Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{8F04C802-830B-4B6D-8D53-5D2A87B4223D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A534ED99-43A6-4CD2-9288-BD35F82F4E88}" + ProjectSection(SolutionItems) = preProject + FilterLists.sln.DotSettings = FilterLists.sln.DotSettings + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/directory/src/FilterLists.Directory.Api/Dockerfile b/directory/src/FilterLists.Directory.Api/Dockerfile index 483ec382f..09fd32357 100644 --- a/directory/src/FilterLists.Directory.Api/Dockerfile +++ b/directory/src/FilterLists.Directory.Api/Dockerfile @@ -10,9 +10,9 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine AS build # restore WORKDIR /src COPY src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj FilterLists.Directory.Domain/ -COPY src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj FilterLists.Directory.Application/ -COPY src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj FilterLists.Directory.Infrastructure.Migrations/ COPY src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj FilterLists.Directory.Infrastructure/ +COPY src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj FilterLists.Directory.Infrastructure.Migrations/ +COPY src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj FilterLists.Directory.Application/ WORKDIR /src/FilterLists.Directory.Api COPY src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj . RUN dotnet restore @@ -20,9 +20,9 @@ RUN dotnet restore # build WORKDIR /src COPY src/FilterLists.Directory.Domain/. FilterLists.Directory.Domain/ -COPY src/FilterLists.Directory.Application/. FilterLists.Directory.Application/ -COPY src/FilterLists.Directory.Infrastructure.Migrations/. FilterLists.Directory.Infrastructure.Migrations/ COPY src/FilterLists.Directory.Infrastructure/. FilterLists.Directory.Infrastructure/ +COPY src/FilterLists.Directory.Infrastructure.Migrations/. FilterLists.Directory.Infrastructure.Migrations/ +COPY src/FilterLists.Directory.Application/. FilterLists.Directory.Application/ WORKDIR /src/FilterLists.Directory.Api COPY src/FilterLists.Directory.Api/. . RUN dotnet publish --no-restore -c Release -o /app/publish -r linux-musl-x64 -p:PublishSingleFile=true diff --git a/docker-compose.dcproj b/docker-compose.dcproj index 90aabd79b..acb38fd1e 100644 --- a/docker-compose.dcproj +++ b/docker-compose.dcproj @@ -9,6 +9,7 @@ filterlists.directory.api + docker-compose.yml