From 2d6689b9d3d390abaaf9a9dd24d2a9eb4fdcd666 Mon Sep 17 00:00:00 2001
From: goat <goatsdev@protonmail.com>
Date: Sun, 22 Dec 2024 19:14:18 +0100
Subject: [PATCH] move lumina version out of csproj

---
 Dalamud.CorePlugin/Dalamud.CorePlugin.csproj | 6 +++---
 Dalamud/Dalamud.csproj                       | 8 ++++----
 Directory.Build.props                        | 9 ++++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj
index b85607f0f..ca78f09ad 100644
--- a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj
+++ b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj
@@ -27,9 +27,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Lumina" Version="5.6.0" />
-        <PackageReference Include="Lumina.Excel" Version="7.1.3" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Lumina" Version="$(LuminaVersion)" />
+        <PackageReference Include="Lumina.Excel" Version="$(LuminaExcelVersion)" />
+        <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index 75afaae1b..e1bb20db6 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -9,8 +9,8 @@
     </PropertyGroup>
 
     <PropertyGroup Label="Feature">
-        <DalamudVersion>11.0.3.0</DalamudVersion>
         <Description>XIV Launcher addon framework</Description>
+        <DalamudVersion>11.0.3.0</DalamudVersion>
         <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
         <Version>$(DalamudVersion)</Version>
         <FileVersion>$(DalamudVersion)</FileVersion>
@@ -71,14 +71,14 @@
         <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="2024.2.0" />
-        <PackageReference Include="Lumina" Version="5.6.0" />
-        <PackageReference Include="Lumina.Excel" Version="7.1.3" />
+        <PackageReference Include="Lumina" Version="$(LuminaVersion)" />
+        <PackageReference Include="Lumina.Excel" Version="$(LuminaExcelVersion)" />
         <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>
         <PackageReference Include="MinSharp" Version="1.0.4" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
         <PackageReference Include="Serilog" Version="4.0.2" />
         <PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
diff --git a/Directory.Build.props b/Directory.Build.props
index 0c5af2e37..6ee6f4b11 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,12 @@
-<!-- Code analysis settings for all Dalamud projects. -->
 <Project>
+    <!-- Dependency versions -->
+    <PropertyGroup Label="Dependency Versions">
+        <LuminaVersion>5.6.0</LuminaVersion>
+        <LuminaExcelVersion>7.1.3</LuminaExcelVersion>
+        <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
+    </PropertyGroup>
+
+    <!-- Code analysis settings for all Dalamud projects. -->
     <ItemGroup Label="Code Analysis">
         <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
         <AdditionalFiles Include="$(MSBuildThisFileDirectory)tools\BannedSymbols.txt" />