From d14033573249d9588b5b8bd17172bb6354a0db05 Mon Sep 17 00:00:00 2001 From: Alex Pop - Zengenti Date: Tue, 1 Oct 2024 09:52:09 +0100 Subject: [PATCH] feat: targeting .net 8 and upgraded all packages (#3) * feat: targeting .net 8 and upgraded all packages * chore removed orphan references --- Dockerfile.localdevelopment.unit.specs | 4 ++-- global.json | 7 +++++++ .../Application.csproj | 3 ++- .../Domain.csproj | 15 +++------------ .../LocalDevelopment.csproj | 5 +++-- .../UriTypeConverter.cs | 5 ++--- .../LocalDevelopment.Unit.Specs.csproj | 16 ++++++++-------- 7 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 global.json diff --git a/Dockerfile.localdevelopment.unit.specs b/Dockerfile.localdevelopment.unit.specs index a94d162..e2e5d7f 100644 --- a/Dockerfile.localdevelopment.unit.specs +++ b/Dockerfile.localdevelopment.unit.specs @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS base +FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS base WORKDIR /app EXPOSE 5000 -FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build WORKDIR /src COPY ["src/Zengenti.Contensis.RequestHandler.Domain/", "src/Zengenti.Contensis.RequestHandler.Domain/"] diff --git a/global.json b/global.json new file mode 100644 index 0000000..dad2db5 --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "8.0.0", + "rollForward": "latestMajor", + "allowPrerelease": true + } +} \ No newline at end of file diff --git a/src/Zengenti.Contensis.RequestHandler.Application/Application.csproj b/src/Zengenti.Contensis.RequestHandler.Application/Application.csproj index 82ca566..49723fa 100644 --- a/src/Zengenti.Contensis.RequestHandler.Application/Application.csproj +++ b/src/Zengenti.Contensis.RequestHandler.Application/Application.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable Zengenti.Contensis.RequestHandler.Application @@ -10,6 +10,7 @@ Zengenti.Contensis.RequestHandler.Application Zengenti Ltd Library + 12 diff --git a/src/Zengenti.Contensis.RequestHandler.Domain/Domain.csproj b/src/Zengenti.Contensis.RequestHandler.Domain/Domain.csproj index c83834d..1ffd3a1 100644 --- a/src/Zengenti.Contensis.RequestHandler.Domain/Domain.csproj +++ b/src/Zengenti.Contensis.RequestHandler.Domain/Domain.csproj @@ -1,26 +1,17 @@ - net6.0 + net8.0 enable enable Zengenti.Contensis.RequestHandler.Domain Zengenti.Contensis.RequestHandler.Domain Library + 12 - - - - - - ..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\6.0.16\Microsoft.AspNetCore.Http.Abstractions.dll - - - ..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\6.0.16\Microsoft.AspNetCore.Http.Features.dll - - + diff --git a/src/Zengenti.Contensis.RequestHandler.LocalDevelopment/LocalDevelopment.csproj b/src/Zengenti.Contensis.RequestHandler.LocalDevelopment/LocalDevelopment.csproj index f7b2c52..7cc8290 100644 --- a/src/Zengenti.Contensis.RequestHandler.LocalDevelopment/LocalDevelopment.csproj +++ b/src/Zengenti.Contensis.RequestHandler.LocalDevelopment/LocalDevelopment.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable Zengenti.Contensis.RequestHandler.LocalDevelopment @@ -9,6 +9,7 @@ Exe Zengenti.Contensis.RequestHandler.LocalDevelopment Zengenti + 12 @@ -19,7 +20,7 @@ - + diff --git a/src/Zengenti.Contensis.RequestHandler.LocalDevelopment/UriTypeConverter.cs b/src/Zengenti.Contensis.RequestHandler.LocalDevelopment/UriTypeConverter.cs index 15dcdbc..1d28581 100644 --- a/src/Zengenti.Contensis.RequestHandler.LocalDevelopment/UriTypeConverter.cs +++ b/src/Zengenti.Contensis.RequestHandler.LocalDevelopment/UriTypeConverter.cs @@ -13,14 +13,13 @@ public bool Accepts(Type type) return type == UriType; } - // ReSharper disable once ReturnTypeCanBeNotNullable - public object? ReadYaml(IParser parser, Type type) + public object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) { var uri = parser.Consume(); return new Uri(uri.Value); } - public void WriteYaml(IEmitter emitter, object? value, Type type) + public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer) { // NOTE: Not needed for us, but leaving this as an example //var uri = (Uri)value; diff --git a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/LocalDevelopment.Unit.Specs.csproj b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/LocalDevelopment.Unit.Specs.csproj index b883dcf..64a6391 100644 --- a/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/LocalDevelopment.Unit.Specs.csproj +++ b/tests/Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs/LocalDevelopment.Unit.Specs.csproj @@ -1,24 +1,24 @@  - net6.0 - 10 + net8.0 + 12 true Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - +