summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE.txt8
-rw-r--r--README.md125
-rw-r--r--release-notes.md31
-rw-r--r--src/StardewModdingAPI.ModBuildConfig/README.md121
-rw-r--r--src/StardewModdingAPI.ModBuildConfig/assets/nuget-icon.pdn (renamed from assets/nuget-icon.pdn)bin7401 -> 7401 bytes
-rw-r--r--src/StardewModdingAPI.ModBuildConfig/assets/nuget-icon.png (renamed from assets/nuget-icon.png)bin5054 -> 5054 bytes
-rw-r--r--src/StardewModdingAPI.ModBuildConfig/build/smapi.targets (renamed from build/smapi.targets)0
-rw-r--r--src/StardewModdingAPI.ModBuildConfig/package.nuspec (renamed from package.nuspec)0
-rw-r--r--src/StardewModdingAPI.ModBuildConfig/release-notes.md28
9 files changed, 149 insertions, 164 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 6463a584..00000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-The MIT License (MIT)
-Copyright Pathoschild and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file
diff --git a/README.md b/README.md
index 259e7d69..01dd77ce 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
![](docs/imgs/SMAPI.png)
## Contents
@@ -178,127 +177,3 @@ SMAPI uses a small number of conditional compilation constants, which you can se
flag | purpose
---- | -------
`SMAPI_FOR_WINDOWS` | Indicates that SMAPI is being compiled on Windows for players on Windows. Set automatically in `crossplatform.targets`.
-
-=======
-**Stardew.ModBuildConfig** is an open-source NuGet package which automates the build configuration
-for [Stardew Valley](http://stardewvalley.net/) [SMAPI](https://github.com/Pathoschild/SMAPI) mods.
-
-The package...
-
-* lets you write your mod once, and compile it on any computer. It detects the current platform
- (Linux, Mac, or Windows) and game install path, and injects the right references automatically.
-* configures Visual Studio so you can debug into the mod code when the game is running (_Windows
- only_).
-* packages the mod automatically into the game's mod folder when you build the code (_optional_).
-
-## Contents
-* [Install](#install)
-* [Simplify mod development](#simplify-mod-development)
-* [Troubleshoot](#troubleshoot)
-* [Versions](#versions)
-
-## Install
-**When creating a new mod:**
-
-1. Create an empty library project.
-2. Reference the [`Pathoschild.Stardew.ModBuildConfig` NuGet package](https://www.nuget.org/packages/Pathoschild.Stardew.ModBuildConfig).
-3. [Write your code](http://canimod.com/guides/creating-a-smapi-mod).
-4. Compile on any platform.
-
-**When migrating an existing mod:**
-
-1. Remove any project references to `Microsoft.Xna.*`, `MonoGame`, Stardew Valley,
- `StardewModdingAPI`, and `xTile`.
-2. Reference the [`Pathoschild.Stardew.ModBuildConfig` NuGet package](https://www.nuget.org/packages/Pathoschild.Stardew.ModBuildConfig).
-3. Compile on any platform.
-
-## Simplify mod development
-### Package your mod into the game folder automatically
-You can copy your mod files into the `Mods` folder automatically each time you build, so you don't
-need to do it manually:
-
-1. Edit your mod's `.csproj` file.
-2. Add this block above the first `</PropertyGroup>` line:
-
- ```xml
- <DeployModFolderName>$(MSBuildProjectName)</DeployModFolderName>
- ```
-
-That's it! Each time you build, the files in `<game path>\Mods\<mod name>` will be updated with
-your `manifest.json`, build output, and any `i18n` files.
-
-Notes:
-* To add custom files, just [add them to the build output](https://stackoverflow.com/a/10828462/262123).
-* To customise the folder name, just replace `$(MSBuildProjectName)` with the folder name you want.
-* If your project references another mod, make sure the reference is [_not_ marked 'copy local'](https://msdn.microsoft.com/en-us/library/t1zz5y8c(v=vs.100).aspx).
-
-### Debug into the mod code (Windows-only)
-Stepping into your mod code when the game is running is straightforward, since this package injects
-the configuration automatically. To do it:
-
-1. [Package your mod into the game folder automatically](#package-your-mod-into-the-game-folder-automatically).
-2. Launch the project with debugging in Visual Studio or MonoDevelop.
-
-This will deploy your mod files into the game folder, launch SMAPI, and attach a debugger
-automatically. Now you can step through your code, set breakpoints, etc.
-
-### Create release zips automatically (Windows-only)
-You can create the mod package automatically when you build:
-
-1. Edit your mod's `.csproj` file.
-2. Add this block above the first `</PropertyGroup>` line:
-
- ```xml
- <DeployModZipTo>$(SolutionDir)\_releases</DeployModZipTo>
- ```
-
-That's it! Each time you build, the mod files will be zipped into `_releases\<mod name>.zip`. (You
-can change the value to save the zips somewhere else.)
-
-## Troubleshoot
-### "Failed to find the game install path"
-That error means the package couldn't figure out where the game is installed. You need to specify
-the game location yourself. There's two ways to do that:
-
-* **Option 1: set the path globally.**
- _This will apply to every project that uses version 1.5+ of package._
-
- 1. Get the full folder path containing the Stardew Valley executable.
- 2. Create this file path:
-
- platform | path
- --------- | ----
- Linux/Mac | `~/stardewvalley.targets`
- Windows | `%USERPROFILE%\stardewvalley.targets`
-
- 3. Save the file with this content:
-
- ```xml
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <GamePath>PATH_HERE</GamePath>
- </PropertyGroup>
- </Project>
- ```
-
- 4. Replace `PATH_HERE` with your custom game install path.
-
-* **Option 2: set the path in the project file.**
- _(You'll need to do it for every project that uses the package.)_
- 1. Get the folder path containing the Stardew Valley `.exe` file.
- 2. Add this to your `.csproj` file under the `<Project` line:
-
- ```xml
- <PropertyGroup>
- <GamePath>PATH_HERE</GamePath>
- </PropertyGroup>
- ```
-
- 3. Replace `PATH_HERE` with your custom game install path.
-
-The configuration will check your custom path first, then fall back to the default paths (so it'll
-still compile on a different computer).
-
-## Versions
-See [release notes](release-notes.md).
->>>>>>> mod-build-config/develop
diff --git a/release-notes.md b/release-notes.md
index d6483330..5b102df3 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# Release notes
## 2.0 (upcoming)
<!--See [log](https://github.com/Pathoschild/SMAPI/compare/1.10...2.0).-->
@@ -470,33 +469,3 @@ For SMAPI developers:
* 0.3 (2016-03-01, [log](https://github.com/Pathoschild/SMAPI/compare/Alpha0.2...0.3))
* 0.2 (2016-02-29, [log](https://github.com/Pathoschild/SMAPI/compare/Alpha0.1...Alpha0.2)
* 0.1 (2016-02-28)
-=======
-## Release notes
-### 1.6
-* Added support for deploying mod files into `Mods` automatically.
-* Added a build error if a game folder is found, but doesn't contain Stardew Valley or SMAPI.
-
-### 1.5
-* Added support for setting a custom game path globally.
-* Added default GOG path on Mac.
-
-### 1.4
-* Fixed detection of non-default game paths on 32-bit Windows.
-* Removed support for SilVerPLuM (discontinued).
-* Removed support for overriding the target platform (no longer needed since SMAPI crossplatforms mods automatically).
-
-### 1.3
-* Added support for non-default game paths on Windows.
-
-### 1.2
-* Exclude game binaries from mod build output.
-
-### 1.1
-* Added support for overriding the target platform.
-
-### 1.0
-* Initial release.
-* Added support for detecting the game path automatically.
-* Added support for injecting XNA/MonoGame references automatically based on the OS.
-* Added support for mod builders like SilVerPLuM.
->>>>>>> mod-build-config/develop
diff --git a/src/StardewModdingAPI.ModBuildConfig/README.md b/src/StardewModdingAPI.ModBuildConfig/README.md
new file mode 100644
index 00000000..c261e705
--- /dev/null
+++ b/src/StardewModdingAPI.ModBuildConfig/README.md
@@ -0,0 +1,121 @@
+**Stardew.ModBuildConfig** is an open-source NuGet package which automates the build configuration
+for [Stardew Valley](http://stardewvalley.net/) [SMAPI](https://github.com/Pathoschild/SMAPI) mods.
+
+The package...
+
+* lets you write your mod once, and compile it on any computer. It detects the current platform
+ (Linux, Mac, or Windows) and game install path, and injects the right references automatically.
+* configures Visual Studio so you can debug into the mod code when the game is running (_Windows
+ only_).
+* packages the mod automatically into the game's mod folder when you build the code (_optional_).
+
+## Contents
+* [Install](#install)
+* [Simplify mod development](#simplify-mod-development)
+* [Troubleshoot](#troubleshoot)
+* [Versions](#versions)
+
+## Install
+**When creating a new mod:**
+
+1. Create an empty library project.
+2. Reference the [`Pathoschild.Stardew.ModBuildConfig` NuGet package](https://www.nuget.org/packages/Pathoschild.Stardew.ModBuildConfig).
+3. [Write your code](http://canimod.com/guides/creating-a-smapi-mod).
+4. Compile on any platform.
+
+**When migrating an existing mod:**
+
+1. Remove any project references to `Microsoft.Xna.*`, `MonoGame`, Stardew Valley,
+ `StardewModdingAPI`, and `xTile`.
+2. Reference the [`Pathoschild.Stardew.ModBuildConfig` NuGet package](https://www.nuget.org/packages/Pathoschild.Stardew.ModBuildConfig).
+3. Compile on any platform.
+
+## Simplify mod development
+### Package your mod into the game folder automatically
+You can copy your mod files into the `Mods` folder automatically each time you build, so you don't
+need to do it manually:
+
+1. Edit your mod's `.csproj` file.
+2. Add this block above the first `</PropertyGroup>` line:
+
+ ```xml
+ <DeployModFolderName>$(MSBuildProjectName)</DeployModFolderName>
+ ```
+
+That's it! Each time you build, the files in `<game path>\Mods\<mod name>` will be updated with
+your `manifest.json`, build output, and any `i18n` files.
+
+Notes:
+* To add custom files, just [add them to the build output](https://stackoverflow.com/a/10828462/262123).
+* To customise the folder name, just replace `$(MSBuildProjectName)` with the folder name you want.
+* If your project references another mod, make sure the reference is [_not_ marked 'copy local'](https://msdn.microsoft.com/en-us/library/t1zz5y8c(v=vs.100).aspx).
+
+### Debug into the mod code (Windows-only)
+Stepping into your mod code when the game is running is straightforward, since this package injects
+the configuration automatically. To do it:
+
+1. [Package your mod into the game folder automatically](#package-your-mod-into-the-game-folder-automatically).
+2. Launch the project with debugging in Visual Studio or MonoDevelop.
+
+This will deploy your mod files into the game folder, launch SMAPI, and attach a debugger
+automatically. Now you can step through your code, set breakpoints, etc.
+
+### Create release zips automatically (Windows-only)
+You can create the mod package automatically when you build:
+
+1. Edit your mod's `.csproj` file.
+2. Add this block above the first `</PropertyGroup>` line:
+
+ ```xml
+ <DeployModZipTo>$(SolutionDir)\_releases</DeployModZipTo>
+ ```
+
+That's it! Each time you build, the mod files will be zipped into `_releases\<mod name>.zip`. (You
+can change the value to save the zips somewhere else.)
+
+## Troubleshoot
+### "Failed to find the game install path"
+That error means the package couldn't figure out where the game is installed. You need to specify
+the game location yourself. There's two ways to do that:
+
+* **Option 1: set the path globally.**
+ _This will apply to every project that uses version 1.5+ of package._
+
+ 1. Get the full folder path containing the Stardew Valley executable.
+ 2. Create this file path:
+
+ platform | path
+ --------- | ----
+ Linux/Mac | `~/stardewvalley.targets`
+ Windows | `%USERPROFILE%\stardewvalley.targets`
+
+ 3. Save the file with this content:
+
+ ```xml
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <GamePath>PATH_HERE</GamePath>
+ </PropertyGroup>
+ </Project>
+ ```
+
+ 4. Replace `PATH_HERE` with your custom game install path.
+
+* **Option 2: set the path in the project file.**
+ _(You'll need to do it for every project that uses the package.)_
+ 1. Get the folder path containing the Stardew Valley `.exe` file.
+ 2. Add this to your `.csproj` file under the `<Project` line:
+
+ ```xml
+ <PropertyGroup>
+ <GamePath>PATH_HERE</GamePath>
+ </PropertyGroup>
+ ```
+
+ 3. Replace `PATH_HERE` with your custom game install path.
+
+The configuration will check your custom path first, then fall back to the default paths (so it'll
+still compile on a different computer).
+
+## Versions
+See [release notes](release-notes.md).
diff --git a/assets/nuget-icon.pdn b/src/StardewModdingAPI.ModBuildConfig/assets/nuget-icon.pdn
index 7bd5c0c5..7bd5c0c5 100644
--- a/assets/nuget-icon.pdn
+++ b/src/StardewModdingAPI.ModBuildConfig/assets/nuget-icon.pdn
Binary files differ
diff --git a/assets/nuget-icon.png b/src/StardewModdingAPI.ModBuildConfig/assets/nuget-icon.png
index 611cdf88..611cdf88 100644
--- a/assets/nuget-icon.png
+++ b/src/StardewModdingAPI.ModBuildConfig/assets/nuget-icon.png
Binary files differ
diff --git a/build/smapi.targets b/src/StardewModdingAPI.ModBuildConfig/build/smapi.targets
index a1b6aab3..a1b6aab3 100644
--- a/build/smapi.targets
+++ b/src/StardewModdingAPI.ModBuildConfig/build/smapi.targets
diff --git a/package.nuspec b/src/StardewModdingAPI.ModBuildConfig/package.nuspec
index b8e96481..b8e96481 100644
--- a/package.nuspec
+++ b/src/StardewModdingAPI.ModBuildConfig/package.nuspec
diff --git a/src/StardewModdingAPI.ModBuildConfig/release-notes.md b/src/StardewModdingAPI.ModBuildConfig/release-notes.md
new file mode 100644
index 00000000..ff2734f8
--- /dev/null
+++ b/src/StardewModdingAPI.ModBuildConfig/release-notes.md
@@ -0,0 +1,28 @@
+## Release notes
+### 1.6
+* Added support for deploying mod files into `Mods` automatically.
+* Added a build error if a game folder is found, but doesn't contain Stardew Valley or SMAPI.
+
+### 1.5
+* Added support for setting a custom game path globally.
+* Added default GOG path on Mac.
+
+### 1.4
+* Fixed detection of non-default game paths on 32-bit Windows.
+* Removed support for SilVerPLuM (discontinued).
+* Removed support for overriding the target platform (no longer needed since SMAPI crossplatforms mods automatically).
+
+### 1.3
+* Added support for non-default game paths on Windows.
+
+### 1.2
+* Exclude game binaries from mod build output.
+
+### 1.1
+* Added support for overriding the target platform.
+
+### 1.0
+* Initial release.
+* Added support for detecting the game path automatically.
+* Added support for injecting XNA/MonoGame references automatically based on the OS.
+* Added support for mod builders like SilVerPLuM.