From 266eb5f7c9ec1710c40dff5b39c15ab47ff1c72c Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Mon, 29 Aug 2022 19:58:53 -0400
Subject: [PATCH] feat: update for api7 and net6

---
 XIVChatCommon/XIVChatCommon.csproj |  4 +-
 XIVChatPlugin/Plugin.cs            |  2 +-
 XIVChatPlugin/XIVChat.yaml         |  1 +
 XIVChatPlugin/XIVChatPlugin.csproj | 34 +++++++----
 XIVChatPlugin/packages.lock.json   | 98 ++++++++++++++++++++++++++++++
 5 files changed, 123 insertions(+), 16 deletions(-)
 create mode 100644 XIVChatPlugin/packages.lock.json

diff --git a/XIVChatCommon/XIVChatCommon.csproj b/XIVChatCommon/XIVChatCommon.csproj
index 984eadd..b913b88 100644
--- a/XIVChatCommon/XIVChatCommon.csproj
+++ b/XIVChatCommon/XIVChatCommon.csproj
@@ -9,8 +9,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MessagePack" Version="2.3.85"/>
-        <PackageReference Include="Sodium.Core" Version="1.2.3"/>
+        <PackageReference Include="MessagePack" Version="2.4.35"/>
+        <PackageReference Include="Sodium.Core" Version="1.3.1"/>
     </ItemGroup>
 
 </Project>
