summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/SMAPI.ModBuildConfig/build/smapi.targets12
-rw-r--r--src/SMAPI.ModBuildConfig/package.nuspec2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj12
-rw-r--r--src/SMAPI/SMAPI.csproj42
4 files changed, 26 insertions, 42 deletions
diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index 5eeea91e..78d3a3d4 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -46,6 +46,10 @@
<HintPath>$(GamePath)\$(GameExecutableName).exe</HintPath>
<Private>$(CopyModReferencesToBuildOutput)</Private>
</Reference>
+ <Reference Include="StardewValley.GameData">
+ <HintPath>$(GamePath)\StardewValley.GameData.dll</HintPath>
+ <Private>$(CopyModReferencesToBuildOutput)</Private>
+ </Reference>
<Reference Include="StardewModdingAPI">
<HintPath>$(GamePath)\StardewModdingAPI.exe</HintPath>
<Private>$(CopyModReferencesToBuildOutput)</Private>
@@ -82,10 +86,6 @@
<HintPath>$(GamePath)\Netcode.dll</HintPath>
<Private>$(CopyModReferencesToBuildOutput)</Private>
</Reference>
- <Reference Include="StardewValley.GameData">
- <HintPath>$(GamePath)\StardewValley.GameData.dll</HintPath>
- <Private>$(CopyModReferencesToBuildOutput)</Private>
- </Reference>
</ItemGroup>
<!-- Linux/Mac -->
@@ -94,10 +94,6 @@
<HintPath>$(GamePath)\MonoGame.Framework.dll</HintPath>
<Private>$(CopyModReferencesToBuildOutput)</Private>
</Reference>
- <Reference Include="StardewValley.GameData.MonoGame">
- <HintPath>$(GamePath)\StardewValley.GameData.MonoGame.dll</HintPath>
- <Private>$(CopyModReferencesToBuildOutput)</Private>
- </Reference>
</ItemGroup>
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index ffa47fdb..76818c9f 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Pathoschild.Stardew.ModBuildConfig</id>
- <version>3.0.0-beta.4</version>
+ <version>3.0.0-beta.6</version>
<title>Build package for SMAPI mods</title>
<authors>Pathoschild</authors>
<owners>Pathoschild</owners>
diff --git a/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj b/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj
index 6cceb22d..80e1986e 100644
--- a/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj
+++ b/src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj
@@ -22,16 +22,16 @@
<HintPath>$(GamePath)\$(GameExecutableName).exe</HintPath>
<Private>False</Private>
</Reference>
+ <Reference Include="StardewValley.GameData">
+ <HintPath>$(GamePath)\StardewValley.GameData.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
</ItemGroup>
<Choose>
<!-- Windows -->
<When Condition="$(OS) == 'Windows_NT'">
<ItemGroup>
- <Reference Include="StardewValley.GameData">
- <HintPath>$(GamePath)\StardewValley.GameData.dll</HintPath>
- <Private>False</Private>
- </Reference>
<Reference Include="Netcode">
<HintPath>$(GamePath)\Netcode.dll</HintPath>
<Private>False</Private>
@@ -54,10 +54,6 @@
<!-- Linux/Mac -->
<Otherwise>
<ItemGroup>
- <Reference Include="StardewValley.GameData.MonoGame">
- <HintPath>$(GamePath)\StardewValley.GameData.MonoGame.dll</HintPath>
- <Private>False</Private>
- </Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(GamePath)\MonoGame.Framework.dll</HintPath>
<Private>False</Private>
diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj
index 8b7d6277..994a8715 100644
--- a/src/SMAPI/SMAPI.csproj
+++ b/src/SMAPI/SMAPI.csproj
@@ -27,23 +27,34 @@
<HintPath>$(GamePath)\$(GameExecutableName).exe</HintPath>
<Private>False</Private>
</Reference>
+ <Reference Include="StardewValley.GameData">
+ <HintPath>$(GamePath)\StardewValley.GameData.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
<Reference Include="System.Numerics">
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Caching">
<Private>True</Private>
</Reference>
- <Reference Include="System.Windows.Forms" Condition="$(OS) == 'Windows_NT'" />
+ <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>
<Choose>
<!-- Windows -->
<When Condition="$(OS) == 'Windows_NT'">
<ItemGroup>
- <Reference Include="StardewValley.GameData">
- <HintPath>$(GamePath)\StardewValley.GameData.dll</HintPath>
- <Private>False</Private>
- </Reference>
<Reference Include="Netcode">
<HintPath>$(GamePath)\Netcode.dll</HintPath>
<Private>False</Private>
@@ -60,16 +71,13 @@
<Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
<Private>False</Private>
</Reference>
+ <Reference Include="System.Windows.Forms" />
</ItemGroup>
</When>
<!-- Linux/Mac -->
<Otherwise>
<ItemGroup>
- <Reference Include="StardewValley.GameData.MonoGame">
- <HintPath>$(GamePath)\StardewValley.GameData.MonoGame.dll</HintPath>
- <Private>False</Private>
- </Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(GamePath)\MonoGame.Framework.dll</HintPath>
<Private>False</Private>
@@ -78,22 +86,6 @@
</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>
-
<ItemGroup>
<ProjectReference Include="..\SMAPI.Toolkit.CoreInterfaces\SMAPI.Toolkit.CoreInterfaces.csproj" />
<ProjectReference Include="..\SMAPI.Toolkit\SMAPI.Toolkit.csproj" />