From 826dd53ab550e5b92796c510569118beee6bd044 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 19 Aug 2018 18:28:16 -0400
Subject: move most SMAPI files into subfolder (#582)

---
 build/common.targets | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'build/common.targets')

diff --git a/build/common.targets b/build/common.targets
index 5b6511f8..90c477b6 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -99,14 +99,14 @@
   </Target>
   <Target Name="CopySMAPI" Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI'">
     <Copy SourceFiles="$(TargetDir)\$(TargetName).exe" DestinationFolder="$(GamePath)" />
-    <Copy SourceFiles="$(TargetDir)\$(TargetName).config.json" DestinationFolder="$(GamePath)" />
-    <Copy SourceFiles="$(TargetDir)\$(TargetName).metadata.json" DestinationFolder="$(GamePath)" />
     <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)" />
     <Copy SourceFiles="$(TargetDir)\$(TargetName).xml" DestinationFolder="$(GamePath)" />
-    <Copy SourceFiles="$(TargetDir)\0Harmony.dll" DestinationFolder="$(GamePath)" />
-    <Copy SourceFiles="$(TargetDir)\0Harmony.pdb" DestinationFolder="$(GamePath)" />
-    <Copy SourceFiles="$(TargetDir)\Newtonsoft.Json.dll" DestinationFolder="$(GamePath)" />
-    <Copy SourceFiles="$(TargetDir)\Mono.Cecil.dll" DestinationFolder="$(GamePath)" />
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).config.json" DestinationFolder="$(GamePath)\smapi-internal" />
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).metadata.json" DestinationFolder="$(GamePath)\smapi-internal" />
+    <Copy SourceFiles="$(TargetDir)\0Harmony.dll" DestinationFolder="$(GamePath)\smapi-internal" />
+    <Copy SourceFiles="$(TargetDir)\0Harmony.pdb" DestinationFolder="$(GamePath)\smapi-internal" />
+    <Copy SourceFiles="$(TargetDir)\Newtonsoft.Json.dll" DestinationFolder="$(GamePath)\smapi-internal" />
+    <Copy SourceFiles="$(TargetDir)\Mono.Cecil.dll" DestinationFolder="$(GamePath)\smapi-internal" />
   </Target>
   <Target Name="CopyDefaultMods" Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI.Mods.ConsoleCommands' OR '$(MSBuildProjectName)' == 'StardewModdingAPI.Mods.SaveBackup'">
     <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)\Mods\$(AssemblyName)" />
@@ -114,12 +114,14 @@
     <Copy SourceFiles="$(TargetDir)\manifest.json" DestinationFolder="$(GamePath)\Mods\$(AssemblyName)" />
   </Target>
   <Target Name="CopyToolkit" Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI.Toolkit' AND '$(Configuration)' == 'Debug' AND $(TargetFramework) == 'net4.5'" AfterTargets="PostBuildEvent">
-      <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)" />
-      <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)" />
+      <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)\smapi-internal" />
+      <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)\smapi-internal" />
+      <Copy SourceFiles="$(TargetDir)\$(TargetName).xml" DestinationFolder="$(GamePath)\smapi-internal" />
   </Target>
   <Target Name="CopyToolkitCoreInterfaces" Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI.Toolkit.CoreInterfaces' AND '$(Configuration)' == 'Debug' AND $(TargetFramework) == 'net4.5'" AfterTargets="PostBuildEvent">
-    <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)" />
-    <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)" />
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)\smapi-internal" />
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)\smapi-internal" />
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).xml" DestinationFolder="$(GamePath)\smapi-internal" />
   </Target>
 
   <!-- launch SMAPI on debug -->
-- 
cgit 


From b5adfd8bce12afb885d6bb6a347d25e33be602af Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 26 Aug 2018 20:42:31 -0400
Subject: add more default game install paths

---
 build/common.targets | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'build/common.targets')

diff --git a/build/common.targets b/build/common.targets
index 90c477b6..b5cbbe67 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -9,13 +9,20 @@
     <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/GOG Games/Stardew Valley/game</GamePath>
     <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.local/share/Steam/steamapps/common/Stardew Valley</GamePath>
     <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.steam/steam/steamapps/common/Stardew Valley</GamePath>
+
     <!-- Mac paths -->
     <GamePath Condition="!Exists('$(GamePath)')">/Applications/Stardew Valley.app/Contents/MacOS</GamePath>
     <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS</GamePath>
+
     <!-- Windows paths -->
