diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-08-21 16:39:21 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-08-21 16:39:21 -0400 |
| commit | 8ba54a682fd7de3756b6ddd262b232cf40d23ea0 (patch) | |
| tree | 7e44d53b733d95b05b232da46306a0d3d57e9231 /src/TrainerMod | |
| parent | 674ad0d90f8780130a5fcefb3869acfe2315df2a (diff) | |
| parent | eea5100acea0bceaf440f9d1bd50ee2b24cf8ebc (diff) | |
| download | SMAPI-8ba54a682fd7de3756b6ddd262b232cf40d23ea0.tar.gz SMAPI-8ba54a682fd7de3756b6ddd262b232cf40d23ea0.tar.bz2 SMAPI-8ba54a682fd7de3756b6ddd262b232cf40d23ea0.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/TrainerMod')
| -rw-r--r-- | src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs | 4 | ||||
| -rw-r--r-- | src/TrainerMod/Framework/Commands/Saves/SaveCommand.cs | 4 | ||||
| -rw-r--r-- | src/TrainerMod/TrainerMod.csproj | 11 |
3 files changed, 7 insertions, 12 deletions
diff --git a/src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs b/src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs index 121ad9a6..ad79b4af 100644 --- a/src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs +++ b/src/TrainerMod/Framework/Commands/Saves/LoadCommand.cs @@ -1,4 +1,5 @@ -using StardewModdingAPI; +#if SMAPI_1_x +using StardewModdingAPI; using StardewValley; using StardewValley.Menus; @@ -26,3 +27,4 @@ namespace TrainerMod.Framework.Commands.Saves } } } +#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 index 5f6941e9..ea2bd6a8 100644 --- a/src/TrainerMod/Framework/Commands/Saves/SaveCommand.cs +++ b/src/TrainerMod/Framework/Commands/Saves/SaveCommand.cs @@ -1,4 +1,5 @@ -using StardewModdingAPI; +#if SMAPI_1_x +using StardewModdingAPI; using StardewValley; namespace TrainerMod.Framework.Commands.Saves @@ -25,3 +26,4 @@ namespace TrainerMod.Framework.Commands.Saves } } } +#endif
\ No newline at end of file diff --git a/src/TrainerMod/TrainerMod.csproj b/src/TrainerMod/TrainerMod.csproj index 57c8a907..73b40050 100644 --- a/src/TrainerMod/TrainerMod.csproj +++ b/src/TrainerMod/TrainerMod.csproj @@ -99,15 +99,6 @@ </None> <None Include="packages.config" /> </ItemGroup> - <Import Project="$(SolutionDir)\crossplatform.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <PostBuildEvent> - </PostBuildEvent> - </PropertyGroup> - <Target Name="AfterBuild" Condition="$(Configuration) == 'Debug'"> - <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)\Mods\TrainerMod" /> - <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)\Mods\TrainerMod" Condition="Exists('$(TargetDir)\$(TargetName).pdb')" /> - <Copy SourceFiles="$(TargetDir)\manifest.json" DestinationFolder="$(GamePath)\Mods\TrainerMod" /> - </Target> + <Import Project="$(SolutionDir)\common.targets" /> </Project>
\ No newline at end of file |