Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: targeting .net 8 and upgraded all packages #3

Merged
merged 5 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.localdevelopment.unit.specs
Original file line number Diff line number Diff line change
@@ -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/"]
Expand Down
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "8.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Zengenti.Contensis.RequestHandler.Application</RootNamespace>
Expand All @@ -10,6 +10,7 @@
<PackageId>Zengenti.Contensis.RequestHandler.Application</PackageId>
<Company>Zengenti Ltd</Company>
<OutputType>Library</OutputType>
<LangVersion>12</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
15 changes: 3 additions & 12 deletions src/Zengenti.Contensis.RequestHandler.Domain/Domain.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Zengenti.Contensis.RequestHandler.Domain</RootNamespace>
<AssemblyName>Zengenti.Contensis.RequestHandler.Domain</AssemblyName>
<OutputType>Library</OutputType>
<LangVersion>12</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Zengenti.Core" Version="6.3.2" />
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Http.Abstractions">
<HintPath>..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\6.0.16\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.Http.Features">
<HintPath>..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\6.0.16\Microsoft.AspNetCore.Http.Features.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Primitives" />
<PackageReference Include="Zengenti.Core" Version="7.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Zengenti.Contensis.RequestHandler.LocalDevelopment</RootNamespace>
<AssemblyName>Zengenti.Contensis.RequestHandler.LocalDevelopment</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>Zengenti.Contensis.RequestHandler.LocalDevelopment</PackageId>
<Authors>Zengenti</Authors>
<LangVersion>12</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -19,7 +20,7 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
<PackageReference Include="YamlDotNet" Version="13.1.1" />
<PackageReference Include="YamlDotNet" Version="16.1.2" />
<PackageReference Include="Zengenti.Contensis.Delivery" Version="16.0.2" />
<PackageReference Include="Zengenti.Contensis.Management" Version="16.0.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Scalar>();
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>10</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<ImplicitUsings>true</ImplicitUsings>
<RootNamespace>Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs</RootNamespace>
<AssemblyName>Zengenti.Contensis.RequestHandler.LocalDevelopment.Unit.Specs</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="nunit" Version="4.2.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
<PackageReference Include="Verify.NUnit" Version="22.1.1" />
<PackageReference Include="Verify.NUnit" Version="26.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading