diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..496ee2ca6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store \ No newline at end of file diff --git a/services/.gitignore b/services/.gitignore index 1ee53850b..0bdc52e71 100644 --- a/services/.gitignore +++ b/services/.gitignore @@ -1,7 +1,7 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files *.rsuser @@ -90,6 +90,7 @@ StyleCopReport.xml *.tmp_proj *_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds @@ -293,6 +294,17 @@ node_modules/ # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) *.vbw +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -349,6 +361,9 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ +# Visual Studio History (VSHistory) files +.vshistory/ + # BeatPulse healthcheck temp database healthchecksdb @@ -360,3 +375,25 @@ MigrationBackup/ # Fody - auto-generated XML schema FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml +.idea/ \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile index 5ca86590f..d0f8aa68c 100644 --- a/services/Archival/FilterLists.Archival.Api/Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile @@ -1,11 +1,11 @@ # init base -FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-alpine AS base +FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine AS base LABEL org.opencontainers.image.description="filterlists.com | github.com/collinbarrett/filterlists | An ASP.NET Core API archiving and serving copies of FilterLists for mirrors and analysis." WORKDIR /app EXPOSE 80 # init build -FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API diff --git a/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj index d9b4fef6d..ab9ecccb6 100644 --- a/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj +++ b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable enable true diff --git a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile index ff59bea31..6fa514fd7 100644 --- a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile @@ -1,9 +1,9 @@ # init base for Visual Studio debugging -FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base WORKDIR /app # init build -FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API diff --git a/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj b/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj index 2193488b4..9c1c6fd9e 100644 --- a/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj +++ b/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable true diff --git a/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj b/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj index 26c8c1ea1..578784d36 100644 --- a/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj +++ b/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable diff --git a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj index 1bece02b8..f0bef1e80 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj +++ b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj b/services/Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj index 8c852807f..540186e58 100644 --- a/services/Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj +++ b/services/Directory/FilterLists.Directory.Api.Contracts/FilterLists.Directory.Api.Contracts.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable true @@ -18,8 +18,8 @@ - - + + diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile b/services/Directory/FilterLists.Directory.Api/Dockerfile index 7184fb458..8a9d8aa7a 100644 --- a/services/Directory/FilterLists.Directory.Api/Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/Dockerfile @@ -1,11 +1,11 @@ # init base -FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-alpine AS base +FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine AS base LABEL org.opencontainers.image.description="filterlists.com | github.com/collinbarrett/filterlists | An ASP.NET Core API serving the core FilterList information." WORKDIR /app EXPOSE 80 # init build -FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API diff --git a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj index ad01f13a3..96a711dec 100644 --- a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj +++ b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable enable true @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/services/Directory/FilterLists.Directory.Api/ProblemDetailsConfigurationExtensions.cs b/services/Directory/FilterLists.Directory.Api/ProblemDetailsConfigurationExtensions.cs index 427447d6d..66896c4b3 100644 --- a/services/Directory/FilterLists.Directory.Api/ProblemDetailsConfigurationExtensions.cs +++ b/services/Directory/FilterLists.Directory.Api/ProblemDetailsConfigurationExtensions.cs @@ -1,5 +1,6 @@ using FluentValidation; using Hellang.Middleware.ProblemDetails; +using ProblemDetailsOptions = Hellang.Middleware.ProblemDetails.ProblemDetailsOptions; namespace FilterLists.Directory.Api; @@ -15,15 +16,17 @@ public static void ConfigureProblemDetails(this ProblemDetailsOptions options) private static void MapFluentValidationException(this ProblemDetailsOptions options) { - options.Map((ctx, ex) => - { - var factory = ctx.RequestServices.GetRequiredService(); - var errors = ex.Errors - .GroupBy(f => f.PropertyName) - .ToDictionary( - g => g.Key, - g => g.Select(f => f.ErrorMessage).ToArray()); - return factory.CreateValidationProblemDetails(ctx, errors); - }); + options.Map( + (ctx, ex) => + { + var factory = ctx.RequestServices.GetRequiredService(); + var errors = ex.Errors + .GroupBy(f => f.PropertyName) + .ToDictionary( + g => g.Key, + g => g.Select(f => f.ErrorMessage) + .ToArray()); + return factory.CreateValidationProblemDetails(ctx, errors); + }); } } diff --git a/services/Directory/FilterLists.Directory.Api/dev.Dockerfile b/services/Directory/FilterLists.Directory.Api/dev.Dockerfile index 3d69fad87..1355e9001 100644 --- a/services/Directory/FilterLists.Directory.Api/dev.Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/dev.Dockerfile @@ -1,10 +1,10 @@ # init base for Visual Studio debugging -FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base WORKDIR /app EXPOSE 80 # init build -FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API diff --git a/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile b/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile index 550e57473..8acd42b07 100644 --- a/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/migrate.Dockerfile @@ -1,5 +1,5 @@ # init test-migrations -FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS test-migrations +FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS test-migrations ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENTRYPOINT ["dotnet", "test", "--logger:trx"] diff --git a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj index 5531b3a82..d59c9d842 100644 --- a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj +++ b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable true diff --git a/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj index 4ecde6273..a11f12b13 100644 --- a/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj +++ b/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj b/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj index f5b2de61e..0f8602d26 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable false diff --git a/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj index 778430e0c..b760679ab 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable diff --git a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj index 68de8cae7..42542f599 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable @@ -17,10 +17,10 @@ - - - - + + + + diff --git a/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj b/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj index e3f337746..268efcda7 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj +++ b/services/SharedKernel/FilterLists.SharedKernel.Domain.SeedWork/FilterLists.SharedKernel.Domain.SeedWork.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj b/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj index 731015151..06f57598d 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj +++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable diff --git a/services/global.json b/services/global.json index 126149e6b..e23437b7b 100644 --- a/services/global.json +++ b/services/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.100", + "version": "7.0.100", "rollForward": "latestMajor" } }