diff --git a/XIVChatPlugin/Plugin.cs b/XIVChatPlugin/Plugin.cs
index 5ea7432..7eaddd0 100644
--- a/XIVChatPlugin/Plugin.cs
+++ b/XIVChatPlugin/Plugin.cs
@@ -72,7 +72,7 @@ namespace XIVChatPlugin {
             // load libsodium.so from debug location if in debug mode
             #if DEBUG
             string path = Environment.GetEnvironmentVariable("PATH")!;
-            string newPath = Path.GetDirectoryName(this.DalamudPlugin.Location)!;
+            string newPath = Path.GetDirectoryName(this.Location)!;
             Environment.SetEnvironmentVariable("PATH", $"{path};{newPath}");
             #endif
 
diff --git a/XIVChatPlugin/XIVChat.yaml b/XIVChatPlugin/XIVChat.yaml
index b7c3450..6f666d3 100644
--- a/XIVChatPlugin/XIVChat.yaml
+++ b/XIVChatPlugin/XIVChat.yaml
@@ -1,5 +1,6 @@
 author: ascclemens
 name: XIVChat Server
+punchline: Use chat away from the game.
 description: |-
   XIVChat is a suite of software allowing you to use FFXIV's chat from
   different devices. This is the server component required to do so.
diff --git a/XIVChatPlugin/XIVChatPlugin.csproj b/XIVChatPlugin/XIVChatPlugin.csproj
index 3bd483d..cc03a21 100644
--- a/XIVChatPlugin/XIVChatPlugin.csproj
+++ b/XIVChatPlugin/XIVChatPlugin.csproj
@@ -2,35 +2,45 @@
     <PropertyGroup>
         <RootNamespace>XIVChatPlugin</RootNamespace>
         <AssemblyName>XIVChat</AssemblyName>
-        <TargetFramework>net5-windows</TargetFramework>
+        <TargetFramework>net6-windows</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <Version>1.7.2</Version>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
         <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
     </PropertyGroup>
+    <PropertyGroup>
+        <DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev</DalamudLibPath>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
+        <DalamudLibPath>$(DALAMUD_HOME)</DalamudLibPath>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(IsCI)' == 'true'">
+        <DalamudLibPath>$(HOME)/dalamud</DalamudLibPath>
+    </PropertyGroup>
     <ItemGroup>
         <Reference Include="Dalamud">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\Dalamud.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="FFXIVClientStructs">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\FFXIVClientStructs.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="ImGui.NET">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\ImGui.NET.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Lumina">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\Lumina.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Lumina.Excel">
-            <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\Lumina.Excel.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="PeepingTom.Ipc">
@@ -39,12 +49,13 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="DalamudLinter" Version="1.0.3"/>
-        <PackageReference Include="DalamudPackager" Version="2.1.6"/>
-        <PackageReference Include="MessagePack" Version="2.3.85"/>
-        <PackageReference Include="Sodium.Core" Version="1.2.3"/>
+        <PackageReference Include="DalamudPackager" Version="2.1.8"/>
+        <PackageReference Include="MessagePack" Version="2.4.35"/>
+        <PackageReference Include="PeepingTom.Ipc" Version="1.0.0"/>
+        <PackageReference Include="Sodium.Core" Version="1.3.1"/>
         <PackageReference Include="System.Threading.Channels" Version="6.0.0"/>
         <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1"/>
-        <PackageReference Include="XivCommon" Version="5.0.1-alpha.1"/>
+        <PackageReference Include="XivCommon" Version="6.0.2"/>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\XIVChatCommon\XIVChatCommon.csproj"/>
@@ -53,7 +64,4 @@
         <Copy SourceFiles="Resources\lib\libsodium.dll" DestinationFolder="$(OutDir)"/>
         <Copy SourceFiles="Resources\lib\xivchat_native_tools.dll" DestinationFolder="$(OutDir)"/>
     </Target>
-    <ItemGroup>
-        <Content Include="Resources\icon.png" Link="images/icon.png" CopyToOutputDirectory="PreserveNewest" Visible="false"/>
-    </ItemGroup>
 </Project>
diff --git a/XIVChatPlugin/packages.lock.json b/XIVChatPlugin/packages.lock.json
new file mode 100644
index 0000000..2a902c7
--- /dev/null
+++ b/XIVChatPlugin/packages.lock.json
@@ -0,0 +1,98 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net6.0-windows7.0": {
+      "DalamudLinter": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "yODrbT8F73JJsvC3UbQ+Cn+huhH4TEYvlunjKUUed2SHBhGDJrkV8l21Xe9GMut4ZauPvySgYWUigX/msAAEag=="
+      },
+      "DalamudPackager": {
+        "type": "Direct",
+        "requested": "[2.1.8, )",
+        "resolved": "2.1.8",
+        "contentHash": "YqagNXs9InxmqkXzq7kLveImxnodkBEicAhydMXVp7dFjC7xb76U6zGgAax4/BWIWfZeWzr5DJyQSev31kj81A=="
+      },
+      "MessagePack": {
+        "type": "Direct",
+        "requested": "[2.4.35, )",
+        "resolved": "2.4.35",
+        "contentHash": "sWyuByDues5fXghrCXXt5BSiqsQSjFWC+srBU97iwWWCV3JhiI3HoML5/Uj4zK9yD8pnAk2oobuuvwYfHhUruA==",
+        "dependencies": {
+          "MessagePack.Annotations": "2.4.35",
+          "Microsoft.NET.StringTools": "1.0.0"
+        }
+      },
+      "PeepingTom.Ipc": {
+        "type": "Direct",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "u6lb0mLBbqGdKvafYGyh4yqEO5rZulCBTAaVvfV2h5+OYX20bw44eUeIbVJTc2TinUXezE8dON/0igwFzYHAZw=="
+      },
+      "Sodium.Core": {
+        "type": "Direct",
+        "requested": "[1.3.1, )",
+        "resolved": "1.3.1",
+        "contentHash": "l5dzW/cmWOKxIqKGy8DAdOlOkDNsRyMZA+CcTbZ4JzhHbHjZ4f9sGH88zOhRnk/yUPvybjCnRLbXzCaALRpm0Q==",
+        "dependencies": {
+          "libsodium": "1.0.18.2"
+        }
+      },
+      "System.Threading.Channels": {
+        "type": "Direct",
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
+      },
+      "WebSocketSharp-netstandard": {
+        "type": "Direct",
+        "requested": "[1.0.1, )",
+        "resolved": "1.0.1",
+        "contentHash": "knoinAv31vbdxXdypnzN2MPX5hyntVLWceq6OdWRXkr9zzqp/RWbxSuLFGbkW8De1061URgNAN43BUTlgMx1CA=="
+      },
+      "XivCommon": {
+        "type": "Direct",
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "C/GnQ61iO0yEpf8LPixU3tCThar1MWUiBkO8gdZHNtVskg8AvFeuIxk7Zmkf2yeAJ0drR/KOTdSS7GpbsgmoaQ=="
+      },
+      "libsodium": {
+        "type": "Transitive",
+        "resolved": "1.0.18.2",
+        "contentHash": "flArHoVdscSzyV8ZdPV+bqqY2TTFlaN+xZf/vIqsmHI51KVcD/mOdUPaK3n/k/wGKz8dppiktXUqSmf3AXFgig=="
+      },
+      "MessagePack.Annotations": {
+        "type": "Transitive",
+        "resolved": "2.4.35",
+        "contentHash": "6wfQ3Law5TMPeMm/HpYpMLal5HzEj70QFmbXWzHJjRsxF+nEol8RP3mqGUIctN9pItdtKCpbrpP8iEpSCkORCA=="
+      },
+      "Microsoft.NET.StringTools": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "ZYVcoDM0LnSyT5nWoRGfShYdOecCw2sOXWwP6j1Z0u48Xq3+BVvZ+EiPCX9/8Gz439giW+O1H1kWF9Eb/w6rVg==",
+        "dependencies": {
+          "System.Memory": "4.5.4",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
+        }
+      },
+      "System.Memory": {
+        "type": "Transitive",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
+      },
+      "System.Runtime.CompilerServices.Unsafe": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "xivchatcommon": {
+        "type": "Project",
+        "dependencies": {
+          "MessagePack": "2.4.35",
+          "Sodium.Core": "1.3.1"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file