From 2d36105c33ffba77eb979ef6ef0d2e7d906b09bc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 23 Sep 2017 20:53:12 -0400
Subject: drop support for SMAPI 1.x (#360)

---
 .../Framework/Commands/Saves/LoadCommand.cs        | 30 ----------------------
 .../Framework/Commands/Saves/SaveCommand.cs        | 29 ---------------------
 src/TrainerMod/TrainerMod.csproj                   |  2 --
 3 files changed, 61 deletions(-)
 delete mode 100644 src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs
 delete mode 100644 src/TrainerMod/Framework/Commands/Saves/SaveCommand.cs

(limited to 'src/TrainerMod')

diff --git a/src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs b/src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs
deleted file mode 100644
index ad79b4af..00000000
--- a/src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-#if SMAPI_1_x
-using StardewModdingAPI;
-using StardewValley;
-using StardewValley.Menus;
-
-namespace TrainerMod.Framework.Commands.Saves
-{
-    /// <summary>A command which shows the load screen.</summary>
-    internal class LoadCommand : TrainerCommand
-    {
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        public LoadCommand()
-            : base("load", "Shows the load screen.") { }
-
-        /// <summary>Handle the command.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        /// <param name="command">The command name.</param>
-        /// <param name="args">The command arguments.</param>
-        public override void Handle(IMonitor monitor, string command, ArgumentParser args)
-        {
-            monitor.Log("Triggering load menu...", LogLevel.Info);
-            Game1.hasLoadedGame = false;
-            Game1.activeClickableMenu = new LoadGameMenu();
-        }
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/TrainerMod/Framework/Commands/Saves/SaveCommand.cs b/src/TrainerMod/Framework/Commands/Saves/SaveCommand.cs
deleted file mode 100644
index ea2bd6a8..00000000
--- a/src/TrainerMod/Framework/Commands/Saves/SaveCommand.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-#if SMAPI_1_x
-using StardewModdingAPI;
-using StardewValley;
-
-namespace TrainerMod.Framework.Commands.Saves
-{
-    /// <summary>A command which saves the game.</summary>
-    internal class SaveCommand : TrainerCommand
-    {
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        public SaveCommand()
-            : base("save", "Saves the game? Doesn't seem to work.") { }
-
-
-        /// <summary>Handle the command.</summary>
-        /// <param name="monitor">Writes messages to the console and log file.</param>
-        /// <param name="command">The command name.</param>
-        /// <param name="args">The command arguments.</param>
-        public override void Handle(IMonitor monitor, string command, ArgumentParser args)
-        {
-            monitor.Log("Saving the game...", LogLevel.Info);
-            SaveGame.Save();
-        }
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/TrainerMod/TrainerMod.csproj b/src/TrainerMod/TrainerMod.csproj
index 73b40050..383e8c28 100644
--- a/src/TrainerMod/TrainerMod.csproj
+++ b/src/TrainerMod/TrainerMod.csproj
@@ -69,8 +69,6 @@
     <Compile Include="Framework\Commands\Player\SetStaminaCommand.cs" />
     <Compile Include="Framework\Commands\Player\SetNameCommand.cs" />
     <Compile Include="Framework\Commands\Player\SetMoneyCommand.cs" />
-    <Compile Include="Framework\Commands\Saves\LoadCommand.cs" />
-    <Compile Include="Framework\Commands\Saves\SaveCommand.cs" />
     <Compile Include="Framework\Commands\TrainerCommand.cs" />
     <Compile Include="Framework\Commands\World\SetMineLevelCommand.cs" />
     <Compile Include="Framework\Commands\World\DownMineLevelCommand.cs" />
-- 
cgit 


From 929dccb75a1405737975d76648e015a3e7c00177 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 7 Oct 2017 23:07:10 -0400
Subject: reorganise repo structure

---
 src/TrainerMod/TrainerMod.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/TrainerMod')

diff --git a/src/TrainerMod/TrainerMod.csproj b/src/TrainerMod/TrainerMod.csproj
index 383e8c28..3182338c 100644
--- a/src/TrainerMod/TrainerMod.csproj
+++ b/src/TrainerMod/TrainerMod.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -48,7 +48,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
+    <Compile Include="..\..\build\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Framework\Commands\ArgumentParser.cs" />
@@ -85,7 +85,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\StardewModdingAPI\StardewModdingAPI.csproj">
+    <ProjectReference Include="..\SMAPI\StardewModdingAPI.csproj">
       <Project>{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}</Project>
       <Name>StardewModdingAPI</Name>
       <Private>False</Private>
@@ -98,5 +98,5 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\common.targets" />
+  <Import Project="..\..\build\common.targets" />
 </Project>
\ No newline at end of file
-- 
cgit 


From ff718d7993793ef4e93d49dc82f5ce3bb7de208e Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 13 Oct 2017 13:17:58 -0400
Subject: update Json.NET

---
 src/TrainerMod/TrainerMod.csproj | 7 +++----
 src/TrainerMod/packages.config   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/TrainerMod')

diff --git a/src/TrainerMod/TrainerMod.csproj b/src/TrainerMod/TrainerMod.csproj
index 3182338c..cb5ec47e 100644
--- a/src/TrainerMod/TrainerMod.csproj
+++ b/src/TrainerMod/TrainerMod.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -36,9 +36,8 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/TrainerMod/packages.config b/src/TrainerMod/packages.config
index 75e68e71..ee51c237 100644
--- a/src/TrainerMod/packages.config
+++ b/src/TrainerMod/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
-- 
cgit 


From 8aec1eff99858716afe7b8604b512181f78c214f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 14 Oct 2017 11:39:52 -0400
Subject: update for 2.0 release

---
 src/TrainerMod/manifest.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/TrainerMod')

diff --git a/src/TrainerMod/manifest.json b/src/TrainerMod/manifest.json
index 20b40f8a..22e35bce 100644
--- a/src/TrainerMod/manifest.json
+++ b/src/TrainerMod/manifest.json
@@ -2,9 +2,9 @@
   "Name": "Trainer Mod",
   "Author": "SMAPI",
   "Version": {
-    "MajorVersion": 1,
-    "MinorVersion": 15,
-    "PatchVersion": 4,
+    "MajorVersion": 2,
+    "MinorVersion": 0,
+    "PatchVersion": 0,
     "Build": null
   },
   "Description": "Adds SMAPI console commands that let you manipulate the game.",
-- 
cgit