Merge branch 'develop' into stable

build/common.targets

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!--set general build properties -->
-    <Version>3.12.4</Version>
+    <Version>3.12.5</Version>
     <Product>SMAPI</Product>
     <LangVersion>latest</LangVersion>
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>

docs/release-notes.md

@@ -1,6 +1,11 @@
 ← [README](README.md)
 
 # Release notes
+## 3.12.5
+Released 26 August 2021 for Stardew Valley 1.5.4 or later.
+
+* Fixed some mods in unofficial 64-bit mode no longer loading after SMAPI 3.12.3.
+
 ## 3.12.4
 Released 25 August 2021 for Stardew Valley 1.5.4 or later.
 

src/SMAPI.Mods.ConsoleCommands/manifest.json

@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "3.12.4",
+    "Version": "3.12.5",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "3.12.4"
+    "MinimumApiVersion": "3.12.5"
 }

src/SMAPI.Mods.ErrorHandler/manifest.json

@@ -1,9 +1,9 @@
 {
     "Name": "Error Handler",
     "Author": "SMAPI",
-    "Version": "3.12.4",
+    "Version": "3.12.5",
     "Description": "Handles some common vanilla errors to log more useful info or avoid breaking the game.",
     "UniqueID": "SMAPI.ErrorHandler",
     "EntryDll": "ErrorHandler.dll",
-    "MinimumApiVersion": "3.12.4"
+    "MinimumApiVersion": "3.12.5"
 }

src/SMAPI.Mods.SaveBackup/manifest.json

@@ -1,9 +1,9 @@
 {
     "Name": "Save Backup",
     "Author": "SMAPI",
-    "Version": "3.12.4",
+    "Version": "3.12.5",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "3.12.4"
+    "MinimumApiVersion": "3.12.5"
 }

src/SMAPI/Constants.cs

@@ -62,7 +62,7 @@ internal static class EarlyConstants
         internal static int? LogScreenId { get; set; }
 
         /// <summary>SMAPI's current raw semantic version.</summary>
-        internal static string RawApiVersion = "3.12.4";
+        internal static string RawApiVersion = "3.12.5";
     }
 
     /// <summary>Contains SMAPI's constants and assumptions.</summary>

src/SMAPI/Framework/SCore.cs

@@ -1708,16 +1708,6 @@ private bool TryLoadMod(IModMetadata mod, IModMetadata[] mods, AssemblyLoader as
                 IManifest manifest = mod.Manifest;
                 string assemblyPath = Path.Combine(mod.DirectoryPath, manifest.EntryDll);
 
-                // assert 64-bit
-#if SMAPI_FOR_WINDOWS_64BIT_HACK
-                if (!EnvironmentUtility.Is64BitAssembly(assemblyPath))
-                {
-                    errorReasonPhrase = "it needs to be updated for 64-bit mode.";
-                    failReason = ModFailReason.LoadFailed;
-                    return false;
-                }
-#endif
-
                 // load mod
                 Assembly modAssembly;
                 try
@@ -1741,6 +1731,10 @@ private bool TryLoadMod(IModMetadata mod, IModMetadata[] mods, AssemblyLoader as
                 catch (Exception ex)
                 {
                     errorReasonPhrase = "its DLL couldn't be loaded.";
+#if SMAPI_FOR_WINDOWS_64BIT_HACK
+                    if (!EnvironmentUtility.Is64BitAssembly(assemblyPath))
+                        errorReasonPhrase = "it needs to be updated for 64-bit mode.";
+#endif
                     errorDetails = $"Error: {ex.GetLogSummary()}";
                     failReason = ModFailReason.LoadFailed;
                     return false;