From 9c1617c9ee51a0f6b93242fe8fc789336957460c Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Wed, 11 Apr 2018 21:15:16 -0400
Subject: drop support for Stardew Valley 1.2 (#453)

---
 src/SMAPI.ModBuildConfig/build/smapi.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.ModBuildConfig/build/smapi.targets')

diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index a177840c..78afa7da 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -76,7 +76,7 @@
           <Private>false</Private>
           <Private Condition="$(ModUnitTests)">true</Private>
         </Reference>
-        <Reference Include="Netcode" Condition="Exists('$(GamePath)\Netcode.dll')">
+        <Reference Include="Netcode">
           <HintPath>$(GamePath)\Netcode.dll</HintPath>
           <Private>False</Private>
           <Private Condition="$(ModUnitTests)">true</Private>
-- 
cgit 


From 151789caa98025632048a1a2d7feb3b64c70829e Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Wed, 25 Apr 2018 11:39:35 -0400
Subject: add default GOG install path

---
 build/common.targets                         | 1 +
 docs/release-notes.md                        | 1 +
 src/SMAPI.ModBuildConfig/build/smapi.targets | 1 +
 3 files changed, 3 insertions(+)

(limited to 'src/SMAPI.ModBuildConfig/build/smapi.targets')

diff --git a/build/common.targets b/build/common.targets
index 95885299..588eea1b 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -14,6 +14,7 @@
     <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS</GamePath>
     <!-- Windows paths -->
     <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley</GamePath>
+    <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GOG Galaxy\Games\Stardew Valley</GamePath>
     <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley</GamePath>
     <GamePath Condition="!Exists('$(GamePath)') AND '$(OS)' == 'Windows_NT'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\GOG.com\Games\1453375253', 'PATH', null, RegistryView.Registry32))</GamePath>
     <GamePath Condition="!Exists('$(GamePath)') AND '$(OS)' == 'Windows_NT'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 413150', 'InstallLocation', null, RegistryView.Registry64, RegistryView.Registry32))</GamePath>
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 4fec0c3d..624891eb 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -3,6 +3,7 @@
 * For players:
   * Added support for Stardew Valley 1.3+; no longer compatible with earlier versions.
   * Added warning for mods which don't have update checks configured.
+  * Fixed detection of GOG install path in rare cases.
   * Fixed SMAPI update checks not showing newer beta versions when using a beta version.
   * Fixed console color scheme on Mac or PowerShell, and added override option to `StardewModdingAPI.config.json`.
   * Fixed `world_settime` console command sometimes breaking NPC schedules (e.g. so they stay in bed).
diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index 78afa7da..d33a9637 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -45,6 +45,7 @@
     <When Condition="$(OS) == 'Windows_NT'">
       <PropertyGroup>
         <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley</GamePath>
+        <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GOG Galaxy\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>
-- 
cgit 


From 71efadf2322a622bc5a74614b1575d2680a84165 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 24 Jun 2018 21:26:42 -0400
Subject: add project for toolkit interfaces visible to SMAPI mods (#532)

---
 build/common.targets                               |  8 +-
 build/prepare-install-package.targets              |  4 +
 build/prepare-nuget-package.targets                |  2 +
 src/SMAPI.Installer/InteractiveInstaller.cs        |  2 +
 src/SMAPI.ModBuildConfig/build/smapi.targets       |  5 ++
 src/SMAPI.Tests/StardewModdingAPI.Tests.csproj     |  4 +
 src/SMAPI.sln                                      | 89 ++++++++++++----------
 src/SMAPI/StardewModdingAPI.csproj                 |  4 +
 .../Properties/AssemblyInfo.cs                     |  4 +
 ...StardewModdingAPI.Toolkit.CoreInterfaces.csproj | 19 +++++
 .../Properties/AssemblyInfo.cs                     |  3 -
 .../StardewModdingAPI.Toolkit.csproj               |  8 ++
 12 files changed, 105 insertions(+), 47 deletions(-)
 create mode 100644 src/StardewModdingAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs
 create mode 100644 src/StardewModdingAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj

(limited to 'src/SMAPI.ModBuildConfig/build/smapi.targets')

diff --git a/build/common.targets b/build/common.targets
index 0b8f278f..5b6511f8 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -25,7 +25,7 @@
 
   <!-- add common references -->
   <ItemGroup>
-    <Reference Condition="'$(OS)' == 'Windows_NT' AND '$(MSBuildProjectName)' != 'StardewModdingAPI.Toolkit'" Include="System.Management" />
+    <Reference Condition="'$(OS)' == 'Windows_NT' AND '$(MSBuildProjectName)' != 'StardewModdingAPI.Toolkit' AND '$(MSBuildProjectName)' != 'StardewModdingAPI.Toolkit.CoreInterfaces'" Include="System.Management" />
   </ItemGroup>
 
   <!-- add game references-->
@@ -113,10 +113,14 @@
     <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)\Mods\$(AssemblyName)" Condition="Exists('$(TargetDir)\$(TargetName).pdb')" />
     <Copy SourceFiles="$(TargetDir)\manifest.json" DestinationFolder="$(GamePath)\Mods\$(AssemblyName)" />
   </Target>
-  <Target Name="CopyToolkit" Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI.Toolkit' AND '$(Configuration)' == 'Debug'" AfterTargets="PostBuildEvent">
+  <Target Name="CopyToolkit" Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI.Toolkit' AND '$(Configuration)' == 'Debug' AND $(TargetFramework) == 'net4.5'" AfterTargets="PostBuildEvent">
       <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)" />
       <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)" />
   </Target>
