summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2018-12-14 18:59:49 -0500
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2018-12-14 18:59:49 -0500
commit567c216161f00767b5dcdb0adf40a3bee91d18d0 (patch)
treeb7be9cdccd3c47133ef7e8fcbbaece2d9a95980c
parentc6135e0759fc0f50c873b0278f006aeb7e67e712 (diff)
downloadSMAPI-567c216161f00767b5dcdb0adf40a3bee91d18d0.tar.gz
SMAPI-567c216161f00767b5dcdb0adf40a3bee91d18d0.tar.bz2
SMAPI-567c216161f00767b5dcdb0adf40a3bee91d18d0.zip
fix unix launcher included in Windows installer
-rw-r--r--build/prepare-install-package.targets4
-rw-r--r--docs/release-notes.md1
2 files changed, 3 insertions, 2 deletions
diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets
index 3a870bd2..cd758e96 100644
--- a/build/prepare-install-package.targets
+++ b/build/prepare-install-package.targets
@@ -33,7 +33,6 @@
<Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(TargetDir)\windows-exe-config.xml" DestinationFiles="$(PackagePath)\internal\$(PlatformName)-install.exe.config" />
<!--copy bundle files-->
- <Copy SourceFiles="$(TargetDir)\unix-launcher.sh" DestinationFiles="$(PackagePath)\bundle\StardewModdingAPI" />
<Copy SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.exe" DestinationFolder="$(PackagePath)\bundle" />
<Copy SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.pdb" DestinationFolder="$(PackagePath)\bundle" />
<Copy SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.xml" DestinationFolder="$(PackagePath)\bundle" />
@@ -50,9 +49,10 @@
<Copy SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.pdb" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
<Copy SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.xml" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
<Copy SourceFiles="@(CompiledMods)" DestinationFolder="$(PackagePath)\bundle\Mods\%(RecursiveDir)" />
- <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(TargetDir)\windows-exe-config.xml" DestinationFiles="$(PackagePath)\bundle\StardewModdingAPI.exe.config" />
+ <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(TargetDir)\unix-launcher.sh" DestinationFiles="$(PackagePath)\bundle\StardewModdingAPI" />
<Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
<Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Runtime.Caching.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
+ <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(TargetDir)\windows-exe-config.xml" DestinationFiles="$(PackagePath)\bundle\StardewModdingAPI.exe.config" />
<!-- fix errors on Linux/Mac (sample: https://log.smapi.io/mMdFUpgB) -->
<Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(RootPath)\build\lib\System.Numerics.dll" DestinationFolder="$(PackagePath)\bundle\smapi-internal" />
diff --git a/docs/release-notes.md b/docs/release-notes.md
index c3b11d7f..0e426bfd 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -6,6 +6,7 @@
* Fixed invalid NPC data propagated when a mod changes NPC dispositions.
* Fixed `Display.RenderedWorld` event broken in SMAPI 2.9.1.
* Fixed game launch crash logged as `SMAPI` instead of `game`.
+ * Fixed Windows installer adding unneeded Unix launcher to game folder.
* For modders:
* Added dedicated content pack API.