From 7280744def71ce6970a0f50bc54c7f3fd794f190 Mon Sep 17 00:00:00 2001
From: Haselnussbomber <mail@haselnussbomber.de>
Date: Sun, 21 Apr 2024 15:22:25 +0200
Subject: [PATCH] Update Lumina to 3.17.0 (#1780)

* Update Lumina to 3.17.0

* Dispose GameData in DataManager

* Update Microsoft.Extensions.ObjectPool
---
 Dalamud.CorePlugin/Dalamud.CorePlugin.csproj | 2 +-
 Dalamud/Dalamud.csproj                       | 4 ++--
 Dalamud/Data/DataManager.cs                  | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj
index f9959a910..3e480154c 100644
--- a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj
+++ b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj
@@ -27,7 +27,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Lumina" Version="3.16.0" />
+        <PackageReference Include="Lumina" Version="3.17.0" />
         <PackageReference Include="Lumina.Excel" Version="6.5.2" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333">
diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index a69857de4..38bc0b886 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -68,9 +68,9 @@
         <PackageReference Include="goaaats.Reloaded.Hooks" Version="4.2.0-goat.4" />
         <PackageReference Include="goaaats.Reloaded.Assembler" Version="1.0.14-goat.2" />
         <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
-        <PackageReference Include="Lumina" Version="3.16.0" />
+        <PackageReference Include="Lumina" Version="3.17.0" />
         <PackageReference Include="Lumina.Excel" Version="6.5.2" />
-        <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.1.24081.5" />
         <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.46-beta">
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs
index 564b10fae..1640379c7 100644
--- a/Dalamud/Data/DataManager.cs
+++ b/Dalamud/Data/DataManager.cs
@@ -161,6 +161,7 @@ internal sealed class DataManager : IInternalDisposableService, IDataManager
     void IInternalDisposableService.DisposeService()
     {
         this.luminaCancellationTokenSource.Cancel();
+        this.GameData.Dispose();
     }
 
     private class LauncherTroubleshootingInfo