feat(services): ✨ upgrade to net5.0

2026-03-11 09:04:27 +00:00 · 2020-11-13 18:00:50 -06:00 · 2020-11-13 18:00:50 -06:00 · 1536569eda
commit 1536569eda
parent ca7da85cfe
15 changed files with 47 additions and 45 deletions
--- 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
--- a/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj
+++ b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
--- 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
--- a/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj
+++ b/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>
--- a/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj
+++ b/services/Archival/FilterLists.Archival.Domain/FilterLists.Archival.Domain.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>
--- a/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj
+++ b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>
--- 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 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>
@ -21,6 +21,8 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.9" />
        <PackageReference Include="Refit.HttpClientFactory" Version="5.2.1" />
    </ItemGroup>
--- 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
--- a/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
+++ b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
--- 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
--- a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
+++ b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj
@ -1,33 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>

-  <PropertyGroup>
-    <Authors>Collin M. Barrett</Authors>
-    <Company>FilterLists</Company>
-    <Product>FilterLists Directory</Product>
-    <Description>The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</Description>
-    <Copyright>Copyright (c) 2020 Collin M. Barrett</Copyright>
-    <RepositoryUrl>https://github.com/collinbarrett/FilterLists</RepositoryUrl>
-    <PackageProjectUrl>https://filterlists.com</PackageProjectUrl>
-  </PropertyGroup>
+    <PropertyGroup>
+        <Authors>Collin M. Barrett</Authors>
+        <Company>FilterLists</Company>
+        <Product>FilterLists Directory</Product>
+        <Description>The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</Description>
+        <Copyright>Copyright (c) 2020 Collin M. Barrett</Copyright>
+        <RepositoryUrl>https://github.com/collinbarrett/FilterLists</RepositoryUrl>
+        <PackageProjectUrl>https://filterlists.com</PackageProjectUrl>
+    </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
+        <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\FilterLists.Directory.Api.Contracts\FilterLists.Directory.Api.Contracts.csproj" />
-    <ProjectReference Include="..\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\FilterLists.Directory.Api.Contracts\FilterLists.Directory.Api.Contracts.csproj" />
+        <ProjectReference Include="..\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj" />
+    </ItemGroup>

-</Project>
+</Project>
--- 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 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
        <IsPackable>false</IsPackable>
--- 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 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>
--- a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
+++ b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>
--- a/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj
+++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>