diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2016-10-27 00:40:48 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2016-10-27 00:40:48 -0400 |
| commit | e643a38b7826ba45218936a5120eda1be13fa331 (patch) | |
| tree | 9fc258bae9409bc77681f01e2c57cc033928c960 | |
| parent | 4e17de2f2c33a6ddda4952265f7866d407965653 (diff) | |
| download | SMAPI-e643a38b7826ba45218936a5120eda1be13fa331.tar.gz SMAPI-e643a38b7826ba45218936a5120eda1be13fa331.tar.bz2 SMAPI-e643a38b7826ba45218936a5120eda1be13fa331.zip | |
only use assembly merging on Windows (#126)
Costura doesn't work on Linux and Mac, but we can just add a separate DLL for Json.NET on those platforms.
| -rw-r--r-- | src/StardewModdingAPI/StardewModdingAPI.csproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj index 7c555fd8..af35fbac 100644 --- a/src/StardewModdingAPI/StardewModdingAPI.csproj +++ b/src/StardewModdingAPI/StardewModdingAPI.csproj @@ -213,7 +213,7 @@ <PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
- <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
+ <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="$(OS) == 'WINDOWS_NT' AND Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|