From fd5a63945943f106213262b78dd66bbf3ed73fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20B=C4=85czek?= <74410956+kamilbaczek@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:02:53 +0100 Subject: [PATCH 1/3] feat: update logo --- Chapter-1-initial-architecture/README.adoc | 6 +++++- Chapter-2-modules-separation/README.adoc | 6 +++++- Chapter-3-microservice-extraction/README.adoc | 6 +++++- .../README.adoc | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Chapter-1-initial-architecture/README.adoc b/Chapter-1-initial-architecture/README.adoc index a9a28f35..a43645fa 100644 --- a/Chapter-1-initial-architecture/README.adoc +++ b/Chapter-1-initial-architecture/README.adoc @@ -3,7 +3,11 @@ ++++
- ea banner + + + + ea banner +
++++ diff --git a/Chapter-2-modules-separation/README.adoc b/Chapter-2-modules-separation/README.adoc index 00bcfd62..3db4a59a 100644 --- a/Chapter-2-modules-separation/README.adoc +++ b/Chapter-2-modules-separation/README.adoc @@ -3,7 +3,11 @@ ++++
- ea banner + + + + ea banner +
++++ diff --git a/Chapter-3-microservice-extraction/README.adoc b/Chapter-3-microservice-extraction/README.adoc index 361bf0d0..3021346d 100644 --- a/Chapter-3-microservice-extraction/README.adoc +++ b/Chapter-3-microservice-extraction/README.adoc @@ -3,7 +3,11 @@ ++++
- ea banner + + + + ea banner +
++++ diff --git a/Chapter-4-applying-tactical-domain-driven-design/README.adoc b/Chapter-4-applying-tactical-domain-driven-design/README.adoc index a9064a9f..87162c10 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/README.adoc +++ b/Chapter-4-applying-tactical-domain-driven-design/README.adoc @@ -3,7 +3,11 @@ ++++
- ea banner + + + + ea banner +
++++ From 8e757e8f56ac3d386b1346813cd6b0f061bf11c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20B=C4=85czek?= <74410956+kamilbaczek@users.noreply.github.com> Date: Fri, 15 Nov 2024 07:21:59 +0100 Subject: [PATCH 2/3] feat: upgrade chapter 1 to .NET 9 --- .../Src/Directory.Build.props | 2 +- Chapter-1-initial-architecture/Src/Dockerfile | 4 +-- .../Fitnet.ArchitectureTests.csproj | 16 ++++++---- .../Fitnet.IntegrationTests.csproj | 30 +++++++++++-------- .../GenerateNewPassesPerMonthReportTests.cs | 1 - .../Fitnet.UnitTests/Fitnet.UnitTests.csproj | 20 ++++++++----- .../Src/Fitnet/Fitnet.csproj | 20 ++++++------- .../Src/Fitnet/Program.cs | 2 +- 8 files changed, 53 insertions(+), 42 deletions(-) diff --git a/Chapter-1-initial-architecture/Src/Directory.Build.props b/Chapter-1-initial-architecture/Src/Directory.Build.props index 2c4322b7..27437e42 100644 --- a/Chapter-1-initial-architecture/Src/Directory.Build.props +++ b/Chapter-1-initial-architecture/Src/Directory.Build.props @@ -3,7 +3,7 @@ EvolutionaryArchitecture.$(MSBuildProjectName) $(AssemblyName) - net8.0 + net9.0 latest true true diff --git a/Chapter-1-initial-architecture/Src/Dockerfile b/Chapter-1-initial-architecture/Src/Dockerfile index 1898d116..c7eab40d 100644 --- a/Chapter-1-initial-architecture/Src/Dockerfile +++ b/Chapter-1-initial-architecture/Src/Dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY Directory.Build.props ./ COPY ["Fitnet/Fitnet.csproj", "Fitnet/"] diff --git a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/Fitnet.ArchitectureTests.csproj b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/Fitnet.ArchitectureTests.csproj index c6009211..f8aa5ff7 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/Fitnet.ArchitectureTests.csproj +++ b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/Fitnet.ArchitectureTests.csproj @@ -5,20 +5,24 @@ - + - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all + diff --git a/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Fitnet.IntegrationTests.csproj b/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Fitnet.IntegrationTests.csproj index 98efbfa7..08e24ee5 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Fitnet.IntegrationTests.csproj +++ b/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Fitnet.IntegrationTests.csproj @@ -6,26 +6,30 @@ - - - - - - + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all + diff --git a/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Reports/GenerateNewPassesPerMonthReport/GenerateNewPassesPerMonthReportTests.cs b/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Reports/GenerateNewPassesPerMonthReport/GenerateNewPassesPerMonthReportTests.cs index eaa730e6..49a7feea 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Reports/GenerateNewPassesPerMonthReport/GenerateNewPassesPerMonthReportTests.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Reports/GenerateNewPassesPerMonthReport/GenerateNewPassesPerMonthReportTests.cs @@ -9,7 +9,6 @@ namespace EvolutionaryArchitecture.Fitnet.IntegrationTests.Reports.GenerateNewPa using Passes.RegisterPass; using TestData; -[UsesVerify] public sealed class GenerateNewPassesPerMonthReportTests : IClassFixture>, IClassFixture { private static readonly FakeTimeProvider FakeTimeProvider = new(ReportTestCases.FakeNowDate); diff --git a/Chapter-1-initial-architecture/Src/Fitnet.UnitTests/Fitnet.UnitTests.csproj b/Chapter-1-initial-architecture/Src/Fitnet.UnitTests/Fitnet.UnitTests.csproj index caa85f37..9a2fc27c 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.UnitTests/Fitnet.UnitTests.csproj +++ b/Chapter-1-initial-architecture/Src/Fitnet.UnitTests/Fitnet.UnitTests.csproj @@ -5,21 +5,25 @@ - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all + diff --git a/Chapter-1-initial-architecture/Src/Fitnet/Fitnet.csproj b/Chapter-1-initial-architecture/Src/Fitnet/Fitnet.csproj index 6123cb1e..ba199fd6 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet/Fitnet.csproj +++ b/Chapter-1-initial-architecture/Src/Fitnet/Fitnet.csproj @@ -5,16 +5,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/Chapter-1-initial-architecture/Src/Fitnet/Program.cs b/Chapter-1-initial-architecture/Src/Fitnet/Program.cs index 5c21e02e..15cad195 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet/Program.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet/Program.cs @@ -48,7 +48,7 @@ app.MapContracts(); app.MapReports(); -app.Run(); +await app.RunAsync(); namespace EvolutionaryArchitecture.Fitnet { From 8d79e90beec1dc622b0abb9abd68d8036ad0b3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20B=C4=85czek?= <74410956+kamilbaczek@users.noreply.github.com> Date: Fri, 15 Nov 2024 07:28:57 +0100 Subject: [PATCH 3/3] feat: add dotnet 9 --- .github/workflows/chapter-1-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/chapter-1-workflow.yml b/.github/workflows/chapter-1-workflow.yml index 4364d21a..2473f564 100644 --- a/.github/workflows/chapter-1-workflow.yml +++ b/.github/workflows/chapter-1-workflow.yml @@ -25,7 +25,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Restore dependencies run: dotnet restore - name: Build @@ -43,7 +43,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Restore dependencies run: dotnet restore - name: Test