Skip to content

Commit

Permalink
feat: upgrade project Fitnet.Common to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
@kamilbaczek
kamilbaczek committed Nov 25, 2023
1 parent 3cd27dd commit abe831b
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 50 deletions.
4 changes: 2 additions & 2 deletions Chapter-3-microservice-extraction/Fitnet.Common/Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>EvolutionaryArchitecture.$(MSBuildProjectName)</AssemblyName>
<RootNamespace>$(AssemblyName)</RootNamespace>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AnalysisLevel>latest</AnalysisLevel>
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -12,7 +12,7 @@
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RepositoryUrl>https://github.com/evolutionary-architecture/evolutionary-architecture-by-example</RepositoryUrl>
<Version>1.1.7</Version>
<Version>1.1.8</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...e-extraction/Fitnet.Common/Fitnet.Common.Api.UnitTests/Fitnet.Common.Api.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
7 changes: 2 additions & 5 deletions ...roservice-extraction/Fitnet.Common/Fitnet.Common.Api/ErrorHandling/ExceptionMiddleware.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@ namespace EvolutionaryArchitecture.Fitnet.Common.Api.ErrorHandling;
using Core.BusinessRules;
using Microsoft.AspNetCore.Http;

internal sealed class ExceptionMiddleware
internal sealed class ExceptionMiddleware(RequestDelegate next)
{
private const string ContentType = "application/json";
private readonly RequestDelegate _next;

public ExceptionMiddleware(RequestDelegate next) => _next = next;

public async Task InvokeAsync(HttpContext context)
{
try
{
await _next(context);
await next(context);
}
catch (Exception ex)
{
Expand Down
7 changes: 1 addition & 6 deletions ...ice-extraction/Fitnet.Common/Fitnet.Common.Api/ErrorHandling/ResourceNotFoundException.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
namespace EvolutionaryArchitecture.Fitnet.Common.Api.ErrorHandling;

public sealed class ResourceNotFoundException : InvalidOperationException
{
public ResourceNotFoundException(Guid id) : base($"Resource with '{id}' not found ")
{
}
}
public sealed class ResourceNotFoundException(Guid id) : InvalidOperationException($"Resource with '{id}' not found ");
2 changes: 1 addition & 1 deletion Chapter-3-microservice-extraction/Fitnet.Common/Fitnet.Common.Api/Fitnet.Common.Api.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.7.1" />
<PackageReference Include="FluentValidation" Version="11.8.1" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...extraction/Fitnet.Common/Fitnet.Common.Core.UnitTests/Fitnet.Common.Core.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
7 changes: 1 addition & 6 deletions ...raction/Fitnet.Common/Fitnet.Common.Core/BusinessRules/BusinessRuleValidationException.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
namespace EvolutionaryArchitecture.Fitnet.Common.Core.BusinessRules;

public class BusinessRuleValidationException : InvalidOperationException
{
public BusinessRuleValidationException(string message) : base(message)
{
}
}
public class BusinessRuleValidationException(string message) : InvalidOperationException(message);
2 changes: 1 addition & 1 deletion Chapter-3-microservice-extraction/Fitnet.Common/Fitnet.Common.Core/Fitnet.Common.Core.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions ...extraction/Fitnet.Common/Fitnet.Common.Infrastructure/Fitnet.Common.Infrastructure.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="MediatR" Version="12.0.1" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.FeatureManagement" Version="2.5.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.FeatureManagement" Version="3.1.0" />
</ItemGroup>
</Project>
23 changes: 12 additions & 11 deletions ...Common/Fitnet.Common.IntegrationTestsToolbox/Fitnet.Common.IntegrationTestsToolbox.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@

<ItemGroup>
<PackageReference Include="Bogus" Version="34.0.2" />
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="MassTransit" Version="8.1.1" />
<PackageReference Include="Verify.Xunit" Version="19.11.2" />
<PackageReference Include="Testcontainers" Version="3.0.0" />
<PackageReference Include="Testcontainers.PostgreSql" Version="3.0.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.analyzers" Version="1.1.0" />
<PackageReference Include="xunit.categories" Version="2.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="MassTransit" Version="8.1.2" />
<PackageReference Include="Verify.Xunit" Version="22.5.0" />
<PackageReference Include="Testcontainers" Version="3.6.0" />
<PackageReference Include="Testcontainers.PostgreSql" Version="3.6.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.analyzers" Version="1.6.0" />
<PackageReference Include="xunit.categories" Version="2.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion ...croservice-extraction/Fitnet.Common/Fitnet.Common.IntegrationTestsToolbox/GlobalUsings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
global using Xunit;
global using Microsoft.AspNetCore.Mvc.Testing;
global using Microsoft.AspNetCore.Hosting;
global using Microsoft.Extensions.Configuration;
global using Microsoft.Extensions.Configuration;
8 changes: 3 additions & 5 deletions ...et.Common/Fitnet.Common.IntegrationTestsToolbox/TestEngine/SystemClock/FakeSystemClock.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ namespace EvolutionaryArchitecture.Fitnet.Common.IntegrationTestsToolbox.TestEng

using Core.SystemClock;

internal sealed class FakeSystemClock : ISystemClock
internal sealed class FakeSystemClock(DateTimeOffset fakeDateTimeOffset) : ISystemClock
{
public FakeSystemClock(DateTimeOffset fakeDateTimeOffset) => Now = fakeDateTimeOffset;

public DateTimeOffset Now { get; }
}
public DateTimeOffset Now { get; } = fakeDateTimeOffset;
}

0 comments on commit abe831b

Please sign in to comment.