From 6448a1cbf34c1cf7f596221807b1c7aa98a75689 Mon Sep 17 00:00:00 2001
From: Anna Clemens <git@annaclemens.io>
Date: Sun, 15 Jan 2023 13:14:47 -0500
Subject: [PATCH] refactor: net7

---
 QuestMap/Node.cs            | 14 ++++----------
 QuestMap/QuestMap.csproj    |  8 ++++----
 QuestMap/Quests.cs          |  7 +++++--
 QuestMap/packages.lock.json | 20 ++++++++++----------
 4 files changed, 23 insertions(+), 26 deletions(-)
 mode change 100644 => 100755 QuestMap/packages.lock.json

diff --git a/QuestMap/Node.cs b/QuestMap/Node.cs
index 344a24a..a73f705 100644
--- a/QuestMap/Node.cs
+++ b/QuestMap/Node.cs
@@ -151,16 +151,10 @@ namespace QuestMap {
         }
 
         internal static IEnumerable<Quest> PreviousQuests(this Quest quest) {
-            if (quest.PreviousQuest0.Row != 0) {
-                yield return quest.PreviousQuest0.Value!;
-            }
-
-            if (quest.PreviousQuest1.Row != 0) {
-                yield return quest.PreviousQuest1.Value!;
-            }
-
-            if (quest.PreviousQuest2.Row != 0) {
-                yield return quest.PreviousQuest2.Value!;
+            foreach (var previous in quest.PreviousQuest) {
+                if (previous != null && previous.Row != 0) {
+                    yield return previous.Value!;
+                }
             }
         }
     }
diff --git a/QuestMap/QuestMap.csproj b/QuestMap/QuestMap.csproj
index 7b12d93..9b2a2fb 100755
--- a/QuestMap/QuestMap.csproj
+++ b/QuestMap/QuestMap.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6-windows</TargetFramework>
+        <TargetFramework>net7-windows</TargetFramework>
         <RootNamespace>QuestMap</RootNamespace>
         <Version>1.4.4</Version>
         <Nullable>enable</Nullable>
@@ -49,9 +49,9 @@
 
     <ItemGroup>
         <PackageReference Include="AutomaticGraphLayout" Version="1.1.12"/>
-        <PackageReference Include="DalamudPackager" Version="2.1.8"/>
-        <PackageReference Include="System.Threading.Channels" Version="6.0.0"/>
-        <PackageReference Include="XivCommon" Version="6.0.0"/>
+        <PackageReference Include="DalamudPackager" Version="2.1.10"/>
+        <PackageReference Include="System.Threading.Channels" Version="7.0.0"/>
+        <PackageReference Include="XivCommon" Version="7.0.0-alpha.1"/>
     </ItemGroup>
 
 </Project>
diff --git a/QuestMap/Quests.cs b/QuestMap/Quests.cs
index c0cb3a8..cfd887d 100644
--- a/QuestMap/Quests.cs
+++ b/QuestMap/Quests.cs
@@ -220,8 +220,8 @@ namespace QuestMap {
             }
 
             var name = quest.RowId switch {
-                66060 => "A Realm Reborn (2.0)",
-                69414 => "A Realm Awoken (2.1)",
+                70058 => "A Realm Reborn (2.0)",
+                66729 => "A Realm Awoken (2.1)",
                 66899 => "Through the Maelstrom (2.2)",
                 66996 => "Defenders of Eorzea (2.3)",
                 65625 => "Dreams of Ice (2.4)",
@@ -249,6 +249,9 @@ namespace QuestMap {
                 69599 => "Death Unto Dawn - Part 1 (5.5)",
                 69602 => "Death Unto Dawn - Part 2 (5.55)",
                 70000 => "Endwalker (6.0)",
+                70062 => "Newfound Adventure (6.1)",
+                70136 => "Buried Memory (6.2)",
+                70214 => "Gods Revel, Lands Tremble (6.3)",
                 _ => null,
             };
 
diff --git a/QuestMap/packages.lock.json b/QuestMap/packages.lock.json
old mode 100644
new mode 100755
index 4d41e5f..73ad707
--- a/QuestMap/packages.lock.json
+++ b/QuestMap/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0-windows7.0": {
+    "net7.0-windows7.0": {
       "AutomaticGraphLayout": {
         "type": "Direct",
         "requested": "[1.1.12, )",
@@ -10,21 +10,21 @@
       },
       "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=="
       },
       "System.Threading.Channels": {
         "type": "Direct",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
+        "requested": "[7.0.0, )",
+        "resolved": "7.0.0",
+        "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA=="
       },
       "XivCommon": {
         "type": "Direct",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "8HwrC7mnkcaP+JxRoIIu9MqFElQRVL8HOr8EQ6Te+11zzvKoXTZZrZ7VWETF2CHfB+7c1v5wONZKqZJ2hETpjg=="
+        "requested": "[7.0.0-alpha.1, )",
+        "resolved": "7.0.0-alpha.1",
+        "contentHash": "4Yy4Wg3bnI/g9BSEYAqOZALmVMJZS0wcP847VlUIThBqIS/47O6tw2BI84he4KuPSTfIsYOzrcz3vAia8+Pn3g=="
       }
     }
   }