From 1536569edaa37e280b5cc3e16d1f8e66507d57b4 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Fri, 13 Nov 2020 18:00:50 -0600 Subject: [PATCH] =?UTF-8?q?feat(services):=20=E2=9C=A8=20upgrade=20to=20ne?= =?UTF-8?q?t5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FilterLists.Archival.Api/Dockerfile | 4 +- .../FilterLists.Archival.Api.csproj | 2 +- .../FilterLists.Archival.Api/dev.Dockerfile | 4 +- .../FilterLists.Archival.Application.csproj | 2 +- .../FilterLists.Archival.Domain.csproj | 2 +- ...FilterLists.Archival.Infrastructure.csproj | 2 +- ...FilterLists.Directory.Api.Contracts.csproj | 4 +- .../FilterLists.Directory.Api/Dockerfile | 4 +- .../FilterLists.Directory.Api.csproj | 2 +- .../FilterLists.Directory.Api/dev.Dockerfile | 4 +- .../FilterLists.Directory.Application.csproj | 54 +++++++++---------- ...ory.Infrastructure.Migrations.Tests.csproj | 2 +- ...Directory.Infrastructure.Migrations.csproj | 2 +- ...ilterLists.Directory.Infrastructure.csproj | 2 +- .../FilterLists.SharedKernel.Logging.csproj | 2 +- 15 files changed, 47 insertions(+), 45 deletions(-) diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile index 15007a13e..e2affd697 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/core/runtime-deps:3.1-alpine3.12 AS base +FROM mcr.microsoft.com/dotnet/runtime-deps:5.0-alpine3.12 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/core/sdk:3.1-alpine3.12 AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine3.12 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 023e804ab..fa8b9b402 100644 --- a/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj +++ b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 latest enable true diff --git a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile index d8b3fb79c..c51310565 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/core/aspnet:3.1-alpine3.12 AS base +FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine3.12 AS base WORKDIR /app # init build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine3.12 AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine3.12 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 04856248a..20ed5481f 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 @@  - netstandard2.1 + net5.0 latest enable diff --git a/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj b/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj index 0ef4da6e7..d02ed4cc7 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 @@ - netstandard2.1 + net5.0 latest enable diff --git a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj index 3fe070f66..63626c434 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 @@  - netstandard2.1 + net5.0 latest 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 023c9f276..100fff449 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 @@ - netstandard2.1 + net5.0 latest enable @@ -21,6 +21,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile b/services/Directory/FilterLists.Directory.Api/Dockerfile index 8d885b5ff..aa4fe1140 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/core/runtime-deps:3.1-alpine AS base +FROM mcr.microsoft.com/dotnet/runtime-deps:5.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/core/sdk:3.1-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:5.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 bd7fbdbbd..8a453fe55 100644 --- a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj +++ b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 latest enable true diff --git a/services/Directory/FilterLists.Directory.Api/dev.Dockerfile b/services/Directory/FilterLists.Directory.Api/dev.Dockerfile index 784b2dda4..ee75a0097 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/core/aspnet:3.1-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine AS base WORKDIR /app EXPOSE 80 # init build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS build ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API diff --git a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj index a0ba8652c..3eba7a400 100644 --- a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj +++ b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj @@ -1,33 +1,33 @@  - - netstandard2.1 - latest - enable - + + net5.0 + 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 + - - - - - 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 d5461694f..c7def2510 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 @@  - netcoreapp3.1 + net5.0 latest 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 d2e8d0fb4..9e51aff12 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 @@  - netstandard2.1 + net5.0 latest enable diff --git a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj index 954c56797..90253bb90 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 @@  - netstandard2.1 + net5.0 latest enable diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj b/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj index 43f0e0f96..621d62233 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 @@  - netstandard2.1 + net5.0 latest enable