diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-03-13 20:25:06 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-03-13 20:25:06 -0400 |
| commit | afb3c49bbaab07f3148f70d54f5140cdd83f8c20 (patch) | |
| tree | dd60902c878c38617f97644b912afb38c568755e /build | |
| parent | 833d98f49136325edfc4463097710cf2391dd5b2 (diff) | |
| parent | 76445dc3589265ba259070300120e96a17957e50 (diff) | |
| download | SMAPI-afb3c49bbaab07f3148f70d54f5140cdd83f8c20.tar.gz SMAPI-afb3c49bbaab07f3148f70d54f5140cdd83f8c20.tar.bz2 SMAPI-afb3c49bbaab07f3148f70d54f5140cdd83f8c20.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'build')
| -rw-r--r-- | build/GlobalAssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | build/common.targets | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs index f90ab358..e9236498 100644 --- a/build/GlobalAssemblyInfo.cs +++ b/build/GlobalAssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Reflection; [assembly: AssemblyProduct("SMAPI")] -[assembly: AssemblyVersion("2.5.2")] -[assembly: AssemblyFileVersion("2.5.2")] +[assembly: AssemblyVersion("2.5.3")] +[assembly: AssemblyFileVersion("2.5.3")] diff --git a/build/common.targets b/build/common.targets index aa11344e..6773dbe4 100644 --- a/build/common.targets +++ b/build/common.targets @@ -38,6 +38,10 @@ <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> <Private>False</Private> </Reference> + <Reference Include="Netcode" Condition="Exists('$(GamePath)\Netcode.dll')"> + <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> |