nuget and .net8 upgrade

Game-as-a-Service · Jan 19, 2024 · f1c1ee9 · f1c1ee9
1 parent 1e49735
commit f1c1ee9
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 54 deletions.
diff --git a/src/BackEnd/src/Application/Common/GameEventBus.cs b/src/BackEnd/src/Application/Common/GameEventBus.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Wsa.Gaas.Werewolf.Domain.Common;
 
 namespace Wsa.Gaas.Werewolf.Application.Common;
 public class GameEventBus

diff --git a/src/BackEnd/src/Application/Common/IGameEventHandler.cs b/src/BackEnd/src/Application/Common/IGameEventHandler.cs
@@ -1,6 +1,4 @@
-using Wsa.Gaas.Werewolf.Domain.Common;
-
-namespace Wsa.Gaas.Werewolf.Application.Common;
+namespace Wsa.Gaas.Werewolf.Application.Common;
 public interface IGameEventHandler
 {
     Task Handle(GameEvent events, CancellationToken cancellationToken = default);

diff --git a/src/BackEnd/src/Application/Common/IPresenter.cs b/src/BackEnd/src/Application/Common/IPresenter.cs
@@ -1,6 +1,4 @@
-using Wsa.Gaas.Werewolf.Domain.Common;
-
-namespace Wsa.Gaas.Werewolf.Application.Common;
+namespace Wsa.Gaas.Werewolf.Application.Common;
 public interface IPresenter<TGameEvent>
     where TGameEvent : GameEvent
 {

diff --git a/src/BackEnd/src/Application/Common/Policy.cs b/src/BackEnd/src/Application/Common/Policy.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Options;
 using Wsa.Gaas.Werewolf.Application.Options;
-using Wsa.Gaas.Werewolf.Domain.Common;
 
 namespace Wsa.Gaas.Werewolf.Application.Common;
 internal abstract class Policy<T> : IGameEventHandler<T>

diff --git a/src/BackEnd/src/Application/GlobalUsing.cs b/src/BackEnd/src/Application/GlobalUsing.cs
@@ -1,3 +1,4 @@
 global using Wsa.Gaas.Werewolf.Application.Common;
+global using Wsa.Gaas.Werewolf.Domain.Common;
 global using Wsa.Gaas.Werewolf.Domain.Events;
 global using Wsa.Gaas.Werewolf.Domain.Exceptions;
diff --git a/src/BackEnd/src/Application/UseCases/CreateGameUseCase.cs b/src/BackEnd/src/Application/UseCases/CreateGameUseCase.cs
@@ -1,5 +1,4 @@
 using Wsa.Gaas.Werewolf.Application.Dtos;
-using Wsa.Gaas.Werewolf.Domain.Common;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
 namespace Wsa.Gaas.Werewolf.Application.UseCases;

diff --git a/src/BackEnd/src/Application/UseCases/GetGameUseCase.cs b/src/BackEnd/src/Application/UseCases/GetGameUseCase.cs
@@ -1,5 +1,4 @@
 using Wsa.Gaas.Werewolf.Application.Dtos;
-using Wsa.Gaas.Werewolf.Domain.Common;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
 namespace Wsa.Gaas.Werewolf.Application.UseCases;

diff --git a/src/BackEnd/src/Application/UseCases/StartGameUseCase.cs b/src/BackEnd/src/Application/UseCases/StartGameUseCase.cs
@@ -1,5 +1,4 @@
 using Wsa.Gaas.Werewolf.Application.Dtos;
-using Wsa.Gaas.Werewolf.Domain.Common;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
 namespace Wsa.Gaas.Werewolf.Application.UseCases;

diff --git a/src/BackEnd/src/Application/Wsa.Gaas.Werewolf.Application.csproj b/src/BackEnd/src/Application/Wsa.Gaas.Werewolf.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BackEnd/src/Domain/Wsa.Gaas.Werewolf.Domain.csproj b/src/BackEnd/src/Domain/Wsa.Gaas.Werewolf.Domain.csproj
@@ -1,22 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Services\**" />
-    <EmbeddedResource Remove="Services\**" />
-    <None Remove="Services\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Events\NewFile1.txt" />
-    <None Remove="Exceptions\NewFile1.txt" />
-  </ItemGroup>
-
   <ItemGroup>
     <InternalsVisibleTo Include="Wsa.Gaas.Werewolf.WebApiTests" />
   </ItemGroup>

diff --git a/...End/src/InterfaceAdapter/EntityFrameworkCore/Wsa.Gaas.Werewolf.EntityFrameworkCore.csproj b/...End/src/InterfaceAdapter/EntityFrameworkCore/Wsa.Gaas.Werewolf.EntityFrameworkCore.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Program.cs b/src/BackEnd/src/InterfaceAdapter/WebApi/Program.cs
@@ -1,6 +1,5 @@
 global using Wsa.Gaas.Werewolf.Application.UseCases;
 using FastEndpoints;
-using FastEndpoints.Swagger;
 using System.Text.Json.Serialization;
 using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
@@ -36,6 +35,6 @@
 
 // Swagger
 app.UseOpenApi();
-app.UseSwaggerUi3(c => c.ConfigureDefaults());
+//app.UseSwaggerUi3(c => c.ConfigureDefaults());
 
 app.Run();
diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj b/src/BackEnd/src/InterfaceAdapter/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -11,11 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FastEndpoints" Version="5.13.0" />
-    <PackageReference Include="FastEndpoints.Swagger" Version="5.13.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.8">
+    <PackageReference Include="FastEndpoints" Version="5.21.2" />
+    <PackageReference Include="FastEndpoints.Swagger" Version="5.21.2" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/BackEnd/test/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs b/src/BackEnd/test/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs
@@ -17,6 +17,11 @@ public void OneTimeSetUp()
         var repository = GetRepository();
         repository.Initialize();
     }
+    [OneTimeTearDown]
+    public void OneTimeTearDown()
+    {
+        _provider.Dispose();
+    }
 
     private IRepository GetRepository()
     {
@@ -32,7 +37,7 @@ public async Task SaveTest()
         var game = new Game();
         repository.Save(game);
 
-        game.StartGame(new ulong[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 });
+        game.StartGame([1, 2, 3, 4, 5, 6, 7, 8, 9]);
         repository.Save(game);
 
         game.CurrentSpeakingPlayerId = game.Players.First(x => x.UserId == 3).Id;

diff --git a/src/BackEnd/test/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj b/src/BackEnd/test/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="34.0.2" />
-    <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.8" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="Bogus" Version="35.4.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -26,7 +26,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="Testcontainers" Version="3.3.0" />
+    <PackageReference Include="Testcontainers" Version="3.7.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,9 +36,4 @@
     <ProjectReference Include="..\..\src\InterfaceAdapter\WebApi\Wsa.Gaas.Werewolf.WebApi.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="TDD\EntityFrameworkCoreTest\" />
-    <Folder Include="TDD\WebApiTest\" />
-  </ItemGroup>
-
 </Project>