+    <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files\GalaxyClient\Games\Stardew Valley</GamePath>
+    <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files\GOG Galaxy\Games\Stardew Valley</GamePath>
+    <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files\Steam\steamapps\common\Stardew Valley</GamePath>
+
     <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley</GamePath>
     <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GOG Galaxy\Games\Stardew Valley</GamePath>
     <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley</GamePath>
+
     <GamePath Condition="!Exists('$(GamePath)') AND '$(OS)' == 'Windows_NT'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\GOG.com\Games\1453375253', 'PATH', null, RegistryView.Registry32))</GamePath>
     <GamePath Condition="!Exists('$(GamePath)') AND '$(OS)' == 'Windows_NT'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 413150', 'InstallLocation', null, RegistryView.Registry64, RegistryView.Registry32))</GamePath>
 
-- 
cgit 


From e5e4ce411cc5a5e5066552978517904b21900066 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Wed, 31 Oct 2018 17:29:32 -0400
Subject: sync SMAPI context between players in multiplayer (#480)

---
 build/common.targets | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'build/common.targets')

diff --git a/build/common.targets b/build/common.targets
index b5cbbe67..e646e62c 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -56,6 +56,14 @@
             </Reference>
     
             <!-- game DLLs -->
+            <Reference Include="GalaxyCSharp">
+              <HintPath>$(GamePath)\GalaxyCSharp.dll</HintPath>
+              <Private>False</Private>
+            </Reference>
+            <Reference Include="Lidgren.Network">
+              <HintPath>$(GamePath)\Lidgren.Network.dll</HintPath>
+              <Private>False</Private>
+            </Reference>
             <Reference Include="Netcode">
               <HintPath>$(GamePath)\Netcode.dll</HintPath>
               <Private Condition="'$(MSBuildProjectName)' != 'StardewModdingAPI.Tests'">False</Private>
-- 
cgit 


From 6bf3734e4ac3efd4a7c32601c81878e38cfbeac0 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Mon, 5 Nov 2018 00:34:16 -0500
Subject: fix build on Linux/Mac

---
 build/common.targets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'build/common.targets')

diff --git a/build/common.targets b/build/common.targets
index e646e62c..f631633d 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -54,7 +54,7 @@
             <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
               <Private>False</Private>
             </Reference>
-    
+
             <!-- game DLLs -->
             <Reference Include="GalaxyCSharp">
               <HintPath>$(GamePath)\GalaxyCSharp.dll</HintPath>
@@ -87,8 +87,12 @@
               <Private>False</Private>
               <SpecificVersion>False</SpecificVersion>
             </Reference>
-    
+
             <!-- game DLLs -->
+            <Reference Include="Lidgren.Network">
+              <HintPath>$(GamePath)\Lidgren.Network.dll</HintPath>
+              <Private>False</Private>
+            </Reference>
             <Reference Include="StardewValley">
               <HintPath>$(GamePath)\StardewValley.exe</HintPath>
               <Private>False</Private>
-- 
cgit 


