From d5a7465b0219c3d736b1ac5aff1758ba41887fcc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 11 Jun 2019 20:23:20 -0400
Subject: [PATCH] add mod build features for new csproj format

---
 docs/mod-build-config.md                     | 5 ++++-
 src/SMAPI.ModBuildConfig/build/smapi.targets | 7 +++++++
 src/SMAPI.ModBuildConfig/package.nuspec      | 5 ++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/mod-build-config.md b/docs/mod-build-config.md
index aee81113..22b5f4ea 100644
--- a/docs/mod-build-config.md
+++ b/docs/mod-build-config.md
@@ -230,8 +230,11 @@ _[Game path](#game-path)_ above.
 ### Upcoming release
 * Updated for SMAPI 3.0 and Stardew Valley 1.4.
 * If the project contains an `assets` folder, its contents are now included in the mod automatically.
+* For projects using the new `.csproj` format:
+  * platform target is now set to x86 automatically to avoid mismatching platform target warnings;
+  * added GAC to assembly search paths to fix references to XNA Framework.
 * Fixed `Newtonsoft.Json.pdb` included in release zips when Json.NET is referenced directly.
-* Fixed `<IgnoreModFilePatterns>` not working for `i18n` files.
+* Fixed `&lt;IgnoreModFilePatterns&gt;` not working for `i18n` files.
 * Dropped support for older versions of SMAPI and Visual Studio.
 
 ### 2.2
diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index 79a491e7..e9209a45 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -13,6 +13,13 @@
 
   <!-- set build options -->
   <PropertyGroup>
+    <!-- set build to x86 to avoid mismatched platform warnings (only affects mods using new csproj format) -->
+    <Platforms>x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
+
+    <!-- recognise XNA Framework DLLs in the GAC (only affects mods using new csproj format) -->
+    <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
+
     <!-- set default package options -->
     <ModFolderName Condition="'$(ModFolderName)' == ''">$(MSBuildProjectName)</ModFolderName>
     <ModZipPath Condition="'$(ModZipPath)' == ''">$(TargetDir)</ModZipPath>
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index c6ee6503..28bcf807 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Pathoschild.Stardew.ModBuildConfig</id>
-    <version>3.0.0-alpha.20190426</version>
+    <version>3.0.0-alpha.20190611</version>
     <title>Build package for SMAPI mods</title>
     <authors>Pathoschild</authors>
     <owners>Pathoschild</owners>
@@ -16,6 +16,9 @@
       3.0.0:
       - Updated for SMAPI 3.0 and Stardew Valley 1.4.
       - If the project contains an `assets` folder, its contents are now included in the mod automatically.
+      - For projects using the new `.csproj` format:
+        - platform target is now set to x86 automatically to avoid mismatching platform target warnings;
+        - added GAC to assembly search paths to fix references to XNA Framework.
       - Fixed `Newtonsoft.Json.pdb` included in release zips when Json.NET is referenced directly.
       - Fixed `&lt;IgnoreModFilePatterns&gt;` not working for `i18n` files.
       - Dropped support for older versions of SMAPI and Visual Studio.