Merge branch 'develop'

2 files changed, 40 insertions, 31 deletions

diff --git a/build/smapi.targets b/build/smapi.targets
index ea6af723..b2ce5967 100644
--- a/build/smapi.targets
+++ b/build/smapi.targets
@@ -6,35 +6,41 @@
   <Import Condition="$(OS) == 'Windows_NT' AND Exists('$(USERPROFILE)\stardewvalley.targets')" Project="$(USERPROFILE)\stardewvalley.targets" />
 
   <!--######
-  ## select target OS
+  ## find platform + game path
   #######-->
-  <PropertyGroup>
-    <GamePlatform Condition="$(OS) == 'Unix'">Linux</GamePlatform>
-    <GamePlatform Condition="$(OS) == 'OSX'">Mac</GamePlatform>
-    <GamePlatform Condition="$(OS) == 'Windows_NT'">Windows</GamePlatform>
-  </PropertyGroup>
-
-  <!--######
-  ## select game path
-  #######-->
-  <PropertyGroup>
-    <!-- Linux -->
-    <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/GOG Games/Stardew Valley/game</GamePath>
-    <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.local/share/Steam/steamapps/common/Stardew Valley</GamePath>
-
-    <!-- Mac -->
-    <GamePath Condition="!Exists('$(GamePath)')">/Applications/Stardew Valley.app/Contents/MacOS</GamePath>
-    <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS</GamePath>
-
-    <!-- Windows -->
-    <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley</GamePath>
-    <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley</GamePath>
-    <GamePath Condition="!Exists('$(GamePath)') AND '$(GamePlatform)' == 'Windows'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\GOG.com\Games\1453375253', 'PATH', null, RegistryView.Registry32))</GamePath>
-    <GamePath Condition="!Exists('$(GamePath)') AND '$(GamePlatform)' == 'Windows'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 413150', 'InstallLocation', null, RegistryView.Registry64, RegistryView.Registry32))</GamePath>
-  </PropertyGroup>
+  <Choose>
+    <When Condition="$(OS) == 'Unix'">
+      <PropertyGroup>
+        <GamePlatform>Linux</GamePlatform>
+        <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/GOG Games/Stardew Valley/game</GamePath>
+        <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.local/share/Steam/steamapps/common/Stardew Valley</GamePath>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(OS) == 'OSX'">
+      <PropertyGroup>
+        <GamePlatform>Mac</GamePlatform>
+        <GamePath Condition="!Exists('$(GamePath)')">/Applications/Stardew Valley.app/Contents/MacOS</GamePath>
+        <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS</GamePath>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(OS) == 'Windows_NT'">
+      <PropertyGroup>
+        <GamePlatform>Windows</GamePlatform>
+        <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley</GamePath>
+        <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley</GamePath>
+        <GamePath Condition="!Exists('$(GamePath)')">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\GOG.com\Games\1453375253', 'PATH', null, RegistryView.Registry32))</GamePath>
+        <GamePath Condition="!Exists('$(GamePath)')">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 413150', 'InstallLocation', null, RegistryView.Registry64, RegistryView.Registry32))</GamePath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <GamePlatform></GamePlatform>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
 
   <!--######
-  ## set up configuration
+  ## configure build
   #######-->
   <Choose>
     <When Condition="$(GamePlatform) == 'Windows'">
@@ -99,6 +105,9 @@
   ## validate
   #######-->
   <Target Name="BeforeBuild">
+    <!-- show error for unknown platform -->
+    <Error Condition="'$(GamePlatform)' != 'Linux' AND '$(GamePlatform)' != 'Mac' AND '$(GamePlatform)' != 'Windows'" Text="The build config package doesn't recognise OS type '$(OS)' (mapped to game platform '$(GamePlatform)')." />
+
     <!-- if game path is invalid, show one user-friendly error instead of a slew of reference errors -->
     <Error Condition="!Exists('$(GamePath)')" Text="Failed to find the game install path. See https://github.com/Pathoschild/Stardew.ModBuildConfig#troubleshoot for help." />
     <Error Condition="'$(GamePlatform)' == 'Windows' AND !Exists('$(GamePath)\Stardew Valley.exe')" Text="Found a game folder at $(GamePath), but it doesn't contain Stardew Valley. You should delete this folder if it's empty." />
@@ -107,7 +116,7 @@
   </Target>
 
   <!--######
-  ## deploy mod files
+  ## deploy mod files on build
   #######-->
   <Target Name="AfterBuild" Condition="'$(DeployModFolderName)' != ''">
     <!--generate paths-->
diff --git a/package.nuspec b/package.nuspec
index c68d57c6..900e2a5b 100644
--- a/package.nuspec
+++ b/package.nuspec
@@ -2,16 +2,16 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Pathoschild.Stardew.ModBuildConfig</id>
-    <version>1.6</version>
+    <version>1.6.1</version>
     <title>MSBuild config for Stardew Valley mods</title>
     <authors>Pathoschild</authors>
     <owners>Pathoschild</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <licenseUrl>https://github.com/Pathoschild/Stardew.ModBuildConfig/blob/1.6/LICENSE.txt</licenseUrl>
+    <licenseUrl>https://github.com/Pathoschild/Stardew.ModBuildConfig/blob/1.6.1/LICENSE.txt</licenseUrl>
     <projectUrl>https://github.com/Pathoschild/Stardew.ModBuildConfig#readme</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/Pathoschild/Stardew.ModBuildConfig/1.6/assets/nuget-icon.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/Pathoschild/Stardew.ModBuildConfig/1.6.1/assets/nuget-icon.png</iconUrl>
     <description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods.</description>
-    <releaseNotes>SMAPI mods are now deployed automatically to your game folder if you set the 'DeployModFolderName' property; added a build error if a game folder is found, but it doesn't contain Stardew Valley or SMAPI.</releaseNotes>
+    <releaseNotes>Improved OS and game path detection.</releaseNotes>
   </metadata>
   <files>
     <file src="build/smapi.targets" target="build/Pathoschild.Stardew.ModBuildConfig.targets" />