+  <Target Name="CopyToolkitCoreInterfaces" Condition="'$(MSBuildProjectName)' == 'StardewModdingAPI.Toolkit.CoreInterfaces' AND '$(Configuration)' == 'Debug' AND $(TargetFramework) == 'net4.5'" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).dll" DestinationFolder="$(GamePath)" />
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)" />
+  </Target>
 
   <!-- launch SMAPI on debug -->
   <PropertyGroup Condition="$(Configuration) == 'Debug'">
diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets
index 5e00d663..33a92f71 100644
--- a/build/prepare-install-package.targets
+++ b/build/prepare-install-package.targets
@@ -41,6 +41,8 @@
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\steam_appid.txt" DestinationFolder="$(PackageInternalPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.dll" DestinationFolder="$(PackageInternalPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.pdb" DestinationFolder="$(PackageInternalPath)\Mono" />
+    <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.dll" DestinationFolder="$(PackageInternalPath)\Mono" />
+    <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.pdb" DestinationFolder="$(PackageInternalPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="@(CompiledMods)" DestinationFolder="$(PackageInternalPath)\Mono\Mods\%(RecursiveDir)" />
 
     <!-- copy SMAPI files for Windows -->
@@ -56,6 +58,8 @@
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\steam_appid.txt" DestinationFolder="$(PackageInternalPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.dll" DestinationFolder="$(PackageInternalPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.pdb" DestinationFolder="$(PackageInternalPath)\Windows" />
+    <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.dll" DestinationFolder="$(PackageInternalPath)\Windows" />
+    <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledToolkitPath)\StardewModdingAPI.Toolkit.CoreInterfaces.pdb" DestinationFolder="$(PackageInternalPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="@(CompiledMods)" DestinationFolder="$(PackageInternalPath)\Windows\Mods\%(RecursiveDir)" />
   </Target>
 </Project>
diff --git a/build/prepare-nuget-package.targets b/build/prepare-nuget-package.targets
index 5dbc5508..11d1845e 100644
--- a/build/prepare-nuget-package.targets
+++ b/build/prepare-nuget-package.targets
@@ -13,6 +13,8 @@
     <Copy SourceFiles="$(ProjectDir)/package.nuspec" DestinationFolder="$(PackagePath)" />
     <Copy SourceFiles="$(ProjectDir)/build/smapi.targets" DestinationFiles="$(PackagePath)/build/Pathoschild.Stardew.ModBuildConfig.targets" />
     <Copy SourceFiles="$(TargetDir)/StardewModdingAPI.ModBuildConfig.dll" DestinationFiles="$(PackagePath)/build/StardewModdingAPI.ModBuildConfig.dll" />
+    <Copy SourceFiles="$(TargetDir)/StardewModdingAPI.Toolkit.dll" DestinationFiles="$(PackagePath)/build/StardewModdingAPI.Toolkit.dll" />
+    <Copy SourceFiles="$(TargetDir)/StardewModdingAPI.Toolkit.CoreInterfaces.dll" DestinationFiles="$(PackagePath)/build/StardewModdingAPI.Toolkit.CoreInterfaces.dll" />
     <Copy SourceFiles="$(SolutionDir)/SMAPI.ModBuildConfig.Analyzer/bin/netstandard1.3/StardewModdingAPI.ModBuildConfig.Analyzer.dll" DestinationFiles="$(PackagePath)/analyzers/dotnet/cs/StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
     <Copy SourceFiles="$(SolutionDir)/SMAPI.ModBuildConfig.Analyzer/tools/install.ps1" DestinationFiles="$(PackagePath)/tools/install.ps1" />
     <Copy SourceFiles="$(SolutionDir)/SMAPI.ModBuildConfig.Analyzer/tools/uninstall.ps1" DestinationFiles="$(PackagePath)/tools/uninstall.ps1" />
diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs
index f9239604..1221f659 100644
--- a/src/SMAPI.Installer/InteractiveInstaller.cs
+++ b/src/SMAPI.Installer/InteractiveInstaller.cs
@@ -96,6 +96,8 @@ namespace StardewModdingApi.Installer
             yield return GetInstallPath("StardewModdingAPI.metadata.json");
             yield return GetInstallPath("StardewModdingAPI.Toolkit.dll");
             yield return GetInstallPath("StardewModdingAPI.Toolkit.pdb");
+            yield return GetInstallPath("StardewModdingAPI.Toolkit.CoreInterfaces.dll");
+            yield return GetInstallPath("StardewModdingAPI.Toolkit.CoreInterfaces.pdb");
             yield return GetInstallPath("StardewModdingAPI.xml");
             yield return GetInstallPath("System.ValueTuple.dll");
             yield return GetInstallPath("steam_appid.txt");
diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index d33a9637..0869be66 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -92,6 +92,11 @@
           <Private>false</Private>
           <Private Condition="$(ModUnitTests)">true</Private>
         </Reference>
+        <Reference Include="StardewModdingAPI.Toolkit.CoreInterfaces">
+          <HintPath>$(GamePath)\StardewModdingAPI.Toolkit.CoreInterfaces.dll</HintPath>
+          <Private>false</Private>
+          <Private Condition="$(ModUnitTests)">true</Private>
+        </Reference>
         <Reference Include="xTile, Version=2.0.4.0, Culture=neutral, processorArchitecture=x86">
           <HintPath>$(GamePath)\xTile.dll</HintPath>
           <Private>false</Private>
diff --git a/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj b/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj
index 9a203b3b..b2d98d23 100644
--- a/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj
+++ b/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj
@@ -76,6 +76,10 @@
       <Project>{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}</Project>
       <Name>StardewModdingAPI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\StardewModdingAPI.Toolkit.CoreInterfaces\StardewModdingAPI.Toolkit.CoreInterfaces.csproj">
+      <Project>{d5cfd923-37f1-4bc3-9be8-e506e202ac28}</Project>
+      <Name>StardewModdingAPI.Toolkit.CoreInterfaces</Name>
+    </ProjectReference>
     <ProjectReference Include="..\StardewModdingAPI.Toolkit\StardewModdingAPI.Toolkit.csproj">
       <Project>{ea5cfd2e-9453-4d29-b80f-8e0ea23f4ac6}</Project>
       <Name>StardewModdingAPI.Toolkit</Name>
diff --git a/src/SMAPI.sln b/src/SMAPI.sln
index 0eb42cce..005537de 100644
--- a/src/SMAPI.sln
+++ b/src/SMAPI.sln
@@ -62,6 +62,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI.Mods.Save
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StardewModdingAPI.Toolkit", "StardewModdingAPI.Toolkit\StardewModdingAPI.Toolkit.csproj", "{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StardewModdingAPI.Toolkit.CoreInterfaces", "StardewModdingAPI.Toolkit.CoreInterfaces\StardewModdingAPI.Toolkit.CoreInterfaces.csproj", "{D5CFD923-37F1-4BC3-9BE8-E506E202AC28}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		SMAPI.Internal\SMAPI.Internal.projitems*{443ddf81-6aaf-420a-a610-3459f37e5575}*SharedItemsImports = 4
@@ -70,50 +72,53 @@ Global
 		SMAPI.Internal\SMAPI.Internal.projitems*{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Default = Debug|Default
-		Release|Default = Release|Default
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{28480467-1A48-46A7-99F8-236D95225359}.Debug|Default.ActiveCfg = Debug|x86
-		{28480467-1A48-46A7-99F8-236D95225359}.Debug|Default.Build.0 = Debug|x86
-		{28480467-1A48-46A7-99F8-236D95225359}.Release|Default.ActiveCfg = Release|x86
-		{28480467-1A48-46A7-99F8-236D95225359}.Release|Default.Build.0 = Release|x86
-		{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Default.ActiveCfg = Debug|x86
-		{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Default.Build.0 = Debug|x86
-		{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Default.ActiveCfg = Release|x86
-		{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Default.Build.0 = Release|x86
-		{443DDF81-6AAF-420A-A610-3459F37E5575}.Debug|Default.ActiveCfg = Debug|x86
-		{443DDF81-6AAF-420A-A610-3459F37E5575}.Debug|Default.Build.0 = Debug|x86
-		{443DDF81-6AAF-420A-A610-3459F37E5575}.Release|Default.ActiveCfg = Release|x86
-		{443DDF81-6AAF-420A-A610-3459F37E5575}.Release|Default.Build.0 = Release|x86
-		{36CCB19E-92EB-48C7-9615-98EEFD45109B}.Debug|Default.ActiveCfg = Debug|x86
-		{36CCB19E-92EB-48C7-9615-98EEFD45109B}.Debug|Default.Build.0 = Debug|x86
-		{36CCB19E-92EB-48C7-9615-98EEFD45109B}.Release|Default.ActiveCfg = Release|x86
-		{36CCB19E-92EB-48C7-9615-98EEFD45109B}.Release|Default.Build.0 = Release|x86
-		{A308F679-51A3-4006-92D5-BAEC7EBD01A1}.Debug|Default.ActiveCfg = Debug|Any CPU
-		{A308F679-51A3-4006-92D5-BAEC7EBD01A1}.Debug|Default.Build.0 = Debug|Any CPU
-		{A308F679-51A3-4006-92D5-BAEC7EBD01A1}.Release|Default.ActiveCfg = Release|Any CPU
-		{A308F679-51A3-4006-92D5-BAEC7EBD01A1}.Release|Default.Build.0 = Release|Any CPU
-		{EA4F1E80-743F-4A1D-9757-AE66904A196A}.Debug|Default.ActiveCfg = Debug|x86
-		{EA4F1E80-743F-4A1D-9757-AE66904A196A}.Debug|Default.Build.0 = Debug|x86
-		{EA4F1E80-743F-4A1D-9757-AE66904A196A}.Release|Default.ActiveCfg = Release|x86
-		{EA4F1E80-743F-4A1D-9757-AE66904A196A}.Release|Default.Build.0 = Release|x86
-		{80AD8528-AA49-4731-B4A6-C691845815A1}.Debug|Default.ActiveCfg = Debug|Any CPU
-		{80AD8528-AA49-4731-B4A6-C691845815A1}.Debug|Default.Build.0 = Debug|Any CPU
-		{80AD8528-AA49-4731-B4A6-C691845815A1}.Release|Default.ActiveCfg = Release|Any CPU
-		{80AD8528-AA49-4731-B4A6-C691845815A1}.Release|Default.Build.0 = Release|Any CPU
-		{0CF97929-B0D0-4D73-B7BF-4FF7191035F9}.Debug|Default.ActiveCfg = Debug|Any CPU
-		{0CF97929-B0D0-4D73-B7BF-4FF7191035F9}.Debug|Default.Build.0 = Debug|Any CPU
-		{0CF97929-B0D0-4D73-B7BF-4FF7191035F9}.Release|Default.ActiveCfg = Release|Any CPU
-		{0CF97929-B0D0-4D73-B7BF-4FF7191035F9}.Release|Default.Build.0 = Release|Any CPU
-		{E272EB5D-8C57-417E-8E60-C1079D3F53C4}.Debug|Default.ActiveCfg = Debug|x86
-		{E272EB5D-8C57-417E-8E60-C1079D3F53C4}.Debug|Default.Build.0 = Debug|x86
-		{E272EB5D-8C57-417E-8E60-C1079D3F53C4}.Release|Default.ActiveCfg = Release|x86
-		{E272EB5D-8C57-417E-8E60-C1079D3F53C4}.Release|Default.Build.0 = Release|x86
-		{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}.Debug|Default.ActiveCfg = Debug|Any CPU
-		{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}.Debug|Default.Build.0 = Debug|Any CPU
-		{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}.Release|Default.ActiveCfg = Release|Any CPU
-		{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}.Release|Default.Build.0 = Release|Any CPU
+		{28480467-1A48-46A7-99F8-236D95225359}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{28480467-1A48-46A7-99F8-236D95225359}.Debug|Any CPU.Build.0 = Debug|x86
+		{28480467-1A48-46A7-99F8-236D95225359}.Release|Any CPU.ActiveCfg = Release|x86
+		{28480467-1A48-46A7-99F8-236D95225359}.Release|Any CPU.Build.0 = Release|x86
+		{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Any CPU.Build.0 = Debug|x86
+		{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Any CPU.ActiveCfg = Release|x86
+		{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Any CPU.Build.0 = Release|x86
+		{443DDF81-6AAF-420A-A610-3459F37E5575}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{443DDF81-6AAF-420A-A610-3459F37E5575}.Debug|Any CPU.Build.0 = Debug|x86
+		{443DDF81-6AAF-420A-A610-3459F37E5575}.Release|Any CPU.ActiveCfg = Release|x86
+		{36CCB19E-92EB-48C7-9615-98EEFD45109B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{36CCB19E-92EB-48C7-9615-98EEFD45109B}.Debug|Any CPU.Build.0 = Debug|x86
+		{36CCB19E-92EB-48C7-9615-98EEFD45109B}.Release|Any CPU.ActiveCfg = Release|x86
+		{36CCB19E-92EB-48C7-9615-98EEFD45109B}.Release|Any CPU.Build.0 = Release|x86
+		{A308F679-51A3-4006-92D5-BAEC7EBD01A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A308F679-51A3-4006-92D5-BAEC7EBD01A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A308F679-51A3-4006-92D5-BAEC7EBD01A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A308F679-51A3-4006-92D5-BAEC7EBD01A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA4F1E80-743F-4A1D-9757-AE66904A196A}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{EA4F1E80-743F-4A1D-9757-AE66904A196A}.Debug|Any CPU.Build.0 = Debug|x86
+		{EA4F1E80-743F-4A1D-9757-AE66904A196A}.Release|Any CPU.ActiveCfg = Release|x86
+		{EA4F1E80-743F-4A1D-9757-AE66904A196A}.Release|Any CPU.Build.0 = Release|x86
+		{80AD8528-AA49-4731-B4A6-C691845815A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80AD8528-AA49-4731-B4A6-C691845815A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80AD8528-AA49-4731-B4A6-C691845815A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80AD8528-AA49-4731-B4A6-C691845815A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CF97929-B0D0-4D73-B7BF-4FF7191035F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CF97929-B0D0-4D73-B7BF-4FF7191035F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CF97929-B0D0-4D73-B7BF-4FF7191035F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CF97929-B0D0-4D73-B7BF-4FF7191035F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E272EB5D-8C57-417E-8E60-C1079D3F53C4}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{E272EB5D-8C57-417E-8E60-C1079D3F53C4}.Debug|Any CPU.Build.0 = Debug|x86
+		{E272EB5D-8C57-417E-8E60-C1079D3F53C4}.Release|Any CPU.ActiveCfg = Release|x86
+		{E272EB5D-8C57-417E-8E60-C1079D3F53C4}.Release|Any CPU.Build.0 = Release|x86
+		{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA5CFD2E-9453-4D29-B80F-8E0EA23F4AC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5CFD923-37F1-4BC3-9BE8-E506E202AC28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5CFD923-37F1-4BC3-9BE8-E506E202AC28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5CFD923-37F1-4BC3-9BE8-E506E202AC28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5CFD923-37F1-4BC3-9BE8-E506E202AC28}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/SMAPI/StardewModdingAPI.csproj b/src/SMAPI/StardewModdingAPI.csproj
index 2e3ba1cd..a429d204 100644
--- a/src/SMAPI/StardewModdingAPI.csproj
+++ b/src/SMAPI/StardewModdingAPI.csproj
@@ -336,6 +336,10 @@
     <Analyzer Include="..\SMAPI.ModBuildConfig.Analyzer\bin\netstandard1.3\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\StardewModdingAPI.Toolkit.CoreInterfaces\StardewModdingAPI.Toolkit.CoreInterfaces.csproj">
+      <Project>{d5cfd923-37f1-4bc3-9be8-e506e202ac28}</Project>
+      <Name>StardewModdingAPI.Toolkit.CoreInterfaces</Name>
+    </ProjectReference>
     <ProjectReference Include="..\StardewModdingAPI.Toolkit\StardewModdingAPI.Toolkit.csproj">
       <Project>{ea5cfd2e-9453-4d29-b80f-8e0ea23f4ac6}</Project>
       <Name>StardewModdingAPI.Toolkit</Name>
diff --git a/src/StardewModdingAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs b/src/StardewModdingAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..a29ba6cf
--- /dev/null
+++ b/src/StardewModdingAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("SMAPI.Toolkit.CoreInterfaces")]
+[assembly: AssemblyDescription("Provides toolkit interfaces which are available to SMAPI mods.")]
diff --git a/src/StardewModdingAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj b/src/StardewModdingAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj
new file mode 100644
index 00000000..e003122e
--- /dev/null
+++ b/src/StardewModdingAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net4.5;netstandard2.0</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputPath>..\..\bin\$(Configuration)\SMAPI.Toolkit.CoreInterfaces</OutputPath>
+    <RootNamespace>StardewModdingAPI</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\build\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
+  </ItemGroup>
+
+  <Import Project="..\..\build\common.targets" />
+
+</Project>
diff --git a/src/StardewModdingAPI.Toolkit/Properties/AssemblyInfo.cs b/src/StardewModdingAPI.Toolkit/Properties/AssemblyInfo.cs
index 22dcdd96..1bb19e8c 100644
--- a/src/StardewModdingAPI.Toolkit/Properties/AssemblyInfo.cs
+++ b/src/StardewModdingAPI.Toolkit/Properties/AssemblyInfo.cs
@@ -3,8 +3,5 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("SMAPI.Toolkit")]
 [assembly: AssemblyDescription("A library which encapsulates mod-handling logic for mod managers and tools. Not intended for use by mods.")]
-[assembly: AssemblyProduct("SMAPI Toolkit")]
-[assembly: AssemblyVersion("0.1.0")]
-[assembly: AssemblyFileVersion("0.1.0")]
 [assembly: InternalsVisibleTo("StardewModdingAPI")]
 [assembly: InternalsVisibleTo("StardewModdingAPI.Web")]
diff --git a/src/StardewModdingAPI.Toolkit/StardewModdingAPI.Toolkit.csproj b/src/StardewModdingAPI.Toolkit/StardewModdingAPI.Toolkit.csproj
index dda7c17c..904f6786 100644
--- a/src/StardewModdingAPI.Toolkit/StardewModdingAPI.Toolkit.csproj
+++ b/src/StardewModdingAPI.Toolkit/StardewModdingAPI.Toolkit.csproj
@@ -9,12 +9,20 @@
     <OutputPath>..\..\bin\$(Configuration)\SMAPI.Toolkit</OutputPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\build\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.8.4" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Pathoschild.Http.FluentClient" Version="3.2.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\StardewModdingAPI.Toolkit.CoreInterfaces\StardewModdingAPI.Toolkit.CoreInterfaces.csproj" />
+  </ItemGroup>
+
   <Import Project="..\..\build\common.targets" />
 
 </Project>
-- 
cgit 


From c99237e7451808b41bb598aa5242fd9a49bfcc57 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 24 Jun 2018 23:33:21 -0400
Subject: add mod build config option to ignore custom files by regex (#549)

---
 docs/mod-build-config.md                           | 10 +++++++
 src/SMAPI.ModBuildConfig/DeployModTask.cs          | 33 +++++++++++++++++++++-
 .../Framework/ModFileManager.cs                    | 19 +++++++++----
 src/SMAPI.ModBuildConfig/build/smapi.targets       |  1 +
 src/SMAPI.ModBuildConfig/package.nuspec            |  2 ++
 5 files changed, 58 insertions(+), 7 deletions(-)

(limited to 'src/SMAPI.ModBuildConfig/build/smapi.targets')

diff --git a/docs/mod-build-config.md b/docs/mod-build-config.md
index 74ee34e4..32762580 100644
--- a/docs/mod-build-config.md
+++ b/docs/mod-build-config.md
@@ -121,6 +121,16 @@ or you have multiple installs, you can specify the path yourself. There's two wa
 The configuration will check your custom path first, then fall back to the default paths (so it'll
 still compile on a different computer).
 
+### Ignore files
+If you don't want to include a file in the mod folder or release zip:
+* Make sure it's not copied to the build output. For a DLL, make sure the reference is [not marked 'copy local'](https://msdn.microsoft.com/en-us/library/t1zz5y8c(v=vs.100).aspx).
+* Or add this to your `.csproj` file under the `<Project` line:
+  ```xml
+  <IgnoreModFilePatterns>\.txt$, \.pdf$</IgnoreModFilePatterns>
+  ```
+  This is a comma-delimited list of regular expression patterns. If any pattern matches a file's
+  relative path in your mod folder, that file won't be included.
+
 ### Unit test projects
 **(upcoming in 2.1)**
 
diff --git a/src/SMAPI.ModBuildConfig/DeployModTask.cs b/src/SMAPI.ModBuildConfig/DeployModTask.cs
index a5725a81..73971279 100644
--- a/src/SMAPI.ModBuildConfig/DeployModTask.cs
+++ b/src/SMAPI.ModBuildConfig/DeployModTask.cs
@@ -2,6 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
+using System.Text.RegularExpressions;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using StardewModdingAPI.ModBuildConfig.Framework;
@@ -42,6 +44,9 @@ namespace StardewModdingAPI.ModBuildConfig
         [Required]
         public bool EnableModZip { get; set; }
 
+        /// <summary>Custom comma-separated regex patterns matching files to ignore when deploying or zipping the mod.</summary>
+        public string IgnoreModFilePatterns { get; set; }
+
 
         /*********
         ** Public methods
@@ -55,8 +60,11 @@ namespace StardewModdingAPI.ModBuildConfig
 
             try
             {
+                // parse ignore patterns
+                Regex[] ignoreFilePatterns = this.GetCustomIgnorePatterns().ToArray();
+
                 // get mod info
-                ModFileManager package = new ModFileManager(this.ProjectDir, this.TargetDir);
+                ModFileManager package = new ModFileManager(this.ProjectDir, this.TargetDir, ignoreFilePatterns);
 
                 // deploy mod files
                 if (this.EnableModDeploy)
@@ -91,6 +99,29 @@ namespace StardewModdingAPI.ModBuildConfig
         /*********
         ** Private methods
         *********/
+        /// <summary>Get the custom ignore patterns provided by the user.</summary>
+        private IEnumerable<Regex> GetCustomIgnorePatterns()
+        {
+            if (string.IsNullOrWhiteSpace(this.IgnoreModFilePatterns))
+                yield break;
+
+            foreach (string raw in this.IgnoreModFilePatterns.Split(','))
+            {
+                Regex regex;
+                try
+                {
+                    regex = new Regex(raw.Trim(), RegexOptions.IgnoreCase);
+                }
+                catch (Exception ex)
+                {
+                    this.Log.LogWarning($"Ignored invalid <{nameof(this.IgnoreModFilePatterns)}> pattern {raw}:\n{ex}");
+                    continue;
+                }
+
+                yield return regex;
+            }
+        }
+
         /// <summary>Copy the mod files into the game's mod folder.</summary>
         /// <param name="files">The files to include.</param>
         /// <param name="modFolderPath">The folder path to create with the mod files.</param>
diff --git a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
index 41e0201d..524aeaf7 100644
--- a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
+++ b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Web.Script.Serialization;
 using StardewModdingAPI.Toolkit;
 
@@ -26,8 +27,9 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
         /// <summary>Construct an instance.</summary>
         /// <param name="projectDir">The folder containing the project files.</param>
         /// <param name="targetDir">The folder containing the build output.</param>
+        /// <param name="ignoreFilePatterns">Custom regex patterns matching files to ignore when deploying or zipping the mod.</param>
         /// <exception cref="UserErrorException">The mod package isn't valid.</exception>
-        public ModFileManager(string projectDir, string targetDir)
+        public ModFileManager(string projectDir, string targetDir, Regex[] ignoreFilePatterns)
         {
             this.Files = new Dictionary<string, FileInfo>(StringComparer.InvariantCultureIgnoreCase);
 
@@ -72,8 +74,8 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
                 if (hasProjectTranslations && this.EqualsInvariant(relativeDirPath, "i18n"))
                     continue;
 
-                // ignore release zips
-                if (this.ShouldIgnore(file))
+                // handle ignored files
+                if (this.ShouldIgnore(file, relativePath, ignoreFilePatterns))
                     continue;
 
                 // add file
@@ -142,8 +144,10 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
         ** Private methods
         *********/
         /// <summary>Get whether a build output file should be ignored.</summary>
-        /// <param name="file">The file info.</param>
-        private bool ShouldIgnore(FileInfo file)
+        /// <param name="file">The file to check.</param>
+        /// <param name="relativePath">The file's relative path in the package.</param>
+        /// <param name="ignoreFilePatterns">Custom regex patterns matching files to ignore when deploying or zipping the mod.</param>
+        private bool ShouldIgnore(FileInfo file, string relativePath, Regex[] ignoreFilePatterns)
         {
             return
                 // release zips
@@ -159,7 +163,10 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
 
                 // OS metadata files
                 || this.EqualsInvariant(file.Name, ".DS_Store")
-                || this.EqualsInvariant(file.Name, "Thumbs.db");
+                || this.EqualsInvariant(file.Name, "Thumbs.db")
+
+                // custom ignore patterns
+                || ignoreFilePatterns.Any(p => p.IsMatch(relativePath));
         }
 
         /// <summary>Get a case-insensitive dictionary matching the given JSON.</summary>
diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index 0869be66..9946e1a6 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -166,6 +166,7 @@
       ProjectDir="$(ProjectDir)"
       TargetDir="$(TargetDir)"
       GameDir="$(GamePath)"
+      IgnoreModFilePatterns="$(IgnoreModFilePatterns)"
     />
   </Target>
 </Project>
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index fa26875b..1b1b25fd 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -16,6 +16,8 @@
       - Added support for Stardew Valley 1.3.
       - Added support for unit test projects.
       - Added C# analyzers to warn about implicit conversions of Netcode fields in Stardew Valley 1.3.
+      - Added option to ignore files by regex pattern.
+      - Added reference to new SMAPI DLL.
     </releaseNotes>
   </metadata>
 </package>
-- 
cgit 


From d67690ea3ea76512af194168af02a29120765247 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 30 Jun 2018 00:00:29 -0400
Subject: fix new DLL not referenced by build config package on Linux/Mac
 (#532)

---
 src/SMAPI.ModBuildConfig/build/smapi.targets | 5 +++++
 src/SMAPI.ModBuildConfig/package.nuspec      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI.ModBuildConfig/build/smapi.targets')

diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index 9946e1a6..f5691fec 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -131,6 +131,11 @@
           <Private>false</Private>
           <Private Condition="$(ModUnitTests)">true</Private>
         </Reference>
+        <Reference Include="StardewModdingAPI.Toolkit.CoreInterfaces">
+          <HintPath>$(GamePath)\StardewModdingAPI.Toolkit.CoreInterfaces.dll</HintPath>
+          <Private>false</Private>
+          <Private Condition="$(ModUnitTests)">true</Private>
+        </Reference>
         <Reference Include="xTile">
           <HintPath>$(GamePath)\xTile.dll</HintPath>
           <Private>false</Private>
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index 789868a0..68746648 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Pathoschild.Stardew.ModBuildConfig</id>
-    <version>2.1.0-beta-20180625</version>
+    <version>2.1.0-beta-20180629</version>
     <title>Build package for SMAPI mods</title>
     <authors>Pathoschild</authors>
     <owners>Pathoschild</owners>
-- 
cgit 


From 4b646e4f927f4c44004b3b233b6be055a645b563 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 30 Jun 2018 14:54:15 -0400
Subject: generalise NuGet package's non-mod project feature (#555)

---
 docs/mod-build-config.md                     | 16 +++++++------
 src/SMAPI.ModBuildConfig/build/smapi.targets | 34 ++++++++++++----------------
 src/SMAPI.ModBuildConfig/package.nuspec      |  2 +-
 3 files changed, 25 insertions(+), 27 deletions(-)

(limited to 'src/SMAPI.ModBuildConfig/build/smapi.targets')

diff --git a/docs/mod-build-config.md b/docs/mod-build-config.md
index 32762580..0c1cc10a 100644
--- a/docs/mod-build-config.md
+++ b/docs/mod-build-config.md
@@ -131,18 +131,20 @@ If you don't want to include a file in the mod folder or release zip:
   This is a comma-delimited list of regular expression patterns. If any pattern matches a file's
   relative path in your mod folder, that file won't be included.
 
-### Unit test projects
+### Non-mod projects
 **(upcoming in 2.1)**
 
-You can use the package in unit test projects too. Its optional unit test mode...
+You can use the package in non-mod projects too (e.g. unit tests or framework DLLs). You'll need to
+disable deploying the mod and creating a release zip:
 
-1. disables deploying the project as a mod;
-2. disables creating a release zip;
-2. and copies the referenced DLLs into the build output for unit test frameworks.
+```xml
+<EnableModDeploy>False</EnableModDeploy>
+<EnableModZip>False</EnableModZip>
+```
 
-To enable it, add this above the first `</PropertyGroup>` in your `.csproj`:
+If this is for unit tests, you may need to copy the referenced DLLs into your build output too:
 ```xml
-<ModUnitTests>True</ModUnitTests>
+<CopyModReferencesToBuildOutput>True</CopyModReferencesToBuildOutput>
 ```
 
 ## Code warnings
diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index f5691fec..8ca178cc 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -19,14 +19,10 @@
 
     <!-- set default settings -->
     <ModFolderName Condition="'$(ModFolderName)' == ''">$(MSBuildProjectName)</ModFolderName>
-    <ModUnitTests Condition="'$(ModUnitTests)' == ''">False</ModUnitTests>
     <ModZipPath Condition="'$(ModZipPath)' == ''">$(TargetDir)</ModZipPath>
     <EnableModDeploy Condition="'$(EnableModDeploy)' == ''">True</EnableModDeploy>
     <EnableModZip Condition="'$(EnableModZip)' == ''">True</EnableModZip>
-
-    <!-- disable mod deploy in unit test project -->
-    <EnableModDeploy Condition="'$(ModUnitTests)' == true">False</EnableModDeploy>
-    <EnableModZip Condition="'$(ModUnitTests)' == true">False</EnableModZip>
+    <CopyModReferencesToBuildOutput Condition="'$(CopyModReferencesToBuildOutput)' == ''">False</CopyModReferencesToBuildOutput>
   </PropertyGroup>
 
   <!-- find platform + game path -->
@@ -63,45 +59,45 @@
       <ItemGroup>
         <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="Netcode">
           <HintPath>$(GamePath)\Netcode.dll</HintPath>
           <Private>False</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="Stardew Valley">
           <HintPath>$(GamePath)\Stardew Valley.exe</HintPath>
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="StardewModdingAPI">
           <HintPath>$(GamePath)\StardewModdingAPI.exe</HintPath>
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="StardewModdingAPI.Toolkit.CoreInterfaces">
           <HintPath>$(GamePath)\StardewModdingAPI.Toolkit.CoreInterfaces.dll</HintPath>
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="xTile, Version=2.0.4.0, Culture=neutral, processorArchitecture=x86">
           <HintPath>$(GamePath)\xTile.dll</HintPath>
           <Private>false</Private>
           <SpecificVersion>False</SpecificVersion>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
       </ItemGroup>
 
@@ -119,27 +115,27 @@
           <HintPath>$(GamePath)\MonoGame.Framework.dll</HintPath>
           <Private>false</Private>
           <SpecificVersion>False</SpecificVersion>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="StardewValley">
           <HintPath>$(GamePath)\StardewValley.exe</HintPath>
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="StardewModdingAPI">
           <HintPath>$(GamePath)\StardewModdingAPI.exe</HintPath>
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="StardewModdingAPI.Toolkit.CoreInterfaces">
           <HintPath>$(GamePath)\StardewModdingAPI.Toolkit.CoreInterfaces.dll</HintPath>
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
         <Reference Include="xTile">
           <HintPath>$(GamePath)\xTile.dll</HintPath>
           <Private>false</Private>
-          <Private Condition="$(ModUnitTests)">true</Private>
+          <Private Condition="$(CopyModReferencesToBuildOutput)">true</Private>
         </Reference>
       </ItemGroup>
     </Otherwise>
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index 68746648..cb6e41e1 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -14,7 +14,7 @@
     <releaseNotes>
       2.1:
       - Added support for Stardew Valley 1.3.
-      - Added support for unit test projects.
+      - Added support for non-mod projects.
       - Added C# analyzers to warn about implicit conversions of Netcode fields in Stardew Valley 1.3.
       - Added option to ignore files by regex pattern.
       - Added reference to new SMAPI DLL.
-- 
cgit 


From a03a94f6f273ca71dd0a8d38bbff4714cda8d309 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 13 Jul 2018 19:25:23 -0400
Subject: fixed some game paths not detected by NuGet package

---
 src/SMAPI.ModBuildConfig/build/smapi.targets | 8 ++++++++
 src/SMAPI.ModBuildConfig/package.nuspec      | 1 +
 2 files changed, 9 insertions(+)

(limited to 'src/SMAPI.ModBuildConfig/build/smapi.targets')

diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index 8ca178cc..d1c8a4eb 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -31,6 +31,7 @@
       <PropertyGroup>
         <!-- Linux -->
         <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/GOG Games/Stardew Valley/game</GamePath>
+        <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.steam/steam/steamapps/common/Stardew Valley</GamePath>
         <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.local/share/Steam/steamapps/common/Stardew Valley</GamePath>
 
         <!-- Mac (may be 'Unix' or 'OSX') -->
@@ -40,11 +41,18 @@
     </When>
     <When Condition="$(OS) == 'Windows_NT'">
       <PropertyGroup>
+        <!-- default paths -->
         <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley</GamePath>
         <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GOG Galaxy\Games\Stardew Valley</GamePath>
         <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley</GamePath>
+
+        <!-- registry paths -->
         <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>
+
+        <!-- derive from Steam library path -->
+        <_SteamLibraryPath>$([MSBuild]::GetRegistryValueFromView('HKEY_CURRENT_USER\SOFTWARE\Valve\Steam', 'SteamPath', null, RegistryView.Registry32))</_SteamLibraryPath>
+        <GamePath Condition="!Exists('$(GamePath)') AND '$(_SteamLibraryPath)' != ''">$(_SteamLibraryPath)\steamapps\common\Stardew Valley</GamePath>
       </PropertyGroup>
     </When>
   </Choose>
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index bb142c33..b047bfa1 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -18,6 +18,7 @@
       - Added C# analyzers to warn about implicit conversions of Netcode fields in Stardew Valley 1.3.
       - Added option to ignore files by regex pattern.
       - Added reference to new SMAPI DLL.
+      - Fixed some game paths not detected by NuGet package.
     </releaseNotes>
   </metadata>
 </package>
-- 
cgit