ignore Harmony DLL in mod build package

Pathoschild · Pathoschild · commit d0885831c369 · 2020-02-01T11:09:21.000-05:00
diff --git a/docs/technical/mod-package.md b/docs/technical/mod-package.md
@@ -287,7 +287,11 @@ That will create a `Pathoschild.Stardew.ModBuildConfig-<version>.nupkg` file in
 which can be uploaded to NuGet or referenced directly.
 
 ## Release notes
-### Upcoming release
+### 3.1
+* Added support for semantic versioning 2.0.
+* `0Harmony.dll` is now ignored if the mod references it directly (it's bundled with SMAPI).
+
+### 3.0
 * Updated for SMAPI 3.0 and Stardew Valley 1.4.
 * Added automatic support for `assets` folders.
 * Added `$(GameExecutableName)` MSBuild variable.
@@ -298,6 +302,7 @@ which can be uploaded to NuGet or referenced directly.
 * Fixed `Newtonsoft.Json.pdb` included in release zips when Json.NET is referenced directly.
 * Fixed `<IgnoreModFilePatterns>` not working for `i18n` files.
 * Dropped support for older versions of SMAPI and Visual Studio.
+* Migrated package icon to NuGet's new format.
 
 ### 2.2
 * Added support for SMAPI 2.8+ (still compatible with earlier versions).
diff --git a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
@@ -156,6 +156,9 @@ private bool ShouldIgnore(FileInfo file, string relativePath, Regex[] ignoreFile
                 // release zips
                 this.EqualsInvariant(file.Extension, ".zip")
 
+                // Harmony (bundled into SMAPI)
+                || this.EqualsInvariant(file.Name, "0Harmony.dll")
+
                 // Json.NET (bundled into SMAPI)
                 || this.EqualsInvariant(file.Name, "Newtonsoft.Json.dll")
                 || this.EqualsInvariant(file.Name, "Newtonsoft.Json.pdb")
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -14,18 +14,9 @@
     <iconUrl>https://raw.githubusercontent.com/Pathoschild/SMAPI/develop/src/SMAPI.ModBuildConfig/assets/nuget-icon.png</iconUrl>
     <description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods. For SMAPI 3.0 or later.</description>
     <releaseNotes>
-      3.0.0:
-      - Updated for SMAPI 3.0 and Stardew Valley 1.4.
-      - Added automatic support for 'assets' folders.
-      - Added $(GameExecutableName) MSBuild variable.
-      - Added support for projects using the simplified .csproj format.
-      - Added option to disable game debugging config.
-      - Added .pdb files to builds by default (to enable line numbers in error stack traces).
-      - Added optional Harmony reference.
-      - 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.
-      - Migrated package icon to NuGet's new format.
+      3.1.0:
+      - Added support for semantic versioning 2.0.
+      - 0Harmony.dll is now ignored if the mod references it directly (it's bundled with SMAPI).
     </releaseNotes>
   </metadata>
   <files>
diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "3.1.0",
+    "Version": "3.2.0",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "3.1.0"
+    "MinimumApiVersion": "3.2.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"Name": "Console Commands",`
`3`	`3`	`"Author": "SMAPI",`
`4`		`- "Version": "3.1.0",`
	`4`	`+ "Version": "3.2.0",`
`5`	`5`	`"Description": "Adds SMAPI console commands that let you manipulate the game.",`
`6`	`6`	`"UniqueID": "SMAPI.ConsoleCommands",`
`7`	`7`	`"EntryDll": "ConsoleCommands.dll",`
`8`		`- "MinimumApiVersion": "3.1.0"`
	`8`	`+ "MinimumApiVersion": "3.2.0"`
`9`	`9`	`}`