deps: update lumina, manually include Lumina.Generated as resource

Dalamud/Dalamud.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup Label="Target">
         <PlatformTarget>AnyCPU</PlatformTarget>
         <TargetFramework>net472</TargetFramework>
@@ -31,15 +31,13 @@
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     </PropertyGroup>
     <ItemGroup>
-        <Compile Remove="Resources\**" />
-        <EmbeddedResource Remove="Resources\**" />
-        <None Remove="Resources\**" />
+      <None Remove="Resources\Lumina.Generated.dll" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="CheapLoc" Version="1.1.3" />
         <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-        <PackageReference Include="Lumina" Version="2.2.0" />
-        <PackageReference Include="Lumina.Generated" Version="5.30.2" />
+        <PackageReference Include="Lumina" Version="2.4.1" />
+        <PackageReference Include="Lumina.Excel" Version="5.35.0" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
         <PackageReference Include="PropertyChanged.Fody" Version="2.6.1" />
         <PackageReference Include="Serilog" Version="2.6.0" />
@@ -71,4 +69,10 @@
         <ProjectReference Include="..\lib\ImGuiScene\deps\SDL2-CS\SDL2-CS.csproj" />
         <ProjectReference Include="..\lib\ImGuiScene\ImGuiScene\ImGuiScene.csproj" />
     </ItemGroup>
+    <ItemGroup>
+        <ContentWithTargetPath Include="Resources\Lumina.Generated.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <TargetPath>Lumina.Generated.dll</TargetPath>
+        </ContentWithTargetPath>
+    </ItemGroup>
 </Project>

Dalamud/Game/Chat/SeStringHandling/SeStringManager.cs

@@ -142,7 +142,7 @@ namespace Dalamud.Game.Chat.SeStringHandling
             var mapSheet = this.data.GetExcelSheet<Map>();
 
             var matches = this.data.GetExcelSheet<PlaceName>().GetRows()
-                              .Where(row => row.Name.ToLowerInvariant() == placeName.ToLowerInvariant())
+                              .Where(row => row.Name.ToString().ToLowerInvariant() == placeName.ToLowerInvariant())
                               .ToArray();
 
             foreach (var place in matches)

Dalamud/Game/Network/NetworkHandlers.cs

@@ -60,8 +60,9 @@ namespace Dalamud.Game.Network {
                     return;
                 }
 
+                var cfcName = contentFinderCondition.Name.ToString();
                 if (string.IsNullOrEmpty(contentFinderCondition.Name)) {
-                    contentFinderCondition.Name = "Duty Roulette";
+                    cfcName = "Duty Roulette";
                     contentFinderCondition.Image = 112324;
                 }
 
@@ -80,7 +81,7 @@ namespace Dalamud.Game.Network {
 
                 Task.Run(async () => {
                     if(this.dalamud.Configuration.DutyFinderChatMessage)
-                        this.dalamud.Framework.Gui.Chat.Print("Duty pop: " + contentFinderCondition.Name);
+                        this.dalamud.Framework.Gui.Chat.Print("Duty pop: " + cfcName);
 
                     await this.ProcessCfPop?.Invoke(contentFinderCondition);
                 });