Merge pull request #12 from sj-distributor/dotnet7

Upgrade to dotnet 7.0
sj-distributor · Apr 14, 2023 · 7046f5b · 7046f5b
2 parents e4459de + e5cf6e5
commit 7046f5b
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 35 deletions.
diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
@@ -10,8 +10,8 @@
     <PackageReference Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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/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<CreateCustomerComman
     {
         private readonly IMapper _mapper;
         private readonly ICustomerRepository _customerRepository;
-        private readonly IUnitOfWork _unitOfWork;
 
         public CreateCustomerCommandHandler(IMapper mapper,ICustomerRepository customerRepository)
         {

diff --git a/src/Wax.Core/Wax.Core.csproj b/src/Wax.Core/Wax.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
@@ -11,12 +11,12 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="AutoMapper.Contrib.Autofac.DependencyInjection" Version="6.1.0" />
+    <PackageReference Include="AutoMapper.Contrib.Autofac.DependencyInjection" Version="7.1.0" />
     <PackageReference Include="FluentValidation" Version="11.2.2" />
     <PackageReference Include="Mediator.Net.Autofac" Version="4.7.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Serilog" Version="2.12.0" />
   </ItemGroup>
 

diff --git a/src/Wax.Messages/Wax.Messages.csproj b/src/Wax.Messages/Wax.Messages.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/tests/Wax.E2ETests/Wax.E2ETests.csproj b/tests/Wax.E2ETests/Wax.E2ETests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>disable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/tests/Wax.IntegrationTests/IntegrationTestBase.cs b/tests/Wax.IntegrationTests/IntegrationTestBase.cs
@@ -34,18 +34,6 @@ protected async Task<TR> Run<T, TR>(Func<T, Task<TR>> action, Action<ContainerBu
         return await action(dependency);
     }
 
-    protected async Task<TR> RunWithUnitOfWork<TR>(Func<IUnitOfWork, Task<TR>> action)
-    {
-        var uow = _fixture.LifetimeScope.BeginLifetimeScope().Resolve<IUnitOfWork>();
-        return await action(uow);
-    }
-
-    protected async Task RunWithUnitOfWork(Func<IUnitOfWork, Task> action)
-    {
-        var uow = _fixture.LifetimeScope.BeginLifetimeScope().Resolve<IUnitOfWork>();
-        await action(uow);
-    }
-
     public void Dispose()
     {
         _fixture.Cleanup();

diff --git a/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj b/tests/Wax.IntegrationTests/Wax.IntegrationTests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>disable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="NSubstitute" Version="4.4.0" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
@@ -29,11 +29,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="appsettings.json">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
     <None Remove="appsettings.json" />
     <Content Include="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/tests/Wax.UnitTests/Wax.UnitTests.csproj b/tests/Wax.UnitTests/Wax.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>disable</Nullable>
 
     <IsPackable>false</IsPackable>