Merge branch 'develop' into stable

Pathoschild · Dec 1, 2021 · 42e878e · 42e878e
2 parents 3342502 + 25ebcc1
commit 42e878e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 18 deletions.
diff --git a/build/common.targets b/build/common.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!--set general build properties -->
-    <Version>3.13.0</Version>
+    <Version>3.13.1</Version>
     <Product>SMAPI</Product>
     <LangVersion>latest</LangVersion>
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,6 +1,12 @@
 ← [README](README.md)
 
 # Release notes
+## 3.13.1
+Released 30 November 2021 for Stardew Valley 1.5.5 or later.
+
+* Improved .NET 5 validation in Windows installer to better explain how to get the right version.
+* Fixed installer failing on Windows when run from the game folder.
+
 ## 3.13.0
 Released 30 November 2021 for Stardew Valley 1.5.5 or later.
 

diff --git a/src/SMAPI.Installer/assets/windows-install.bat b/src/SMAPI.Installer/assets/windows-install.bat
@@ -1,6 +1,7 @@
 @echo off
+setlocal enabledelayedexpansion
 
-SET installerDir=%~dp0
+SET installerDir="%~dp0"
 
 REM make sure we're not running within a zip folder
 echo %installerDir% | findstr /C:"%TEMP%" 1>nul
@@ -12,23 +13,37 @@ if %ERRORLEVEL% EQU 0 (
 )
 
 REM make sure .NET 5 is installed
+SET hasNet5=1
 WHERE dotnet /q
-if %ERRORLEVEL% NEQ 0 (
-    echo Oops! You must have .NET 5 ^(desktop x64^) installed to use SMAPI: https://dotnet.microsoft.com/download/dotnet/5.0/runtime
-    echo.
-    pause
-    exit
+if !ERRORLEVEL! NEQ 0 (
+    SET hasNet5=0
+) else (
+    dotnet --info | findstr /C:"Microsoft.WindowsDesktop.App 5." 1>nul
+    if !ERRORLEVEL! NEQ 0 (
+        SET hasNet5=0
+    )
 )
-dotnet --info | findstr /C:"Microsoft.WindowsDesktop.App 5." 1>nul
-if %ERRORLEVEL% NEQ 0 (
-    echo Oops! You must have .NET 5 ^(desktop x64^) installed to use SMAPI: https://dotnet.microsoft.com/download/dotnet/5.0/runtime
+if "%hasNet5%" == "0" (
+    echo Oops! You don't have the required .NET version installed.
+    echo.
+    echo To install it:
+    echo    1. Go to https://dotnet.microsoft.com/download/dotnet/5.0/runtime
+
+    if "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
+        echo    2. Under "Run desktop apps", click "Download Arm64".
+    ) else (
+        echo    2. Under "Run desktop apps", click "Download x64".
+    )
+
+    echo    3. Run the downloaded installer.
+    echo    4. Restart your computer.
     echo.
     pause
     exit
 )
 
 REM make sure an antivirus hasn't deleted the installer DLL
-if not exist "%installerDir%internal\windows\SMAPI.Installer.dll" (
+if not exist %installerDir%"internal\windows\SMAPI.Installer.dll" (
     echo Oops! SMAPI is missing one of its files. Your antivirus might have deleted it.
     echo Missing file: %installerDir%internal\windows\SMAPI.Installer.dll
     echo.

diff --git 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.13.0",
+    "Version": "3.13.1",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "3.13.0"
+    "MinimumApiVersion": "3.13.1"
 }
diff --git 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.13.0",
+    "Version": "3.13.1",
     "Description": "Handles some common vanilla errors to log more useful info or avoid breaking the game.",
     "UniqueID": "SMAPI.ErrorHandler",
     "EntryDll": "ErrorHandler.dll",
-    "MinimumApiVersion": "3.13.0"
+    "MinimumApiVersion": "3.13.1"
 }
diff --git 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.13.0",
+    "Version": "3.13.1",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "3.13.0"
+    "MinimumApiVersion": "3.13.1"
 }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
@@ -49,7 +49,7 @@ internal static class EarlyConstants
         internal static int? LogScreenId { get; set; }
 
         /// <summary>SMAPI's current raw semantic version.</summary>
-        internal static string RawApiVersion = "3.13.0";
+        internal static string RawApiVersion = "3.13.1";
     }
 
     /// <summary>Contains SMAPI's constants and assumptions.</summary>