From 222183c651c5b5d9e402db1b8009e2e0a0681b06 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 4 Apr 2021 11:37:11 -0400
Subject: standardize spelling of 'macOS'

---
 src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.Toolkit/Framework/GameScanning')

diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index 785daba3..d18a2204 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -82,7 +82,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
                             ? $"{home}/.steam/steam/steamapps/common/Stardew Valley"
                             : $"{home}/.local/share/Steam/steamapps/common/Stardew Valley";
 
-                        // Mac
+                        // macOS
                         yield return "/Applications/Stardew Valley.app/Contents/MacOS";
                         yield return $"{home}/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS";
                     }
-- 
cgit 


From 47a806533b9fbcfe3fc771316283a7734702baae Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 23 Apr 2021 02:05:14 -0400
Subject: add 64-bit support to the SMAPI installer (#767)

---
 src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework/GameScanning')

diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index d18a2204..c90fc1d3 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -20,9 +20,6 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
         /// <summary>The current OS.</summary>
         private readonly Platform Platform;
 
-        /// <summary>The name of the Stardew Valley executable.</summary>
-        private readonly string ExecutableName;
-
 
         /*********
         ** Public methods
@@ -31,7 +28,6 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
         public GameScanner()
         {
             this.Platform = EnvironmentUtility.DetectPlatform();
-            this.ExecutableName = EnvironmentUtility.GetExecutableName(this.Platform);
         }
 
         /// <summary>Find all valid Stardew Valley install folders.</summary>
@@ -58,7 +54,12 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
         /// <param name="dir">The folder to check.</param>
         public bool LooksLikeGameFolder(DirectoryInfo dir)
         {
-            return dir.Exists && dir.EnumerateFiles(this.ExecutableName).Any();
+            return
+                dir.Exists
+                && (
+                    dir.EnumerateFiles("StardewValley.exe").Any()
+                    || dir.EnumerateFiles("Stardew Valley.exe").Any()
+                );
         }
 
 
-- 
cgit