Updated for DIP17

PunishedPineapple · Aug 1, 2022 · 514fc58 · 514fc58
1 parent 67a1a4d
commit 514fc58
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/WaymarkPresetPlugin/WaymarkPresetPlugin.csproj b/WaymarkPresetPlugin/WaymarkPresetPlugin.csproj
@@ -26,39 +26,44 @@
 	<ItemGroup>
 		<PackageReference Include="DalamudPackager" Version="2.1.7" />
 	</ItemGroup>
-
+
+	<PropertyGroup>
+		<DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
+		<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<Reference Include="Dalamud">
 			<Private>false</Private>
-			<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
+			<HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
 		</Reference>
 		<Reference Include="Newtonsoft.Json">
 			<Private>false</Private>
-			<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
+			<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
 		</Reference>
 		<Reference Include="ImGui.NET">
 			<Private>false</Private>
-			<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
+			<HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
 		</Reference>
 		<Reference Include="ImGuiScene">
 			<Private>false</Private>
-			<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll</HintPath>
+			<HintPath>$(DalamudLibPath)ImGuiScene.dll</HintPath>
 		</Reference>
 		<Reference Include="Lumina">
 			<Private>false</Private>
-			<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
+			<HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
 		</Reference>
 		<Reference Include="Lumina.Excel">
 			<Private>false</Private>
-			<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
+			<HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
 		</Reference>
 		<Reference Include="FFXIVClientStructs">
 			<Private>false</Private>
-			<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
+			<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
 		</Reference>
 		<Reference Include="CheapLoc">
 			<Private>false</Private>
-			<HintPath>$(APPDATA)\XIVLauncher\addon\Hooks\dev\CheapLoc.dll</HintPath>
+			<HintPath>$(DalamudLibPath)CheapLoc.dll</HintPath>
 		</Reference>
 	</ItemGroup>
 

diff --git a/WaymarkPresetPlugin/packages.lock.json b/WaymarkPresetPlugin/packages.lock.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net5.0-windows7.0": {
+      "DalamudPackager": {
+        "type": "Direct",
+        "requested": "[2.1.7, )",
+        "resolved": "2.1.7",
+        "contentHash": "jnZ/sdInyn07ycuWI+pPOtP/xE3v+c4+jYJfDt36FWnBF9NKqkpzfviJtPl/jGLgbaCmFIXu+Yid0N8GvdKefg=="
+      }
+    }
+  }
+}