From 807dcfec7723156a36524d5f1889b5f3208d97cf Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Wed, 4 Aug 2021 18:02:15 -0400 Subject: undo Constants.Save* changes in 3.12.1 --- docs/release-notes.md | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/release-notes.md') diff --git a/docs/release-notes.md b/docs/release-notes.md index 16744b24..25a0b4fa 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,6 +1,14 @@ ← [README](README.md) # Release notes +## Upcoming release +* For players: + * Fixed error creating a new save or joining a multiplayer world in 3.12.1. + +* For mod authors: + * Reversed the `Constants.Save*` fix in SMAPI 3.12.1. + _The change caused a number of other issues, and was only needed for edge cases where the save folder was invalid._ + ## 3.12.1 Released 03 August 2021 for Stardew Valley 1.5.4 or later. -- cgit From b6f3ecc143b3a76240775fe75c9b7b643433bbe5 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Wed, 4 Aug 2021 18:05:05 -0400 Subject: fix error when error-handling invalid ReflectionTypeLoadException errors --- docs/release-notes.md | 1 + src/SMAPI.Internal/ExceptionExtensions.cs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'docs/release-notes.md') diff --git a/docs/release-notes.md b/docs/release-notes.md index 25a0b4fa..9075a471 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -8,6 +8,7 @@ * For mod authors: * Reversed the `Constants.Save*` fix in SMAPI 3.12.1. _The change caused a number of other issues, and was only needed for edge cases where the save folder was invalid._ + * Fixed `NullReferenceException` in SMAPI's error-handling when trying to handle an invalid `ReflectionTypeLoadException`. ## 3.12.1 Released 03 August 2021 for Stardew Valley 1.5.4 or later. diff --git a/src/SMAPI.Internal/ExceptionExtensions.cs b/src/SMAPI.Internal/ExceptionExtensions.cs index d7a2252b..5f1ee1fa 100644 --- a/src/SMAPI.Internal/ExceptionExtensions.cs +++ b/src/SMAPI.Internal/ExceptionExtensions.cs @@ -19,9 +19,9 @@ namespace StardewModdingAPI.Internal return $"Failed loading type '{ex.TypeName}': {exception}"; case ReflectionTypeLoadException ex: - string summary = exception.ToString(); - foreach (Exception childEx in ex.LoaderExceptions) - summary += $"\n\n{childEx.GetLogSummary()}"; + string summary = ex.ToString(); + foreach (Exception childEx in ex.LoaderExceptions ?? new Exception[0]) + summary += $"\n\n{childEx?.GetLogSummary()}"; return summary; default: -- cgit From b6e058c322f3b904a047ba09cb1701a1bb812e47 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Wed, 4 Aug 2021 18:34:29 -0400 Subject: prepare for release --- build/common.targets | 2 +- docs/release-notes.md | 8 +++++--- src/SMAPI.Mods.ConsoleCommands/manifest.json | 4 ++-- src/SMAPI.Mods.ErrorHandler/manifest.json | 4 ++-- src/SMAPI.Mods.SaveBackup/manifest.json | 4 ++-- src/SMAPI/Constants.cs | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) (limited to 'docs/release-notes.md') diff --git a/build/common.targets b/build/common.targets index f2614998..498ec7af 100644 --- a/build/common.targets +++ b/build/common.targets @@ -1,7 +1,7 @@ - 3.12.1 + 3.12.2 SMAPI latest $(AssemblySearchPaths);{GAC} diff --git a/docs/release-notes.md b/docs/release-notes.md index 9075a471..4e9dacbf 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,13 +1,15 @@ ← [README](README.md) # Release notes -## Upcoming release +## 3.12.2 +Released 04 August 2021 for Stardew Valley 1.5.4 or later. + * For players: * Fixed error creating a new save or joining a multiplayer world in 3.12.1. * For mod authors: - * Reversed the `Constants.Save*` fix in SMAPI 3.12.1. - _The change caused a number of other issues, and was only needed for edge cases where the save folder was invalid._ + * Reverted the `Constants.Save*` fix in SMAPI 3.12.1. + _The change caused a number of other issues, and is only needed for rare cases where the save folder was invalid. This may be revisited in a future version instead._ * Fixed `NullReferenceException` in SMAPI's error-handling when trying to handle an invalid `ReflectionTypeLoadException`. ## 3.12.1 diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json index 7023180b..6b49cd5f 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.12.1", + "Version": "3.12.2", "Description": "Adds SMAPI console commands that let you manipulate the game.", "UniqueID": "SMAPI.ConsoleCommands", "EntryDll": "ConsoleCommands.dll", - "MinimumApiVersion": "3.12.1" + "MinimumApiVersion": "3.12.2" } diff --git a/src/SMAPI.Mods.ErrorHandler/manifest.json b/src/SMAPI.Mods.ErrorHandler/manifest.json index 8aa2a6a4..7759d1d5 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.12.1", + "Version": "3.12.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.12.1" + "MinimumApiVersion": "3.12.2" } diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json index dbd65cbe..1e5b8b97 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.12.1", + "Version": "3.12.2", "Description": "Automatically backs up all your saves once per day into its folder.", "UniqueID": "SMAPI.SaveBackup", "EntryDll": "SaveBackup.dll", - "MinimumApiVersion": "3.12.1" + "MinimumApiVersion": "3.12.2" } diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs index c3105202..6cbdeb8e 100644 --- a/src/SMAPI/Constants.cs +++ b/src/SMAPI/Constants.cs @@ -61,7 +61,7 @@ namespace StardewModdingAPI internal static int? LogScreenId { get; set; } /// SMAPI's current raw semantic version. - internal static string RawApiVersion = "3.12.1"; + internal static string RawApiVersion = "3.12.2"; } /// Contains SMAPI's constants and assumptions. -- cgit