From 83e23c2245c3771099f497e89183e8a6b29d5a77 Mon Sep 17 00:00:00 2001
From: Bart de Bever <bartdebever112@gmail.com>
Date: Fri, 12 Jul 2024 14:39:29 +0200
Subject: [PATCH] Upgrade to .NET 8 and remove obsolete from FightCoreId

---
 backend/FightCore.Data/FightCore.Data.csproj          |  8 ++++----
 backend/FightCore.Enricher/FightCore.Enricher.csproj  |  9 ++++-----
 .../FightCore.Exporters/FightCore.Exporters.csproj    | 11 +++++------
 .../FightCore.External.MeleeDatabase.csproj           |  8 ++++----
 backend/FightCore.Models/Character.cs                 |  1 -
 backend/FightCore.Models/FightCore.Models.csproj      |  2 +-
 .../FightCore.Repositories.csproj                     |  6 +++---
 backend/FightCore.Services/FightCore.Services.csproj  |  2 +-
 8 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/backend/FightCore.Data/FightCore.Data.csproj b/backend/FightCore.Data/FightCore.Data.csproj
index 9beeb98..d89ad25 100644
--- a/backend/FightCore.Data/FightCore.Data.csproj
+++ b/backend/FightCore.Data/FightCore.Data.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/backend/FightCore.Enricher/FightCore.Enricher.csproj b/backend/FightCore.Enricher/FightCore.Enricher.csproj
index 48420cd..fefcd56 100644
--- a/backend/FightCore.Enricher/FightCore.Enricher.csproj
+++ b/backend/FightCore.Enricher/FightCore.Enricher.csproj
@@ -4,14 +4,13 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="RestSharp" Version="110.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="RestSharp" Version="111.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/backend/FightCore.Exporters/FightCore.Exporters.csproj b/backend/FightCore.Exporters/FightCore.Exporters.csproj
index c78fd83..f5bcc6b 100644
--- a/backend/FightCore.Exporters/FightCore.Exporters.csproj
+++ b/backend/FightCore.Exporters/FightCore.Exporters.csproj
@@ -2,16 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
diff --git a/backend/FightCore.External.MeleeDatabase/FightCore.External.MeleeDatabase.csproj b/backend/FightCore.External.MeleeDatabase/FightCore.External.MeleeDatabase.csproj
index 8c7c20c..c9c96fd 100644
--- a/backend/FightCore.External.MeleeDatabase/FightCore.External.MeleeDatabase.csproj
+++ b/backend/FightCore.External.MeleeDatabase/FightCore.External.MeleeDatabase.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.123" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.5" />
+    <PackageReference Include="Dapper" Version="2.1.35" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.7" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/backend/FightCore.Models/Character.cs b/backend/FightCore.Models/Character.cs
index b75937d..fc5b399 100644
--- a/backend/FightCore.Models/Character.cs
+++ b/backend/FightCore.Models/Character.cs
@@ -13,7 +13,6 @@ public class Character : BaseEntity
         /// </summary>
         public string NormalizedName { get; set; }
 
-        [Obsolete]
         public long FightCoreId { get; set; }
 
         public List<Move> Moves { get; set; }
diff --git a/backend/FightCore.Models/FightCore.Models.csproj b/backend/FightCore.Models/FightCore.Models.csproj
index 2396896..153111d 100644
--- a/backend/FightCore.Models/FightCore.Models.csproj
+++ b/backend/FightCore.Models/FightCore.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
diff --git a/backend/FightCore.Repositories/FightCore.Repositories.csproj b/backend/FightCore.Repositories/FightCore.Repositories.csproj
index b7e7d86..9a3aec9 100644
--- a/backend/FightCore.Repositories/FightCore.Repositories.csproj
+++ b/backend/FightCore.Repositories/FightCore.Repositories.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/backend/FightCore.Services/FightCore.Services.csproj b/backend/FightCore.Services/FightCore.Services.csproj
index 1831206..8926441 100644
--- a/backend/FightCore.Services/FightCore.Services.csproj
+++ b/backend/FightCore.Services/FightCore.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>