From fb0d101ab822145fb70dbfbdc261f6596b160a4f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 14 Nov 2018 18:46:40 -0500
Subject: fix build error on Linux/Mac (#480)

---
 build/common.targets | 113 ++++++++++++++++++++++-----------------------------
 1 file changed, 49 insertions(+), 64 deletions(-)

(limited to 'build/common.targets')

diff --git a/build/common.targets b/build/common.targets
index f631633d..320b3e00 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -38,72 +38,57 @@
   <!-- add game references-->
   <Choose>
     <When Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI' OR '$(MSBuildProjectName)' == 'StardewModdingAPI.Mods.ConsoleCommands' OR '$(MSBuildProjectName)' == 'StardewModdingAPI.Mods.SaveBackup' OR '$(MSBuildProjectName)' == 'StardewModdingAPI.Tests'">
-      <Choose>
-        <When Condition="$(OS) == 'Windows_NT'">
-          <ItemGroup>
-            <!--XNA framework-->
-            <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-              <Private>False</Private>
-            </Reference>
-            <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-              <Private>False</Private>
-            </Reference>
-            <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-              <Private>False</Private>
-            </Reference>
-            <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-              <Private>False</Private>
-            </Reference>
+      <!-- Windows -->
+      <ItemGroup Condition="$(OS) == 'Windows_NT'">
+        <Reference  Include="Stardew Valley">
+          <HintPath>$(GamePath)\Stardew Valley.exe</HintPath>
+          <Private Condition="'$(MSBuildProjectName)' != 'StardewModdingAPI.Tests'">False</Private>
+        </Reference>
+        <Reference Include="Netcode">
+          <HintPath>$(GamePath)\Netcode.dll</HintPath>
+          <Private Condition="'$(MSBuildProjectName)' != 'StardewModdingAPI.Tests'">False</Private>
+        </Reference>
+        <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
 
-            <!-- game DLLs -->
-            <Reference Include="GalaxyCSharp">
-              <HintPath>$(GamePath)\GalaxyCSharp.dll</HintPath>
-              <Private>False</Private>
-            </Reference>
-            <Reference Include="Lidgren.Network">
-              <HintPath>$(GamePath)\Lidgren.Network.dll</HintPath>
-              <Private>False</Private>
-            </Reference>
-            <Reference Include="Netcode">
-              <HintPath>$(GamePath)\Netcode.dll</HintPath>
-              <Private Condition="'$(MSBuildProjectName)' != 'StardewModdingAPI.Tests'">False</Private>
-            </Reference>
-            <Reference Include="Stardew Valley">
-              <HintPath>$(GamePath)\Stardew Valley.exe</HintPath>
-              <Private Condition="'$(MSBuildProjectName)' != 'StardewModdingAPI.Tests'">False</Private>
-            </Reference>
-            <Reference Include="xTile, Version=2.0.4.0, Culture=neutral, processorArchitecture=x86">
-              <HintPath>$(GamePath)\xTile.dll</HintPath>
-              <Private>False</Private>
-              <SpecificVersion>False</SpecificVersion>
-            </Reference>
-          </ItemGroup>
-        </When>
-        <Otherwise>
-          <ItemGroup>
-            <!-- MonoGame -->
-            <Reference Include="MonoGame.Framework">
-              <HintPath>$(GamePath)\MonoGame.Framework.dll</HintPath>
-              <Private>False</Private>
-              <SpecificVersion>False</SpecificVersion>
-            </Reference>
+      <!-- Linux/Mac -->
+      <ItemGroup Condition="$(OS) != 'Windows_NT'">
+        <Reference Include="StardewValley">
+          <HintPath>$(GamePath)\StardewValley.exe</HintPath>
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="MonoGame.Framework">
+          <HintPath>$(GamePath)\MonoGame.Framework.dll</HintPath>
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
 
-            <!-- game DLLs -->
-            <Reference Include="Lidgren.Network">
-              <HintPath>$(GamePath)\Lidgren.Network.dll</HintPath>
-              <Private>False</Private>
-            </Reference>
-            <Reference Include="StardewValley">
-              <HintPath>$(GamePath)\StardewValley.exe</HintPath>
-              <Private>False</Private>
-            </Reference>
-            <Reference Include="xTile">
-              <HintPath>$(GamePath)\xTile.dll</HintPath>
-              <Private>False</Private>
-            </Reference>
-          </ItemGroup>
-        </Otherwise>
-      </Choose>
+      <!-- common -->
+      <ItemGroup>
+        <Reference Include="GalaxyCSharp">
+          <HintPath>$(GamePath)\GalaxyCSharp.dll</HintPath>
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Lidgren.Network">
+          <HintPath>$(GamePath)\Lidgren.Network.dll</HintPath>
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="xTile">
+          <HintPath>$(GamePath)\xTile.dll</HintPath>
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
     </When>
   </Choose>
 
-- 
cgit 


From e8fe550b753ced742c5084dbf851fc606ff90fb0 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 18 Nov 2018 01:00:11 -0500
Subject: remove 0Harmony.pdb from build scripts (#602)

The file isn't included in the new Harmony NuGet package.
---
 build/common.targets | 1 -
 1 file changed, 1 deletion(-)

(limited to 'build/common.targets')

diff --git a/build/common.targets b/build/common.targets
index 320b3e00..d9ad89f4 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -108,7 +108,6 @@
     <Copy SourceFiles="$(TargetDir)\$(TargetName).config.json" DestinationFolder="$(GamePath)\smapi-internal" />
     <Copy SourceFiles="$(TargetDir)\$(TargetName).metadata.json" DestinationFolder="$(GamePath)\smapi-internal" />
     <Copy SourceFiles="$(TargetDir)\0Harmony.dll" DestinationFolder="$(GamePath)\smapi-internal" />
-    <Copy SourceFiles="$(TargetDir)\0Harmony.pdb" DestinationFolder="$(GamePath)\smapi-internal" />
     <Copy SourceFiles="$(TargetDir)\Newtonsoft.Json.dll" DestinationFolder="$(GamePath)\smapi-internal" />
     <Copy SourceFiles="$(TargetDir)\Mono.Cecil.dll" DestinationFolder="$(GamePath)\smapi-internal" />
   </Target>
-- 
cgit