Merge branch 'develop' into stable

Pathoschild · Nov 19, 2018 · 4cd9eda · 4cd9eda
2 parents 593723b + 5de8146
commit 4cd9eda
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/build/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("SMAPI")]
-[assembly: AssemblyVersion("2.8.1")]
-[assembly: AssemblyFileVersion("2.8.1")]
+[assembly: AssemblyVersion("2.8.2")]
+[assembly: AssemblyFileVersion("2.8.2")]
diff --git a/build/lib/System.Numerics.dll b/build/lib/System.Numerics.dll
diff --git a/build/lib/System.Runtime.Caching.dll b/build/lib/System.Runtime.Caching.dll
diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets
@@ -7,7 +7,8 @@
   -->
   <Target Name="AfterBuild">
     <PropertyGroup>
-      <CompiledRootPath>$(SolutionDir)\..\bin\$(Configuration)</CompiledRootPath>
+      <RootPath>$(SolutionDir)\..</RootPath>
+      <CompiledRootPath>$(RootPath)\bin\$(Configuration)</CompiledRootPath>
       <CompiledSmapiPath>$(CompiledRootPath)\SMAPI</CompiledSmapiPath>
       <CompiledToolkitPath>$(CompiledRootPath)\SMAPI.Toolkit\net4.5</CompiledToolkitPath>
       <PackagePath>$(SolutionDir)\..\bin\SMAPI installer</PackagePath>
@@ -53,6 +54,10 @@
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
 
+    <!-- fix errors on Linux/Mac (sample: https://log.smapi.io/mMdFUpgB) -->
+    <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
+    <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
+
     <!-- fix Linux/Mac permissions -->
     <Exec Condition="$(OS) != 'Windows_NT'" Command="chmod 755 &quot;$(PackagePath)\install on Linux.sh&quot;" />
     <Exec Condition="$(OS) != 'Windows_NT'" Command="chmod 755 &quot;$(PackagePath)\install on Mac.command&quot;" />

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,4 +1,7 @@
 # Release notes
+## 2.8.2
+* Fixed game crash in MacOS since SMAPI 2.8.
+
 ## 2.8.1
 * Fixed installer error on Windows.
 

diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -5,5 +5,5 @@
   "Description": "Adds SMAPI console commands that let you manipulate the game.",
   "UniqueID": "SMAPI.ConsoleCommands",
   "EntryDll": "ConsoleCommands.dll",
-  "MinimumApiVersion": "2.8.1"
+  "MinimumApiVersion": "2.8.2"
 }
diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json
@@ -5,5 +5,5 @@
   "Description": "Automatically backs up all your saves once per day into its folder.",
   "UniqueID": "SMAPI.SaveBackup",
   "EntryDll": "SaveBackup.dll",
-  "MinimumApiVersion": "2.8.1"
+  "MinimumApiVersion": "2.8.2"
 }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
@@ -29,7 +29,7 @@ public static class Constants
         ** Public
         ****/
         /// <summary>SMAPI's current semantic version.</summary>
-        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.8.1");
+        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.8.2");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.3.32");