From 73321eceb96f263f10857667d7b3726a5098e770 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 17 Mar 2021 20:36:31 -0400
Subject: split compile flag into separate Windows + XNA flags (#767)

---
 .../Patches/SpriteBatchValidationPatches.cs               |  4 ++--
 .../SMAPI.Mods.ErrorHandler.csproj                        | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/SMAPI.Mods.ErrorHandler')

diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
index 95e4f5ef..f605b2ce 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
@@ -27,7 +27,7 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
 #endif
         {
             harmony.Patch(
-#if SMAPI_FOR_WINDOWS
+#if SMAPI_FOR_XNA
                 original: AccessTools.Method(typeof(SpriteBatch), "InternalDraw"),
 #else
                 original: AccessTools.Method(typeof(SpriteBatch), "CheckValid", new[] { typeof(Texture2D) }),
@@ -40,7 +40,7 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
         /*********
         ** Private methods
         *********/
-#if SMAPI_FOR_WINDOWS
+#if SMAPI_FOR_XNA
         /// <summary>The method to call instead of <see cref="SpriteBatch.InternalDraw"/>.</summary>
         /// <param name="texture">The texture to validate.</param>
 #else
diff --git a/src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj b/src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj
index 5c0cf952..e5ce8f5e 100644
--- a/src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj
+++ b/src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj
@@ -7,6 +7,8 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
+  <Import Project="..\..\build\common.targets" />
+
   <ItemGroup>
     <ProjectReference Include="..\SMAPI\SMAPI.csproj" Private="False" />
     <Reference Include="..\..\build\0Harmony.dll" Private="False" />
@@ -16,19 +18,21 @@
     <Reference Include="$(GameExecutableName)" HintPath="$(GamePath)\$(GameExecutableName).exe" Private="False" />
   </ItemGroup>
 
+  <!-- Windows only -->
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+    <Reference Include="Netcode" HintPath="$(GamePath)\Netcode.dll" Private="False" />
+  </ItemGroup>
+
+  <!-- Game framework -->
   <Choose>
-    <!-- Windows -->
-    <When Condition="$(OS) == 'Windows_NT'">
+    <When Condition="$(DefineConstants.Contains(SMAPI_FOR_XNA))">
       <ItemGroup>
-        <Reference Include="Netcode" HintPath="$(GamePath)\Netcode.dll" Private="False" />
         <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="False" />
         <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="False" />
         <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="False" />
         <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="False" />
       </ItemGroup>
     </When>
-
-    <!-- Linux/Mac -->
     <Otherwise>
       <ItemGroup>
         <Reference Include="MonoGame.Framework" HintPath="$(GamePath)\MonoGame.Framework.dll" Private="False" />
@@ -42,5 +46,4 @@
   </ItemGroup>
 
   <Import Project="..\SMAPI.Internal\SMAPI.Internal.projitems" Label="Shared" />
-  <Import Project="..\..\build\common.targets" />
 </Project>
-- 
cgit 


From ca67dcc920560f3fd19a4531c40fdb03d19e96c5 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 17 Mar 2021 20:36:32 -0400
Subject: add Constants.GameFramework field (#767)

---
 .../Patches/SpriteBatchValidationPatches.cs                       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/SMAPI.Mods.ErrorHandler')

diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
index f605b2ce..8056fd71 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
@@ -27,11 +27,9 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
 #endif
         {
             harmony.Patch(
-#if SMAPI_FOR_XNA
-                original: AccessTools.Method(typeof(SpriteBatch), "InternalDraw"),
-#else
-                original: AccessTools.Method(typeof(SpriteBatch), "CheckValid", new[] { typeof(Texture2D) }),
-#endif
+                original: Constants.GameFramework == GameFramework.Xna
+                    ? AccessTools.Method(typeof(SpriteBatch), "InternalDraw")
+                    : AccessTools.Method(typeof(SpriteBatch), "CheckValid", new[] { typeof(Texture2D) }),
                 postfix: new HarmonyMethod(this.GetType(), nameof(SpriteBatchValidationPatches.After_SpriteBatch_CheckValid))
             );
         }
-- 
cgit 


From b93e3cf522ebcc8711a8662a17cca1d034752269 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 17 Mar 2021 20:36:32 -0400
Subject: Drop hardcoded 32-bit restrictions on most SMAPI assemblies (#767)

SMAPI itself needs to be 32-bit to avoid errors trying to load the 32-bit game.
---
 src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/SMAPI.Mods.ErrorHandler')

diff --git a/src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj b/src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj
index e5ce8f5e..788f6f16 100644
--- a/src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj
+++ b/src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj
@@ -4,7 +4,6 @@
     <RootNamespace>StardewModdingAPI.Mods.ErrorHandler</RootNamespace>
     <TargetFramework>net45</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
   <Import Project="..\..\build\common.targets" />
-- 
cgit 


From 74215e844ae2af0075e5df3ab6a5f58efff4f981 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 21 Mar 2021 16:37:43 -0400
Subject: prepare for release

---
 src/SMAPI.Mods.ErrorHandler/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Mods.ErrorHandler')

diff --git a/src/SMAPI.Mods.ErrorHandler/manifest.json b/src/SMAPI.Mods.ErrorHandler/manifest.json
index 52bf4f6a..1e810113 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.9.4",
+    "Version": "3.9.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.9.4"
+    "MinimumApiVersion": "3.9.5"
 }
-- 
cgit