Update to .net7

electr0sheep · Jan 16, 2023 · 9aa833d · 9aa833d
1 parent eae7408
commit 9aa833d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 32 deletions.
diff --git a/ItemVendorLocation.sln b/ItemVendorLocation.sln
@@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DebugOnly", "UIDev\DebugOnly.csproj", "{0C0CB73D-5844-418E-87E6-71A3ED95673A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,13 +27,6 @@ Global
 		{087565F1-A049-47C8-A870-AB79528EF82D}.Release|Any CPU.Build.0 = Release|x64
 		{087565F1-A049-47C8-A870-AB79528EF82D}.Release|x64.ActiveCfg = Release|x64
 		{087565F1-A049-47C8-A870-AB79528EF82D}.Release|x64.Build.0 = Release|x64
-		{0C0CB73D-5844-418E-87E6-71A3ED95673A}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{0C0CB73D-5844-418E-87E6-71A3ED95673A}.Debug|Any CPU.Build.0 = Debug|x64
-		{0C0CB73D-5844-418E-87E6-71A3ED95673A}.Debug|x64.ActiveCfg = Debug|x64
-		{0C0CB73D-5844-418E-87E6-71A3ED95673A}.Debug|x64.Build.0 = Debug|x64
-		{0C0CB73D-5844-418E-87E6-71A3ED95673A}.Release|Any CPU.ActiveCfg = Release|x64
-		{0C0CB73D-5844-418E-87E6-71A3ED95673A}.Release|x64.ActiveCfg = Release|x64
-		{0C0CB73D-5844-418E-87E6-71A3ED95673A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ItemVendorLocation/ItemVendorLocation.csproj b/ItemVendorLocation/ItemVendorLocation.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Authors>electr0sheep</Authors>
 		<Company></Company>
-		<Version>1.0.0.2</Version>
+		<Version>1.0.0.3</Version>
 		<Description>XIV Launcher plugin for item vendors</Description>
 		<Copyright></Copyright>
 		<PackageProjectUrl></PackageProjectUrl>
@@ -12,18 +12,18 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net7.0-windows</TargetFramework>
 		<Platforms>x64</Platforms>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<OutputPath>bin\Debug\</OutputPath>
+		<OutputPath>bin\$(Configuration)\</OutputPath>
 		<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 	</PropertyGroup>
 
-	<ItemGroup>
+		<ItemGroup>
 		<Content Include="..\ItemVendorLocation\ItemVendorLocation.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
@@ -38,11 +38,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Dalamud.ContextMenu" Version="1.2.1" />
-		<PackageReference Include="Dalamud.DrunkenToad" Version="1.2.1" />
-		<PackageReference Include="DalamudPackager" Version="2.1.8" />
-		<PackageReference Include="ILRepack" Version="2.0.18" />
-		<PackageReference Include="XivCommon" Version="6.0.2" />
+	  <PackageReference Include="Dalamud.ContextMenu" Version="1.2.1" />
+	  <PackageReference Include="Dalamud.DrunkenToad" Version="1.5.6" />
+	  <PackageReference Include="DalamudPackager" Version="2.1.10" />
+	  <PackageReference Include="ILRepack" Version="2.0.18" />
+		<PackageReference Include="XivCommon" Version="7.0.0-alpha.1" />
 		<Reference Include="FFXIVClientStructs">
 			<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
 			<Private>false</Private>

diff --git a/ItemVendorLocation/ItemVendorLocation.json b/ItemVendorLocation/ItemVendorLocation.json
@@ -1,7 +1,5 @@
 {
-  "ApplicableVersion": "any",
   "Author": "electr0sheep",
-  "DalamudApiLevel": 7,
   "Description": "Adds a context menu option for items that will show you where to find items you can buy off a vendor",
   "InternalName": "itemVendorLocation",
   "Name": "Item Vendor Location",

diff --git a/ItemVendorLocation/Plugin.cs b/ItemVendorLocation/Plugin.cs
@@ -363,13 +363,14 @@ private void OpenContextMenuOverride(GameObjectContextMenuOpenArgs args)
             {
                 case "ChatLog":
                 case "DailyQuestSupply":
+                case "HousingGoods":
                 case "ItemSearch":
+                case "Journal":
+                case "RecipeMaterialList":
                 case "RecipeNote":
                 case "ShopExchangeItem":
                 case "ShopExchangeItemDialog":
-                case "Journal":
                 case "SubmarinePartsMenu":
-                case "HousingGoods":
                     selectedItem = DataManager.GetExcelSheet<Lumina.Excel.GeneratedSheets.Item>()!.GetRow((uint)lastHoveredItem)!;
                     if (IsItemSoldByAnyVendor(selectedItem))
                     {

diff --git a/ItemVendorLocation/packages.lock.json b/ItemVendorLocation/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0-windows7.0": {
+    "net7.0-windows7.0": {
       "Dalamud.ContextMenu": {
         "type": "Direct",
         "requested": "[1.2.1, )",
@@ -10,18 +10,18 @@
       },
       "Dalamud.DrunkenToad": {
         "type": "Direct",
-        "requested": "[1.2.1, )",
-        "resolved": "1.2.1",
-        "contentHash": "kwub5Fwbtp88S+/y5Ce7fXzHGOz7ARKiu8mWbtonjRKqegOGObowUJoGZKPFDE2iTeDta8lDtNl/L5xaB9JCDw==",
+        "requested": "[1.5.6, )",
+        "resolved": "1.5.6",
+        "contentHash": "AMkUXOWliSg1I6RkmD7tEDxrpRlhnSPF3bmkynDSA4W+Mjf/Ps4+9NiUHhiiplrd+iBgWlRyT7lzs0Zj4NDETA==",
         "dependencies": {
           "LiteDB": "5.0.11"
         }
       },
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.8, )",
-        "resolved": "2.1.8",
-        "contentHash": "YqagNXs9InxmqkXzq7kLveImxnodkBEicAhydMXVp7dFjC7xb76U6zGgAax4/BWIWfZeWzr5DJyQSev31kj81A=="
+        "requested": "[2.1.10, )",
+        "resolved": "2.1.10",
+        "contentHash": "S6NrvvOnLgT4GDdgwuKVJjbFo+8ZEj+JsEYk9ojjOR/MMfv1dIFpT8aRJQfI24rtDcw1uF+GnSSMN4WW1yt7fw=="
       },
       "ILRepack": {
         "type": "Direct",
@@ -31,9 +31,9 @@
       },
       "XivCommon": {
         "type": "Direct",
-        "requested": "[6.0.2, )",
-        "resolved": "6.0.2",
-        "contentHash": "C/GnQ61iO0yEpf8LPixU3tCThar1MWUiBkO8gdZHNtVskg8AvFeuIxk7Zmkf2yeAJ0drR/KOTdSS7GpbsgmoaQ=="
+        "requested": "[7.0.0-alpha.1, )",
+        "resolved": "7.0.0-alpha.1",
+        "contentHash": "4Yy4Wg3bnI/g9BSEYAqOZALmVMJZS0wcP847VlUIThBqIS/47O6tw2BI84he4KuPSTfIsYOzrcz3vAia8+Pn3g=="
       },
       "LiteDB": {
         "type": "Transitive",