diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7de6c15bb..7f89ebd2d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -31,43 +31,43 @@ updates: time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: docker - directory: "/services/directory/src/FilterLists.Directory.Api" + directory: "/services/Directory/src/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/src/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/src/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/src/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/src/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/src/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/tests/FilterLists.Directory.Infrastructure.Migrations.Tests" schedule: interval: daily time: "11:00" diff --git a/docker-compose.directory.migrations.tests.yml b/docker-compose.directory.migrations.tests.yml index d2b78e96b..254c19cea 100644 --- a/docker-compose.directory.migrations.tests.yml +++ b/docker-compose.directory.migrations.tests.yml @@ -4,7 +4,7 @@ services: directory-migrations-tests: build: context: ./services - dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile.migrate + dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile.migrate target: test-migrations volumes: - directory-migrations-tests-results:/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/TestResults diff --git a/docker-compose.override.yml b/docker-compose.override.yml index b11e8972c..70fa4b626 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -20,7 +20,7 @@ services: directory-api: build: context: ./services - dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile.dev + dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile.dev environment: - ASPNETCORE_ENVIRONMENT=Development diff --git a/docker-compose.prod.build.yml b/docker-compose.prod.build.yml index ab0e20a2b..467eefe84 100644 --- a/docker-compose.prod.build.yml +++ b/docker-compose.prod.build.yml @@ -12,7 +12,7 @@ services: directory-api: build: context: ./services - dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile + dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile web: build: diff --git a/services/.dockerignore b/services/.dockerignore index d53ade355..cf4b41523 100644 --- a/services/.dockerignore +++ b/services/.dockerignore @@ -31,5 +31,5 @@ README.md **/azure-pipelines*.yaml **/*.sln **/*.sln.DotSettings -directory/src/FilterLists.Directory.Api/appsettings.Development.json -directory/data/* \ No newline at end of file +Directory/src/FilterLists.Directory.Api/appsettings.Development.json +Directory/data/* \ No newline at end of file diff --git a/services/directory/azure-pipelines.api.yaml b/services/Directory/azure-pipelines.api.yaml similarity index 69% rename from services/directory/azure-pipelines.api.yaml rename to services/Directory/azure-pipelines.api.yaml index 0edde3f0e..5ba6b24dc 100644 --- a/services/directory/azure-pipelines.api.yaml +++ b/services/Directory/azure-pipelines.api.yaml @@ -5,15 +5,15 @@ trigger: paths: 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/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/*, docker-compose.yml, docker-compose.prod.yml, - .env.directory, + .env, .dockerignore, ] @@ -24,15 +24,15 @@ pr: paths: 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/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/*, docker-compose.yml, docker-compose.prod.yml, - .env.directory, + .env, .dockerignore, ] @@ -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/src/FilterLists.Directory.Api/Dockerfile buildContext: ./services tags: | latest diff --git a/services/directory/azure-pipelines.migrate.yaml b/services/Directory/azure-pipelines.migrate.yaml similarity index 96% rename from services/directory/azure-pipelines.migrate.yaml rename to services/Directory/azure-pipelines.migrate.yaml index 38d07979d..abe032cf7 100644 --- a/services/directory/azure-pipelines.migrate.yaml +++ b/services/Directory/azure-pipelines.migrate.yaml @@ -7,7 +7,7 @@ pr: branches: include: [master] paths: - include: [services/directory/data/*] + include: [services/Directory/data/*] pool: vmImage: ubuntu-latest @@ -47,7 +47,7 @@ steps: displayName: lint json condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), succeeded()) inputs: - scriptPath: services/directory/data/lint.sh + scriptPath: services/Directory/data/lint.sh - task: Bash@3 displayName: git config @@ -67,7 +67,7 @@ steps: condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), succeeded()) inputs: targetType: inline - workingDirectory: services/directory/data + workingDirectory: services/Directory/data script: | DIFF=$(git status -s -- . | wc -l) echo "$DIFF file(s) required linting" @@ -93,7 +93,7 @@ steps: condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), succeeded()) inputs: targetType: inline - workingDirectory: services/directory/src + workingDirectory: services/Directory/src script: | MIGLIST=$(dotnet ef migrations list -p FilterLists.Directory.Infrastructure.Migrations -s FilterLists.Directory.Api) echo "$MIGLIST" @@ -122,7 +122,7 @@ steps: displayName: add migration condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), succeeded()) inputs: - workingDirectory: services/directory/src + workingDirectory: services/Directory/src script: dotnet ef migrations add $(System.PullRequest.PullRequestNumber) -p FilterLists.Directory.Infrastructure.Migrations -s FilterLists.Directory.Api - task: Bash@3 @@ -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/src/FilterLists.Directory.Infrastructure.Migrations script: | DIFF=$(git status -s -- . | wc -l) echo "$DIFF file(s) changed" diff --git a/services/directory/data/Dependent.json b/services/Directory/data/Dependent.json similarity index 100% rename from services/directory/data/Dependent.json rename to services/Directory/data/Dependent.json diff --git a/services/directory/data/FilterList.json b/services/Directory/data/FilterList.json similarity index 100% rename from services/directory/data/FilterList.json rename to services/Directory/data/FilterList.json diff --git a/services/directory/data/FilterListLanguage.json b/services/Directory/data/FilterListLanguage.json similarity index 100% rename from services/directory/data/FilterListLanguage.json rename to services/Directory/data/FilterListLanguage.json diff --git a/services/directory/data/FilterListMaintainer.json b/services/Directory/data/FilterListMaintainer.json similarity index 100% rename from services/directory/data/FilterListMaintainer.json rename to services/Directory/data/FilterListMaintainer.json diff --git a/services/directory/data/FilterListSyntax.json b/services/Directory/data/FilterListSyntax.json similarity index 100% rename from services/directory/data/FilterListSyntax.json rename to services/Directory/data/FilterListSyntax.json diff --git a/services/directory/data/FilterListTag.json b/services/Directory/data/FilterListTag.json similarity index 100% rename from services/directory/data/FilterListTag.json rename to services/Directory/data/FilterListTag.json diff --git a/services/directory/data/FilterListViewUrl.json b/services/Directory/data/FilterListViewUrl.json similarity index 100% rename from services/directory/data/FilterListViewUrl.json rename to services/Directory/data/FilterListViewUrl.json diff --git a/services/directory/data/Fork.json b/services/Directory/data/Fork.json similarity index 100% rename from services/directory/data/Fork.json rename to services/Directory/data/Fork.json diff --git a/services/directory/data/Language.json b/services/Directory/data/Language.json similarity index 100% rename from services/directory/data/Language.json rename to services/Directory/data/Language.json diff --git a/services/directory/data/License.json b/services/Directory/data/License.json similarity index 100% rename from services/directory/data/License.json rename to services/Directory/data/License.json diff --git a/services/directory/data/Maintainer.json b/services/Directory/data/Maintainer.json similarity index 100% rename from services/directory/data/Maintainer.json rename to services/Directory/data/Maintainer.json diff --git a/services/directory/data/Merge.json b/services/Directory/data/Merge.json similarity index 100% rename from services/directory/data/Merge.json rename to services/Directory/data/Merge.json diff --git a/services/directory/data/Software.json b/services/Directory/data/Software.json similarity index 100% rename from services/directory/data/Software.json rename to services/Directory/data/Software.json diff --git a/services/directory/data/SoftwareSyntax.json b/services/Directory/data/SoftwareSyntax.json similarity index 100% rename from services/directory/data/SoftwareSyntax.json rename to services/Directory/data/SoftwareSyntax.json diff --git a/services/directory/data/Syntax.json b/services/Directory/data/Syntax.json similarity index 100% rename from services/directory/data/Syntax.json rename to services/Directory/data/Syntax.json diff --git a/services/directory/data/Tag.json b/services/Directory/data/Tag.json similarity index 100% rename from services/directory/data/Tag.json rename to services/Directory/data/Tag.json diff --git a/services/directory/data/lint.sh b/services/Directory/data/lint.sh similarity index 100% rename from services/directory/data/lint.sh rename to services/Directory/data/lint.sh diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs b/services/Directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs rename to services/Directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs b/services/Directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs rename to services/Directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs b/services/Directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs rename to services/Directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs b/services/Directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs rename to services/Directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs b/services/Directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs rename to services/Directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs b/services/Directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs rename to services/Directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs b/services/Directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs rename to services/Directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/Dockerfile b/services/Directory/src/FilterLists.Directory.Api/Dockerfile new file mode 100644 index 000000000..b2d438fe2 --- /dev/null +++ b/services/Directory/src/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/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 \ No newline at end of file diff --git a/services/Directory/src/FilterLists.Directory.Api/Dockerfile.dev b/services/Directory/src/FilterLists.Directory.Api/Dockerfile.dev new file mode 100644 index 000000000..7300a1153 --- /dev/null +++ b/services/Directory/src/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/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 \ No newline at end of file diff --git a/services/Directory/src/FilterLists.Directory.Api/Dockerfile.migrate b/services/Directory/src/FilterLists.Directory.Api/Dockerfile.migrate new file mode 100644 index 000000000..ec0d31c1d --- /dev/null +++ b/services/Directory/src/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/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 \ No newline at end of file diff --git a/services/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/services/Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj rename to services/Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj diff --git a/services/directory/src/FilterLists.Directory.Api/Program.cs b/services/Directory/src/FilterLists.Directory.Api/Program.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Program.cs rename to services/Directory/src/FilterLists.Directory.Api/Program.cs diff --git a/services/directory/src/FilterLists.Directory.Api/Properties/launchSettings.json b/services/Directory/src/FilterLists.Directory.Api/Properties/launchSettings.json similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Properties/launchSettings.json rename to services/Directory/src/FilterLists.Directory.Api/Properties/launchSettings.json diff --git a/services/directory/src/FilterLists.Directory.Api/Startup.cs b/services/Directory/src/FilterLists.Directory.Api/Startup.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/Startup.cs rename to services/Directory/src/FilterLists.Directory.Api/Startup.cs diff --git a/services/directory/src/FilterLists.Directory.Api/SwaggerExtensions.cs b/services/Directory/src/FilterLists.Directory.Api/SwaggerExtensions.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/SwaggerExtensions.cs rename to services/Directory/src/FilterLists.Directory.Api/SwaggerExtensions.cs diff --git a/services/directory/src/FilterLists.Directory.Api/appsettings.Development.json b/services/Directory/src/FilterLists.Directory.Api/appsettings.Development.json similarity index 100% rename from services/directory/src/FilterLists.Directory.Api/appsettings.Development.json rename to services/Directory/src/FilterLists.Directory.Api/appsettings.Development.json diff --git a/services/directory/src/FilterLists.Directory.Application/ConfigurationExtensions.cs b/services/Directory/src/FilterLists.Directory.Application/ConfigurationExtensions.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/ConfigurationExtensions.cs rename to services/Directory/src/FilterLists.Directory.Application/ConfigurationExtensions.cs diff --git a/services/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj rename to services/Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs rename to services/Directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs rename to services/Directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs rename to services/Directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/src/FilterLists.Directory.Application/Queries/GetLists.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/Queries/GetLists.cs rename to services/Directory/src/FilterLists.Directory.Application/Queries/GetLists.cs diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/src/FilterLists.Directory.Application/Queries/GetMaintainers.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/Queries/GetMaintainers.cs rename to services/Directory/src/FilterLists.Directory.Application/Queries/GetMaintainers.cs diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/src/FilterLists.Directory.Application/Queries/GetSoftware.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/Queries/GetSoftware.cs rename to services/Directory/src/FilterLists.Directory.Application/Queries/GetSoftware.cs diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs rename to services/Directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/src/FilterLists.Directory.Application/Queries/GetTags.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Application/Queries/GetTags.cs rename to services/Directory/src/FilterLists.Directory.Application/Queries/GetTags.cs diff --git a/services/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/services/Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj similarity index 100% rename from services/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj rename to services/Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs b/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj rename to services/Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs b/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs similarity index 100% rename from services/directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs rename to services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs diff --git a/services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj b/services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj similarity index 100% rename from services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj rename to services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj diff --git a/services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs b/services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs similarity index 100% rename from services/directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs rename to services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs diff --git a/services/FilterLists.sln b/services/FilterLists.sln index 1b42ba8fd..e76da869a 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -3,21 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30413.136 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}" +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\azure-pipelines.api.yaml = directory\azure-pipelines.api.yaml - directory\azure-pipelines.migrate.yaml = directory\azure-pipelines.migrate.yaml + Directory\azure-pipelines.api.yaml = Directory\azure-pipelines.api.yaml + Directory\azure-pipelines.migrate.yaml = Directory\azure-pipelines.migrate.yaml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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("{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}" +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 @@ -30,25 +30,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{8F419098-3EEB-4B4B-99A8-70555FA93DAF}" ProjectSection(SolutionItems) = preProject - directory\data\Dependent.json = directory\data\Dependent.json - directory\data\FilterList.json = directory\data\FilterList.json - directory\data\FilterListLanguage.json = directory\data\FilterListLanguage.json - directory\data\FilterListMaintainer.json = directory\data\FilterListMaintainer.json - directory\data\FilterListSyntax.json = directory\data\FilterListSyntax.json - directory\data\FilterListTag.json = directory\data\FilterListTag.json - directory\data\FilterListViewUrl.json = directory\data\FilterListViewUrl.json - directory\data\Fork.json = directory\data\Fork.json - directory\data\Language.json = directory\data\Language.json - directory\data\License.json = directory\data\License.json - directory\data\Maintainer.json = directory\data\Maintainer.json - directory\data\Merge.json = directory\data\Merge.json - directory\data\Software.json = directory\data\Software.json - directory\data\SoftwareSyntax.json = directory\data\SoftwareSyntax.json - directory\data\Syntax.json = directory\data\Syntax.json - directory\data\Tag.json = directory\data\Tag.json + Directory\data\Dependent.json = Directory\data\Dependent.json + Directory\data\FilterList.json = Directory\data\FilterList.json + Directory\data\FilterListLanguage.json = Directory\data\FilterListLanguage.json + Directory\data\FilterListMaintainer.json = Directory\data\FilterListMaintainer.json + Directory\data\FilterListSyntax.json = Directory\data\FilterListSyntax.json + Directory\data\FilterListTag.json = Directory\data\FilterListTag.json + Directory\data\FilterListViewUrl.json = Directory\data\FilterListViewUrl.json + Directory\data\Fork.json = Directory\data\Fork.json + Directory\data\Language.json = Directory\data\Language.json + Directory\data\License.json = Directory\data\License.json + Directory\data\Maintainer.json = Directory\data\Maintainer.json + Directory\data\Merge.json = Directory\data\Merge.json + Directory\data\Software.json = Directory\data\Software.json + Directory\data\SoftwareSyntax.json = Directory\data\SoftwareSyntax.json + Directory\data\Syntax.json = Directory\data\Syntax.json + 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\tests\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 diff --git a/services/directory/src/FilterLists.Directory.Api/Dockerfile b/services/directory/src/FilterLists.Directory.Api/Dockerfile deleted file mode 100644 index 35ac8e72f..000000000 --- a/services/directory/src/FilterLists.Directory.Api/Dockerfile +++ /dev/null @@ -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 \ No newline at end of file diff --git a/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev b/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev deleted file mode 100644 index 60b009f6a..000000000 --- a/services/directory/src/FilterLists.Directory.Api/Dockerfile.dev +++ /dev/null @@ -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 \ No newline at end of file diff --git a/services/directory/src/FilterLists.Directory.Api/Dockerfile.migrate b/services/directory/src/FilterLists.Directory.Api/Dockerfile.migrate deleted file mode 100644 index c0b3eebc7..000000000 --- a/services/directory/src/FilterLists.Directory.Api/Dockerfile.migrate +++ /dev/null @@ -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 \ No newline at end of file