From 4614827524f976f1d3964deb9ef543fa063da5f7 Mon Sep 17 00:00:00 2001 From: "BRUCE.L" Date: Thu, 13 Apr 2023 04:45:47 -0700 Subject: [PATCH 1/4] Upgrade to dotnet7 --- .github/workflows/dotnet.yml | 2 +- README.md | 2 +- src/Wax.Api/Wax.Api.csproj | 6 +++--- .../Customers/CreateCustomerCommandHandler.cs | 1 - src/Wax.Core/Wax.Core.csproj | 8 ++++---- src/Wax.Messages/Wax.Messages.csproj | 2 +- tests/Wax.E2ETests/Wax.E2ETests.csproj | 4 ++-- tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj | 6 +++--- tests/Wax.UnitTests/Wax.UnitTests.csproj | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 25f43e7..da74b91 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/README.md b/README.md index eb972e8..04b9940 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![.NET](https://github.com/sj-distributor/Wax/actions/workflows/dotnet.yml/badge.svg)](https://github.com/sj-distributor/Wax/actions/workflows/dotnet.yml) [![Nuget](https://img.shields.io/nuget/v/Wax.Template)](https://www.nuget.org/packages/Wax.Template) -WilTechs Architecture Solution Template for .NET 6 +WilTechs Architecture Solution Template for .NET 7 ## Getting Started diff --git a/src/Wax.Api/Wax.Api.csproj b/src/Wax.Api/Wax.Api.csproj index ffa237a..0064612 100644 --- a/src/Wax.Api/Wax.Api.csproj +++ b/src/Wax.Api/Wax.Api.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable @@ -10,8 +10,8 @@ - - + + diff --git a/src/Wax.Core/Handlers/CommandHandlers/Customers/CreateCustomerCommandHandler.cs b/src/Wax.Core/Handlers/CommandHandlers/Customers/CreateCustomerCommandHandler.cs index 13d68ce..30246bf 100644 --- a/src/Wax.Core/Handlers/CommandHandlers/Customers/CreateCustomerCommandHandler.cs +++ b/src/Wax.Core/Handlers/CommandHandlers/Customers/CreateCustomerCommandHandler.cs @@ -13,7 +13,6 @@ public class CreateCustomerCommandHandler : ICommandHandler - net6.0 + net7.0 enable @@ -14,9 +14,9 @@ - - - + + + diff --git a/src/Wax.Messages/Wax.Messages.csproj b/src/Wax.Messages/Wax.Messages.csproj index 331a1be..68a5584 100644 --- a/src/Wax.Messages/Wax.Messages.csproj +++ b/src/Wax.Messages/Wax.Messages.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable diff --git a/tests/Wax.E2ETests/Wax.E2ETests.csproj b/tests/Wax.E2ETests/Wax.E2ETests.csproj index 73474ab..0e90a4a 100644 --- a/tests/Wax.E2ETests/Wax.E2ETests.csproj +++ b/tests/Wax.E2ETests/Wax.E2ETests.csproj @@ -1,14 +1,14 @@ - net6.0 + net7.0 disable false - + diff --git a/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj b/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj index 81915ea..0f3d766 100644 --- a/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj +++ b/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj @@ -1,15 +1,15 @@ - net6.0 + net7.0 disable false - - + + diff --git a/tests/Wax.UnitTests/Wax.UnitTests.csproj b/tests/Wax.UnitTests/Wax.UnitTests.csproj index b765178..2b43967 100644 --- a/tests/Wax.UnitTests/Wax.UnitTests.csproj +++ b/tests/Wax.UnitTests/Wax.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 disable false From 10fc769e64f7082a348cc1a2e1be9e5cd77ab1a0 Mon Sep 17 00:00:00 2001 From: "BRUCE.L" Date: Thu, 13 Apr 2023 05:24:04 -0700 Subject: [PATCH 2/4] Upgrade AutoMapper --- src/Wax.Core/Wax.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wax.Core/Wax.Core.csproj b/src/Wax.Core/Wax.Core.csproj index fc510e7..c4ce19d 100644 --- a/src/Wax.Core/Wax.Core.csproj +++ b/src/Wax.Core/Wax.Core.csproj @@ -11,7 +11,7 @@ - + From 6fc477c62a7fb3ced965bac13dc6f7116563b054 Mon Sep 17 00:00:00 2001 From: "BRUCE.L" Date: Thu, 13 Apr 2023 19:36:07 -0700 Subject: [PATCH 3/4] Register settings --- src/Wax.Core/ApplicationModule.cs | 1 + tests/Wax.IntegrationTests/IntegrationTestBase.cs | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Wax.Core/ApplicationModule.cs b/src/Wax.Core/ApplicationModule.cs index 9112f0d..daa44c0 100644 --- a/src/Wax.Core/ApplicationModule.cs +++ b/src/Wax.Core/ApplicationModule.cs @@ -39,6 +39,7 @@ public ApplicationModule(ILogger logger, ICurrentUser currentUser, IConfiguratio protected override void Load(ContainerBuilder builder) { + RegisterSettings(builder); RegisterAutoMapper(builder); RegisterDependency(builder); RegisterDatabase(builder); diff --git a/tests/Wax.IntegrationTests/IntegrationTestBase.cs b/tests/Wax.IntegrationTests/IntegrationTestBase.cs index ec4ecd9..0d0a2eb 100644 --- a/tests/Wax.IntegrationTests/IntegrationTestBase.cs +++ b/tests/Wax.IntegrationTests/IntegrationTestBase.cs @@ -34,18 +34,6 @@ protected async Task Run(Func> action, Action RunWithUnitOfWork(Func> action) - { - var uow = _fixture.LifetimeScope.BeginLifetimeScope().Resolve(); - return await action(uow); - } - - protected async Task RunWithUnitOfWork(Func action) - { - var uow = _fixture.LifetimeScope.BeginLifetimeScope().Resolve(); - await action(uow); - } - public void Dispose() { _fixture.Cleanup(); From e5cf6e58039c67daebd97834bbfaa26070d19163 Mon Sep 17 00:00:00 2001 From: "BRUCE.L" Date: Thu, 13 Apr 2023 19:38:34 -0700 Subject: [PATCH 4/4] Cleanup --- tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj b/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj index 0f3d766..40714cc 100644 --- a/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj +++ b/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj @@ -29,11 +29,6 @@ - - true - PreserveNewest - PreserveNewest - PreserveNewest