diff --git a/services/.editorconfig b/services/.editorconfig new file mode 100644 index 000000000..6071d7b7f --- /dev/null +++ b/services/.editorconfig @@ -0,0 +1,9 @@ +# To learn more about .editorconfig see https://aka.ms/editorconfigdocs + +# All files +[*] +indent_style = space + +# Xml files +[*.xml] +indent_size = 2 diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile index f36aa4e90..407ea0231 100644 --- a/services/Archival/FilterLists.Archival.Api/Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile @@ -27,7 +27,7 @@ COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archiva COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/ WORKDIR /app/Archival/FilterLists.Archival.Api COPY Archival/FilterLists.Archival.Api/. . -RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 +RUN dotnet publish -c Release --no-restore -o /app/publish -p:TreatWarningsAsErrors=true -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 # package final FROM base AS final diff --git a/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj index 3aae5272c..f52fa24f1 100644 --- a/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj +++ b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj @@ -1,41 +1,33 @@  - - netcoreapp3.1 - latest - enable - true - linux-musl-x64;win10-x64 - + + netcoreapp3.1 + latest + enable + true + linux-musl-x64;win10-x64 + - - Collin M. Barrett - FilterLists - FilterLists Archival - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Archival + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CA2007 - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - CA2007 - + + + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - + \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Api/Startup.cs b/services/Archival/FilterLists.Archival.Api/Startup.cs index e96a09196..5b77d8c1d 100644 --- a/services/Archival/FilterLists.Archival.Api/Startup.cs +++ b/services/Archival/FilterLists.Archival.Api/Startup.cs @@ -7,9 +7,7 @@ namespace FilterLists.Archival.Api { -#pragma warning disable CA1812 internal class Startup -#pragma warning disable CA1812 { public Startup(IConfiguration configuration) { diff --git a/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj b/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj index c730ec1ab..ac6281922 100644 --- a/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj +++ b/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj @@ -1,39 +1,31 @@  - - netstandard2.1 - latest - enable - + + netstandard2.1 + latest + enable + - - Collin M. Barrett - FilterLists - FilterLists Archival - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Archival + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CA2007 - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - CA2007 - + + + - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj index 817b1e2c7..b232ae6d8 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj +++ b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj @@ -1,42 +1,36 @@  - - netstandard2.1 - latest - enable - + + netstandard2.1 + latest + enable + - - Collin M. Barrett - FilterLists - FilterLists Archival - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Archival + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CA2007 - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - CA2007 - + + + + - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - + \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs index bd21d4437..beccb7a72 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs +++ b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs @@ -10,9 +10,7 @@ namespace FilterLists.Archival.Infrastructure.Persistence { -#pragma warning disable CA1812 internal class GitFileArchiver : IArchiveFiles -#pragma warning restore CA1812 { private readonly IList _filePaths = new List(); private readonly ILogger _logger; diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile b/services/Directory/FilterLists.Directory.Api/Dockerfile index 2be9a12a9..4b7322607 100644 --- a/services/Directory/FilterLists.Directory.Api/Dockerfile +++ b/services/Directory/FilterLists.Directory.Api/Dockerfile @@ -30,7 +30,7 @@ COPY Directory/FilterLists.Directory.Infrastructure.Migrations/. Directory/Filte COPY Directory/FilterLists.Directory.Application/. Directory/FilterLists.Directory.Application/ WORKDIR /app/Directory/FilterLists.Directory.Api COPY Directory/FilterLists.Directory.Api/. . -RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 +RUN dotnet publish -c Release --no-restore -o /app/publish -p:TreatWarningsAsErrors=true -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 # package final FROM base AS final diff --git a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj index 97e29fe79..d2963a74b 100644 --- a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj +++ b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj @@ -1,47 +1,40 @@  - - netcoreapp3.1 - latest - enable - true - linux-musl-x64;win10-x64 - + + netcoreapp3.1 + latest + enable + true + linux-musl-x64;win10-x64 + - - Collin M. Barrett - FilterLists - FilterLists Directory - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Directory + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CA1812;CA2007 - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + - - CA1812;CA2007 - + + + + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - + \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj index e6906ba3f..366946511 100644 --- a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj +++ b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj @@ -16,14 +16,6 @@ https://filterlists.com - - 1701;1702;CA1034;CA1724;CA1812;CA2007 - - - - CA1034;CA1724;CA1812;CA2007 - - diff --git a/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj index 0f1819418..bdba735a4 100644 --- a/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj +++ b/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj @@ -1,34 +1,26 @@  - - netstandard2.1 - latest - enable - + + netstandard2.1 + latest + enable + - - Collin M. Barrett - FilterLists - FilterLists Directory - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Directory + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CA1812;CA2007 - - - - CA1812;CA2007 - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + \ No newline at end of file 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 5d1fde6c6..c2045e5d0 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,47 +1,40 @@  - - netcoreapp3.1 - latest - enable - false - linux-musl-x64;win10-x64 - + + netcoreapp3.1 + latest + enable + false + linux-musl-x64;win10-x64 + - - Collin M. Barrett - FilterLists - FilterLists Directory - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Directory + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - CA1707;CA2007 - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - CA1707;CA2007 - + + + + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - + \ No newline at end of file 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 85a9832cc..d2e8d0fb4 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,35 +1,27 @@  - - netstandard2.1 - latest - enable - + + netstandard2.1 + latest + enable + - - Collin M. Barrett - FilterLists - FilterLists Directory - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Directory + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CS8625 - + + + - - CS8625 - - - - - - - - - + + + \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj index b80b23a6d..995f2cd73 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj @@ -1,42 +1,36 @@  - - netstandard2.1 - latest - enable - + + netstandard2.1 + latest + enable + - - Collin M. Barrett - FilterLists - FilterLists Directory - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Directory + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CA1812;CA2007 - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + - - CA1812;CA2007 - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/services/FilterLists.sln b/services/FilterLists.sln index 75ef2f749..e08386a15 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -24,6 +24,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A534ED99-43A6-4CD2-9288-BD35F82F4E88}" ProjectSection(SolutionItems) = preProject .dockerignore = .dockerignore + .editorconfig = .editorconfig ..\.github\dependabot.yml = ..\.github\dependabot.yml FilterLists.sln.DotSettings = FilterLists.sln.DotSettings EndProjectSection @@ -62,7 +63,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedKernel", "SharedKerne EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Logging", "SharedKernel\FilterLists.SharedKernel.Logging\FilterLists.SharedKernel.Logging.csproj", "{5485F55E-DFED-4DA0-8A00-220B081FAC96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.SharedKernel.Apis.Contracts", "SharedKernel\FilterLists.SharedKernel.Apis.Contracts\FilterLists.SharedKernel.Apis.Contracts.csproj", "{D8B65709-B68E-42D6-8500-68EE309177D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Apis.Contracts", "SharedKernel\FilterLists.SharedKernel.Apis.Contracts\FilterLists.SharedKernel.Apis.Contracts.csproj", "{D8B65709-B68E-42D6-8500-68EE309177D5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.SharedKernel.Apis.Clients", "SharedKernel\FilterLists.SharedKernel.Apis.Clients\FilterLists.SharedKernel.Apis.Clients.csproj", "{FF6F3D83-A96C-412C-BAFF-63BA89ADD31F}" EndProject diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj b/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj index 99527e959..6beab0215 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj +++ b/services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/FilterLists.SharedKernel.Apis.Clients.csproj @@ -1,40 +1,33 @@ - - netstandard2.1 - latest - enable - + + netstandard2.1 + latest + enable + - - Collin M. Barrett - FilterLists - FilterLists Shared Kernel API Clients - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Shared Kernel API Clients + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CA2007 - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + - - CA2007 - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + \ No newline at end of file diff --git a/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj b/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj index 1eb6e1ec3..df25b3bc7 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj +++ b/services/SharedKernel/FilterLists.SharedKernel.Apis.Contracts/FilterLists.SharedKernel.Apis.Contracts.csproj @@ -1,30 +1,26 @@ - - netstandard2.1 - latest - enable - + + netstandard2.1 + latest + enable + - - Collin M. Barrett - FilterLists - FilterLists Shared Kernel API Contracts - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Shared Kernel API Contracts + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702 - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + \ No newline at end of file diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj b/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj index 764138e46..2bb27adb3 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj +++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj @@ -1,37 +1,29 @@ - - netstandard2.1 - latest - enable - + + netstandard2.1 + latest + enable + - - Collin M. Barrett - FilterLists - FilterLists Shared Kernel Logging - The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. - Copyright (c) 2020 Collin M. Barrett - https://github.com/collinbarrett/FilterLists - https://filterlists.com - + + Collin M. Barrett + FilterLists + FilterLists Shared Kernel Logging + The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + Copyright (c) 2020 Collin M. Barrett + https://github.com/collinbarrett/FilterLists + https://filterlists.com + - - 1701;1702;CA2007 - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + - - CA2007 - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + \ No newline at end of file diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs index 3493d0016..d50e5f60c 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs +++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs @@ -29,9 +29,7 @@ public static async Task TryRunWithLoggingAsync(this IHost host, Func await host.RunAsync(); return 0; } -#pragma warning disable CA1031 catch (Exception ex) -#pragma warning restore CA1031 { Log.Fatal(ex, "Host terminated unexpectedly"); return 1;