Merge branch 'feature/revamp-installer' into develop

2 files changed, 13 insertions, 42 deletions

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 5762c623..d39e6f3e 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,7 @@
   * Reorganised SMAPI files:
     * Most SMAPI files are now tucked into a `smapi-internal` subfolder.
     * Save backups are now in a `save-backups` subfolder, so they're easier to access. Note that previous backups will be deleted when you update.
+    * Simplified the installer files to avoid confusion.
   * Added support for organising mods:
     * You can now group mods into subfolders to organise them.
     * You can now mark a mod folder ignored by starting the name with a dot (like `.disabled mods`).
@@ -18,6 +19,7 @@
   * Fixed friendly error no longer shown when SMAPI isn't run from the game folder.
   * Fixed some Windows install paths not detected.
   * Fixed installer duplicating bundled mods if you moved them after the last install.
+  * Fixed installer allowing custom mods to be bundled with the install.
   * Fixed translation issues not shown as warnings.
   * Fixed dependencies not correctly enforced if the dependency is installed but failed to load.
   * Fixed some errors logged as SMAPI instead of the affected mod.
diff --git a/docs/technical-docs.md b/docs/technical-docs.md
index 4a8f45f1..83e4ea2b 100644
--- a/docs/technical-docs.md
+++ b/docs/technical-docs.md
@@ -44,7 +44,7 @@ executed. This doesn't work in MonoDevelop on Linux, unfortunately.
 
 ### Preparing a release
 To prepare a crossplatform SMAPI release, you'll need to compile it on two platforms. See
-[crossplatforming info](https://stardewvalleywiki.com/Modding:Creating_a_SMAPI_mod#Test_on_all_platforms)
+[crossplatforming info](https://stardewvalleywiki.com/Modding:Modder_Guide/Test_and_Troubleshoot#Testing_on_all_platforms)
 on the wiki for the first-time setup.
 
 1. Update the version number in `GlobalAssemblyInfo.cs` and `Constants::Version`. Make sure you use a
@@ -57,47 +57,16 @@ on the wiki for the first-time setup.
    release    | `<version>`              | `3.0`
 
 2. In Windows:
-   1. Rebuild the solution in _Release_ mode.
-   2. Rename `bin/Packaged` to `SMAPI <version>` (e.g. `SMAPI 3.0`).
-   2. Transfer the `SMAPI <version>` folder to Linux or Mac.  
-      _This adds the installer executable and Windows files. We'll do the rest in Linux or Mac,
-      since we need to set Unix file permissions that Windows won't save._
-
-2. In Linux or Mac:
-   1. Rebuild the solution in _Release_ mode.
-   2. Copy `bin/internal/Packaged/Mono` into the `SMAPI <version>` folder.
-   3. If you did everything right so far, you should have a folder like this:
-
-      ```
-      SMAPI 3.0 installer/
-         install on Linux.sh
-         install on Mac.command
-         install on Windows.exe
-         README.txt
-         internal/
-            Mono/
-               Mods/*
-               smapi-internal/*
-               StardewModdingAPI
-               StardewModdingAPI.exe
-               StardewModdingAPI.pdb
-               StardewModdingAPI.xml
-               steam_appid.txt
-            Windows/
-               Mods/*
-               smapi-internal/*
-               StardewModdingAPI.exe
-               StardewModdingAPI.pdb
-               StardewModdingAPI.xml
-               steam_appid.txt
-      ```
-   4. Open a terminal in the `SMAPI <version>` folder and run `chmod 755 internal/Mono/StardewModdingAPI`.
-   5. Copy & paste the `SMAPI <version>` folder as `SMAPI <version> for developers`.
-   6. In the `SMAPI <version>` folder...
-      * edit `internal/Mono/StardewModdingAPI.config.json` and
-        `internal/Windows/StardewModdingAPI.config.json` to disable developer mode;
-      * delete `internal/Windows/StardewModdingAPI.xml`.
-   7. Compress the two folders into `SMAPI <version>.zip` and `SMAPI <version> for developers.zip`.
+   1. Rebuild the solution in Release mode.
+   2. Copy `windows.dat` from `bin/SMAPI installer` and `bin/SMAPI installer for developers` to
+      Linux/Mac.
+
+3. In Linux/Mac:
+   1. Rebuild the solution in Release mode.
+   2. Add the `windows.dat` files to the `bin/SMAPI installer` and
+      `bin/SMAPI installer for developers` folders.
+   3. Rename the folders to `SMAPI <version> installer` and `SMAPI <version> installer for developers`.
+   4. Zip the two folders.
 
 ## Customisation
 ### Configuration file