Skip to content

Commit 01ca766

Browse files
meaboutsoftwaremeaboutsoftware
authored
Migrate chapter 4 main solution to .NET 10 and add central package management (#238)
1 parent ea13af8 commit 01ca766

File tree

24 files changed

+161
-198
lines changed

24 files changed

+161
-198
lines changed

‎.github/workflows/chapter-4-workflow.yml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
env:
1515
CHAPTER_DIR: "Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src"
16-
NUGET_SOURCE_NAME: "evolutionaryArchitecture"
16+
NUGET_SOURCE_NAME: "EvolutionaryArchitecture"
1717

1818
jobs:
1919
build:
@@ -28,14 +28,14 @@ jobs:
2828
- name: Setup .NET
2929
uses: actions/setup-dotnet@v3
3030
with:
31-
dotnet-version: 9.0.x
32-
- name: Add Evolutionary Architecture Nuget Source
33-
uses: evolutionary-architecture/evolutionary-architecture-by-example/.github@main
34-
with:
35-
github-token: ${{ secrets.GITHUB_TOKEN }}
36-
owner: ${{ github.repository_owner }}
37-
path: ${{ env.CHAPTER_DIR }}
38-
nuget-source-name: ${{ env.NUGET_SOURCE_NAME }}
31+
dotnet-version: 10.0.x
32+
- name: Authenticate to GitHub Packages
33+
run: |
34+
dotnet nuget update source ${{ env.NUGET_SOURCE_NAME }} \
35+
--username ${{ github.actor }} \
36+
--password ${{ secrets.GITHUB_TOKEN }} \
37+
--store-password-in-clear-text \
38+
--configfile nuget.config
3939
- name: Restore dependencies
4040
run: dotnet restore
4141
- name: Build
@@ -53,15 +53,14 @@ jobs:
5353
- name: Setup .NET
5454
uses: actions/setup-dotnet@v3
5555
with:
56-
dotnet-version: 9.0.x
57-
- name: Add Evolutionary Architecture Nuget Source
58-
uses: evolutionary-architecture/evolutionary-architecture-by-example/.github@main
59-
with:
60-
github-token: ${{ secrets.GITHUB_TOKEN }}
61-
owner: ${{ github.repository_owner }}
62-
path: ${{ env.CHAPTER_DIR }}
63-
nuget-source-name: ${{ env.NUGET_SOURCE_NAME }}
64-
56+
dotnet-version: 10.0.x
57+
- name: Authenticate to GitHub Packages
58+
run: |
59+
dotnet nuget update source ${{ env.NUGET_SOURCE_NAME }} \
60+
--username ${{ github.actor }} \
61+
--password ${{ secrets.GITHUB_TOKEN }} \
62+
--store-password-in-clear-text \
63+
--configfile nuget.config
6564
- name: Restore dependencies
6665
run: dotnet restore
6766
- name: Test

‎Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyName>EvolutionaryArchitecture.$(MSBuildProjectName)</AssemblyName>
55
<RootNamespace>$(AssemblyName)</RootNamespace>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<AnalysisLevel>latest</AnalysisLevel>
88
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Directory.Packages.props‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup Label="Production">
6+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
7+
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.0.0" />
8+
<PackageVersion Include="Dapper" Version="2.1.66" />
9+
<PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="4.1.7" />
10+
<PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.7" />
11+
<PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.Infrastructure" Version="4.1.7" />
12+
<PackageVersion Include="EvolutionaryArchitecture.Fitnet.Contracts.IntegrationEvents" Version="1.0.7" />
13+
<PackageVersion Include="FluentValidation" Version="12.0.0" />
14+
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
15+
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
16+
<PackageVersion Include="MassTransit.EntityFrameworkCore" Version="8.3.2" />
17+
<PackageVersion Include="MassTransit.RabbitMQ" Version="8.3.2" />
18+
<PackageVersion Include="MediatR" Version="12.5.0" />
19+
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
20+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
21+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
22+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1" />
23+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
24+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
25+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
26+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
27+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
28+
<PackageVersion Include="Npgsql" Version="9.0.3" />
29+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
30+
<PackageVersion Include="Microsoft.OpenApi" Version="2.3.0" />
31+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
32+
</ItemGroup>
33+
<ItemGroup Label="Tests">
34+
<PackageVersion Include="Bogus" Version="35.6.3" />
35+
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
36+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
37+
<PackageVersion Include="EvolutionaryArchitecture.Fitnet.Common.IntegrationTestsToolbox" Version="4.1.7" />
38+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
39+
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.1" />
40+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
41+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
42+
<PackageVersion Include="Shouldly" Version="4.3.0" />
43+
<PackageVersion Include="Testcontainers" Version="4.7.0" />
44+
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.7.0" />
45+
<PackageVersion Include="Verify.Xunit" Version="30.17.0" />
46+
<PackageVersion Include="xunit" Version="2.9.3" />
47+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
48+
<PackageVersion Include="xunit.analyzers" Version="1.24.0" />
49+
<PackageVersion Include="xunit.categories" Version="2.0.8" />
50+
</ItemGroup>
51+
<ItemGroup>
52+
<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848" PrivateAssets="all" Condition="$(MSBuildProjectExtension) == '.csproj'" />
53+
</ItemGroup>
54+
</Project>

‎Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet.sln‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet.slnx‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Solution>
2+
<Folder Name="/Offers/">
3+
<Project Path="Offers/Fitnet.Offers.Api/Fitnet.Offers.Api.csproj" />
4+
<Project Path="Offers/Fitnet.Offers.DataAccess/Fitnet.Offers.DataAccess.csproj" />
5+
</Folder>
6+
<Folder Name="/Offers/Tests/">
7+
<Project Path="Offers/Tests/Fitnet.Offers.IntegrationTests/Fitnet.Offers.IntegrationTests.csproj" />
8+
</Folder>
9+
<Folder Name="/Passes/">
10+
<Project Path="Passes/Fitnet.Passes.Api/Fitnet.Passes.Api.csproj" />
11+
<Project Path="Passes/Fitnet.Passes.DataAccess/Fitnet.Passes.DataAccess.csproj" />
12+
<Project Path="Passes/Fitnet.Passes.IntegrationEvents/Fitnet.Passes.IntegrationEvents.csproj" />
13+
</Folder>
14+
<Folder Name="/Passes/Tests/">
15+
<Project Path="Passes/Tests/Fitnet.Passes.IntegrationTests/Fitnet.Passes.IntegrationTests.csproj" />
16+
</Folder>
17+
<Folder Name="/Reports/">
18+
<Project Path="Reports/Fitnet.Reports/Fitnet.Reports.csproj" />
19+
</Folder>
20+
<Folder Name="/Reports/Tests/">
21+
<Project Path="Reports/Tests/Fitnet.Reports.IntegrationTests/Fitnet.Reports.IntegrationTests.csproj" />
22+
</Folder>
23+
<Project Path="Fitnet/Fitnet.csproj" />
24+
</Solution>

Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet.sln.DotSettings renamed to Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet.slnx.DotSettings

File renamed without changes.

‎Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet/Fitnet.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
9-
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
8+
<PackageReference Include="JetBrains.Annotations" />
9+
<PackageReference Include="Swashbuckle.AspNetCore" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Fitnet/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
app.RegisterOffers(Module.Offers);
3939
app.RegisterReports(Module.Reports);
4040

41-
app.Run();
41+
await app.RunAsync();
4242

4343
namespace EvolutionaryArchitecture.Fitnet
4444
{

‎Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Offers/Fitnet.Offers.Api/Fitnet.Offers.Api.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="evolutionaryarchitecture.fitnet.common.core" Version="4.1.7" />
18-
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" />
17+
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" />
1918
</ItemGroup>
2019

2120
</Project>

‎Chapter-4-applying-tactical-domain-driven-design/Fitnet/Src/Offers/Fitnet.Offers.DataAccess/Database/Migrations/20230503180337_CreateOffersTable.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#nullable disable
22

33
namespace SuperSimpleArchitecture.Fitnet.Migrations.OffersPersistenceMigrations;
4+
45
using System;
56
using System.Diagnostics.CodeAnalysis;
67
using Microsoft.EntityFrameworkCore.Migrations;

0 commit comments

Comments
 (0)