From 832652027a8bd9b01e3c612b086a1be20d09516e Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Sun, 21 Aug 2022 15:36:03 -0400
Subject: [PATCH] chore: update for net6 and api7

---
 TheGreatSeparator/TheGreatSeparator.csproj | 21 +++++++++++++--------
 TheGreatSeparator/TheGreatSeparator.yaml   |  1 +
 TheGreatSeparator/packages.lock.json       | 13 +++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 TheGreatSeparator/packages.lock.json

diff --git a/TheGreatSeparator/TheGreatSeparator.csproj b/TheGreatSeparator/TheGreatSeparator.csproj
index 2aaf989..69deb26 100755
--- a/TheGreatSeparator/TheGreatSeparator.csproj
+++ b/TheGreatSeparator/TheGreatSeparator.csproj
@@ -1,40 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net5-windows</TargetFramework>
+        <TargetFramework>net6-windows</TargetFramework>
         <Version>1.2.3</Version>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     </PropertyGroup>
 
     <PropertyGroup>
-        <Dalamud>$(AppData)\XIVLauncher\addon\Hooks\dev</Dalamud>
+        <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'">
-        <Dalamud>$(HOME)/dalamud</Dalamud>
+        <DalamudLibPath>$(HOME)/dalamud</DalamudLibPath>
     </PropertyGroup>
 
     <ItemGroup>
         <Reference Include="Dalamud">
-            <HintPath>$(Dalamud)\Dalamud.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\Dalamud.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="FFXIVClientStructs">
-            <HintPath>$(Dalamud)\FFXIVClientStructs.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\FFXIVClientStructs.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="ImGui.NET">
-            <HintPath>$(Dalamud)\ImGui.NET.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\ImGui.NET.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="ImGuiScene">
-            <HintPath>$(Dalamud)\ImGuiScene.dll</HintPath>
+            <HintPath>$(DalamudLibPath)\ImGuiScene.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="DalamudPackager" Version="2.1.6"/>
+        <PackageReference Include="DalamudPackager" Version="2.1.7"/>
     </ItemGroup>
 </Project>
diff --git a/TheGreatSeparator/TheGreatSeparator.yaml b/TheGreatSeparator/TheGreatSeparator.yaml
index e5fb25a..a9c798b 100755
--- a/TheGreatSeparator/TheGreatSeparator.yaml
+++ b/TheGreatSeparator/TheGreatSeparator.yaml
@@ -9,3 +9,4 @@ description: |-
   - Ability costs on hotbars
   - Ability costs in tooltips
 repo_url: https://git.annaclemens.io/ascclemens/TheGreatSeparator
+dalamud_api_level: 7
diff --git a/TheGreatSeparator/packages.lock.json b/TheGreatSeparator/packages.lock.json
new file mode 100644
index 0000000..b381d57
--- /dev/null
+++ b/TheGreatSeparator/packages.lock.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net6.0-windows7.0": {
+      "DalamudPackager": {
+        "type": "Direct",
+        "requested": "[2.1.7, )",
+        "resolved": "2.1.7",
+        "contentHash": "jnZ/sdInyn07ycuWI+pPOtP/xE3v+c4+jYJfDt36FWnBF9NKqkpzfviJtPl/jGLgbaCmFIXu+Yid0N8GvdKefg=="
+      }
+    }
+  }
+}
\ No newline at end of file