summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/prepare-nuget-package.targets8
-rw-r--r--docs/mod-build-config.md4
-rw-r--r--src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj1
-rw-r--r--src/SMAPI.ModBuildConfig/build/smapi.targets14
-rw-r--r--src/SMAPI.ModBuildConfig/package.nuspec6
-rw-r--r--src/SMAPI/Constants.cs12
6 files changed, 25 insertions, 20 deletions
diff --git a/build/prepare-nuget-package.targets b/build/prepare-nuget-package.targets
index 8894c273..cafaeda6 100644
--- a/build/prepare-nuget-package.targets
+++ b/build/prepare-nuget-package.targets
@@ -13,9 +13,9 @@
<Copy SourceFiles="$(ProjectDir)/package.nuspec" DestinationFolder="$(PackagePath)" />
<Copy SourceFiles="$(ProjectDir)/build/smapi.targets" DestinationFiles="$(PackagePath)/build/Pathoschild.Stardew.ModBuildConfig.targets" />
<Copy SourceFiles="$(TargetDir)/Newtonsoft.Json.dll" DestinationFolder="$(PackagePath)/build" />
- <Copy SourceFiles="$(TargetDir)/StardewModdingAPI.ModBuildConfig.dll" DestinationFolder="$(PackagePath)/build" />
- <Copy SourceFiles="$(TargetDir)/StardewModdingAPI.Toolkit.dll" DestinationFolder="$(PackagePath)/build" />
- <Copy SourceFiles="$(TargetDir)/StardewModdingAPI.Toolkit.CoreInterfaces.dll" DestinationFolder="$(PackagePath)/build" />
- <Copy SourceFiles="$(SolutionDir)/SMAPI.ModBuildConfig.Analyzer/bin/netstandard1.3/StardewModdingAPI.ModBuildConfig.Analyzer.dll" DestinationFolder="$(PackagePath)/analyzers/dotnet/cs" />
+ <Copy SourceFiles="$(TargetDir)/SMAPI.ModBuildConfig.dll" DestinationFolder="$(PackagePath)/build" />
+ <Copy SourceFiles="$(TargetDir)/SMAPI.Toolkit.dll" DestinationFolder="$(PackagePath)/build" />
+ <Copy SourceFiles="$(TargetDir)/SMAPI.Toolkit.CoreInterfaces.dll" DestinationFolder="$(PackagePath)/build" />
+ <Copy SourceFiles="$(SolutionDir)/SMAPI.ModBuildConfig.Analyzer/bin/netstandard1.3/SMAPI.ModBuildConfig.Analyzer.dll" DestinationFolder="$(PackagePath)/analyzers/dotnet/cs" />
</Target>
</Project>
diff --git a/docs/mod-build-config.md b/docs/mod-build-config.md
index fc63a5a2..aee81113 100644
--- a/docs/mod-build-config.md
+++ b/docs/mod-build-config.md
@@ -228,11 +228,11 @@ _[Game path](#game-path)_ above.
## Release notes
### Upcoming release
-* Updated for Stardew Valley 1.4.
+* Updated for SMAPI 3.0 and Stardew Valley 1.4.
* If the project contains an `assets` folder, its contents are now included in the mod automatically.
* Fixed `Newtonsoft.Json.pdb` included in release zips when Json.NET is referenced directly.
* Fixed `<IgnoreModFilePatterns>` not working for `i18n` files.
-* Dropped support for very old versions of SMAPI and Visual Studio.
+* Dropped support for older versions of SMAPI and Visual Studio.
### 2.2
* Added support for SMAPI 2.8+ (still compatible with earlier versions).
diff --git a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
index f39a1555..0af8eef9 100644
--- a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
+++ b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
@@ -36,5 +36,6 @@
<Import Project="..\SMAPI.Internal\SMAPI.Internal.projitems" Label="Shared" />
<Import Project="..\..\build\common.targets" />
+ <Import Project="..\..\build\prepare-nuget-package.targets" />
</Project>
diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index f703477f..c8f60c65 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -2,7 +2,7 @@
<!--*********************************************
** Import build tasks
**********************************************-->
- <UsingTask TaskName="DeployModTask" AssemblyFile="StardewModdingAPI.ModBuildConfig.dll" />
+ <UsingTask TaskName="DeployModTask" AssemblyFile="SMAPI.ModBuildConfig.dll" />
<!--*********************************************
** Find the basic mod metadata
@@ -95,7 +95,7 @@
<Private>false</Private>
<Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
</Reference>
- <Reference Include="StardewValley.GameData" Condition="Exists('$(GamePath)\StardewValley.GameData.dll')">
+ <Reference Include="StardewValley.GameData">
<HintPath>$(GamePath)\StardewValley.GameData.dll</HintPath>
<Private>false</Private>
<Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
@@ -105,8 +105,8 @@
<Private>false</Private>
<Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
</Reference>
- <Reference Include="StardewModdingAPI.Toolkit.CoreInterfaces">
- <HintPath>$(GamePath)\smapi-internal\StardewModdingAPI.Toolkit.CoreInterfaces.dll</HintPath>
+ <Reference Include="SMAPI.Toolkit.CoreInterfaces">
+ <HintPath>$(GamePath)\smapi-internal\SMAPI.Toolkit.CoreInterfaces.dll</HintPath>
<Private>false</Private>
<Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
</Reference>
@@ -139,7 +139,7 @@
<Private>false</Private>
<Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
</Reference>
- <Reference Include="StardewValley.GameData.MonoGame" Condition="Exists('$(GamePath)\StardewValley.GameData.MonoGame.dll')">
+ <Reference Include="StardewValley.GameData.MonoGame">
<HintPath>$(GamePath)\StardewValley.GameData.MonoGame.dll</HintPath>
<Private>false</Private>
<Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
@@ -149,8 +149,8 @@
<Private>false</Private>
<Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
</Reference>
- <Reference Include="StardewModdingAPI.Toolkit.CoreInterfaces">
- <HintPath>$(GamePath)\smapi-internal\StardewModdingAPI.Toolkit.CoreInterfaces.dll</HintPath>
+ <Reference Include="SMAPI.Toolkit.CoreInterfaces">
+ <HintPath>$(GamePath)\smapi-internal\SMAPI.Toolkit.CoreInterfaces.dll</HintPath>
<Private>false</Private>
<Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
</Reference>
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index f66a3504..c6ee6503 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-alpha.20190419</version>
+ <version>3.0.0-alpha.20190426</version>
<title>Build package for SMAPI mods</title>
<authors>Pathoschild</authors>
<owners>Pathoschild</owners>
@@ -14,11 +14,11 @@
<description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods. For SMAPI 2.11 or later.</description>
<releaseNotes>
3.0.0:
- - Updated for Stardew Valley 1.4.
+ - Updated for SMAPI 3.0 and Stardew Valley 1.4.
- If the project contains an `assets` folder, its contents are now included in the mod automatically.
- - Dropped support for very old versions of SMAPI and Visual Studio.
- Fixed `Newtonsoft.Json.pdb` included in release zips when Json.NET is referenced directly.
- Fixed `&lt;IgnoreModFilePatterns&gt;` not working for `i18n` files.
+ - Dropped support for older versions of SMAPI and Visual Studio.
</releaseNotes>
</metadata>
</package>
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 8c925a58..f58722a0 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -139,12 +139,14 @@ namespace StardewModdingAPI
"Microsoft.Xna.Framework",
"Microsoft.Xna.Framework.Game",
"Microsoft.Xna.Framework.Graphics",
- "Microsoft.Xna.Framework.Xact"
+ "Microsoft.Xna.Framework.Xact",
+ "StardewModdingAPI.Toolkit.CoreInterfaces" // renamed in SMAPI 3.0
};
targetAssemblies = new[]
{
typeof(StardewValley.Game1).Assembly, // note: includes Netcode types on Linux/Mac
- typeof(Microsoft.Xna.Framework.Vector2).Assembly
+ typeof(Microsoft.Xna.Framework.Vector2).Assembly,
+ typeof(StardewModdingAPI.IManifest).Assembly
};
break;
@@ -152,7 +154,8 @@ namespace StardewModdingAPI
removeAssemblyReferences = new[]
{
"StardewValley",
- "MonoGame.Framework"
+ "MonoGame.Framework",
+ "StardewModdingAPI.Toolkit.CoreInterfaces" // renamed in SMAPI 3.0
};
targetAssemblies = new[]
{
@@ -160,7 +163,8 @@ namespace StardewModdingAPI
typeof(StardewValley.Game1).Assembly,
typeof(Microsoft.Xna.Framework.Vector2).Assembly,
typeof(Microsoft.Xna.Framework.Game).Assembly,
- typeof(Microsoft.Xna.Framework.Graphics.SpriteBatch).Assembly
+ typeof(Microsoft.Xna.Framework.Graphics.SpriteBatch).Assembly,
+ typeof(StardewModdingAPI.IManifest).Assembly
};
break;
generated by cgit (git 2.46.0) at 2024-11-23 23:28:27 +0000