Merge branch 'develop' into stable

7 files changed, 46 insertions, 34 deletions

diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
index ecac30bf..d1296dbe 100644
--- a/src/SMAPI.Mods.ConsoleCommands/manifest.json
+++ b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "3.17.1",
+    "Version": "3.17.2",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "3.17.1"
+    "MinimumApiVersion": "3.17.2"
 }
diff --git a/src/SMAPI.Mods.ErrorHandler/manifest.json b/src/SMAPI.Mods.ErrorHandler/manifest.json
index 3d708876..c3757e8f 100644
--- a/src/SMAPI.Mods.ErrorHandler/manifest.json
+++ b/src/SMAPI.Mods.ErrorHandler/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Error Handler",
     "Author": "SMAPI",
-    "Version": "3.17.1",
+    "Version": "3.17.2",
     "Description": "Handles some common vanilla errors to log more useful info or avoid breaking the game.",
     "UniqueID": "SMAPI.ErrorHandler",
     "EntryDll": "ErrorHandler.dll",
-    "MinimumApiVersion": "3.17.1"
+    "MinimumApiVersion": "3.17.2"
 }
diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json
index c2bf5f05..78821a3e 100644
--- a/src/SMAPI.Mods.SaveBackup/manifest.json
+++ b/src/SMAPI.Mods.SaveBackup/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Save Backup",
     "Author": "SMAPI",
-    "Version": "3.17.1",
+    "Version": "3.17.2",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "3.17.1"
+    "MinimumApiVersion": "3.17.2"
 }
diff --git a/src/SMAPI.Tests/SMAPI.Tests.csproj b/src/SMAPI.Tests/SMAPI.Tests.csproj
index 2c32a932..597cd7dd 100644
--- a/src/SMAPI.Tests/SMAPI.Tests.csproj
+++ b/src/SMAPI.Tests/SMAPI.Tests.csproj
@@ -19,6 +19,7 @@
     <PackageReference Include="Moq" Version="4.18.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index 1d518738..88142805 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -261,39 +261,50 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
         /// <returns>The game directory, if found.</returns>
         private string? GetPathFromSteamLibrary(string? steamPath)
         {
-            if (steamPath == null)
-                return null;
-
-            // get .vdf file path
-            string libraryFoldersPath = Path.Combine(steamPath.Replace('/', '\\'), "steamapps\\libraryfolders.vdf");
-            if (!File.Exists(libraryFoldersPath))
-                return null;
-
-            // read data
-            using FileStream fileStream = File.OpenRead(libraryFoldersPath);
-            VdfDeserializer deserializer = new();
-            dynamic libraries = deserializer.Deserialize(fileStream);
-            if (libraries?.libraryfolders is null)
-                return null;
-
-            // get path from Stardew Valley app (if any)
-            foreach (dynamic pair in libraries.libraryfolders)
+            try
             {
-                dynamic library = pair.Value;
-
-                foreach (dynamic app in library.apps)
+                if (steamPath == null)
+                    return null;
+
+                // get .vdf file path
+                string libraryFoldersPath = Path.Combine(steamPath.Replace('/', '\\'), "steamapps\\libraryfolders.vdf");
+                if (!File.Exists(libraryFoldersPath))
+                    return null;
+
+                // read data
+                using FileStream fileStream = File.OpenRead(libraryFoldersPath);
+                VdfDeserializer deserializer = new();
+                dynamic libraries = deserializer.Deserialize(fileStream);
+                if (libraries?.libraryfolders is null)
+                    return null;
+
+                // get path from Stardew Valley app (if any)
+                foreach (dynamic pair in libraries.libraryfolders)
                 {
-                    string key = app.Key;
-                    if (key == GameScanner.SteamAppId)
+                    dynamic library = pair.Value;
+
+                    foreach (dynamic app in library.apps)
                     {
-                        string path = library.path;
+                        string key = app.Key;
+                        if (key == GameScanner.SteamAppId)
+                        {
+                            string path = library.path;
 
-                        return Path.Combine(path.Replace("\\\\", "\\"), "steamapps", "common", "Stardew Valley");
+                            return Path.Combine(path.Replace("\\\\", "\\"), "steamapps", "common", "Stardew Valley");
+                        }
                     }
                 }
-            }
 
-            return null;
+                return null;
+            }
+            catch
+            {
+                // The file might not be parseable in some cases (e.g. some players have an older Steam version using
+                // a different format). Ideally we'd log an error to know when it's actually an issue, but the SMAPI
+                // installer doesn't have a logging mechanism (and third-party code calling the toolkit may not either).
+                // So for now, just ignore the error and fallback to the other discovery mechanisms.
+                return null;
+            }
         }
 #endif
     }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index ea41a4ee..77900ca6 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -52,7 +52,7 @@ namespace StardewModdingAPI
         internal static int? LogScreenId { get; set; }
 
         /// <summary>SMAPI's current raw semantic version.</summary>
-        internal static string RawApiVersion = "3.17.1";
+        internal static string RawApiVersion = "3.17.2";
     }
 
     /// <summary>Contains SMAPI's constants and assumptions.</summary>
diff --git a/src/SMAPI/Framework/Content/AssetDataForImage.cs b/src/SMAPI/Framework/Content/AssetDataForImage.cs
index 241c09a8..7c8cc6a8 100644
--- a/src/SMAPI/Framework/Content/AssetDataForImage.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForImage.cs
@@ -192,7 +192,7 @@ namespace StardewModdingAPI.Framework.Content
                 int topOffset = startIndex / sourceArea.Width;
                 int bottomOffset = endIndex / sourceArea.Width;
 
-                targetArea = new(targetArea.X, targetArea.Y + topOffset, targetArea.Width, bottomOffset - topOffset + 1);
+                targetArea = new(targetArea.X, targetArea.Y + topOffset - startRow, targetArea.Width, bottomOffset - topOffset + 1);
                 pixelCount = targetArea.Width * targetArea.Height;
                 sourceOffset = topOffset * sourceArea.Width;
             }