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 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/Contracts/PrepareContract/PrepareContractTests.cs b/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Contracts/PrepareContract/PrepareContractTests.cs index 8e1124cd..f87ca249 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Contracts/PrepareContract/PrepareContractTests.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Contracts/PrepareContract/PrepareContractTests.cs @@ -71,7 +71,8 @@ internal async Task Given_contract_preparation_request_with_invalid_height_Then_ } [Fact] - internal async Task Given_contract_preparation_request_When_contract_for_customer_was_prepared_earlier_and_was_not_signed_yet_Then_should_return_conflict_status_code() + internal async Task + Given_contract_preparation_request_When_contract_for_customer_was_prepared_earlier_and_was_not_signed_yet_Then_should_return_conflict_status_code() { // Arrange var requestParameters = PrepareContractRequestParameters.GetValid(); @@ -88,12 +89,14 @@ internal async Task Given_contract_preparation_request_When_contract_for_custome responseMessage?.Title.Should().Be("Previous contract must be signed by the customer"); } - private async Task PrepareCorrectContract(PrepareContractRequestParameters requestParameters, Guid? customerId = null) + private async Task PrepareCorrectContract(PrepareContractRequestParameters requestParameters, + Guid? customerId = null) { PrepareContractRequest prepareContractRequest = new PrepareContractRequestFaker(requestParameters.MinAge, requestParameters.MaxAge, requestParameters.MinHeight, requestParameters.MaxHeight, customerId); var prepareContractResponse = await _applicationHttpClient.PostAsJsonAsync(ContractsApiPaths.Prepare, prepareContractRequest); + return prepareContractResponse; } } 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 {