diff --git a/build/common.targets b/build/build.targets
similarity index 68%
rename from build/common.targets
rename to build/build.targets
index 54e24c74..270fd95d 100644
--- a/build/common.targets
+++ b/build/build.targets
@@ -1,35 +1,8 @@
-
-
-
-
-
-
-
- $(HOME)/GOG Games/Stardew Valley/game
- $(HOME)/.local/share/Steam/steamapps/common/Stardew Valley
- $(HOME)/.steam/steam/steamapps/common/Stardew Valley
-
- /Applications/Stardew Valley.app/Contents/MacOS
- $(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS
-
- C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley
- C:\Program Files (x86)\GOG Galaxy\Games\Stardew Valley
- C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley
- $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\GOG.com\Games\1453375253', 'PATH', null, RegistryView.Registry32))
- $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 413150', 'InstallLocation', null, RegistryView.Registry64, RegistryView.Registry32))
-
-
-
- $(DefineConstants);SMAPI_FOR_WINDOWS
-
-
-
-
False
@@ -61,9 +34,6 @@
-
- $(DefineConstants);SMAPI_FOR_UNIX
-
diff --git a/build/constants.targets b/build/constants.targets
new file mode 100644
index 00000000..3e10462a
--- /dev/null
+++ b/build/constants.targets
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+ $(HOME)/GOG Games/Stardew Valley/game
+ $(HOME)/.local/share/Steam/steamapps/common/Stardew Valley
+ $(HOME)/.steam/steam/steamapps/common/Stardew Valley
+
+ /Applications/Stardew Valley.app/Contents/MacOS
+ $(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS
+
+ C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley
+ C:\Program Files (x86)\GOG Galaxy\Games\Stardew Valley
+ C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley
+ $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\GOG.com\Games\1453375253', 'PATH', null, RegistryView.Registry32))
+ $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 413150', 'InstallLocation', null, RegistryView.Registry64, RegistryView.Registry32))
+
+
+ $(DefineConstants);SMAPI_FOR_WINDOWS
+
+
diff --git a/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj b/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj
index 4f849b9b..dd349e09 100644
--- a/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj
+++ b/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj
@@ -64,6 +64,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/SMAPI.Internal/StardewModdingAPI.Internal.csproj b/src/SMAPI.Internal/StardewModdingAPI.Internal.csproj
index 6e7fa368..a87dcb0a 100644
--- a/src/SMAPI.Internal/StardewModdingAPI.Internal.csproj
+++ b/src/SMAPI.Internal/StardewModdingAPI.Internal.csproj
@@ -31,6 +31,8 @@
+
+
@@ -41,9 +43,8 @@
-
-
+
\ No newline at end of file
diff --git a/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj
index 02564409..c6d25c19 100644
--- a/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj
+++ b/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj
@@ -62,5 +62,6 @@
+
\ No newline at end of file
diff --git a/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj b/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj
index d1f72c6c..15c1c9a8 100644
--- a/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj
+++ b/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj
@@ -94,5 +94,6 @@
-
+
+
\ No newline at end of file
diff --git a/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj b/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj
index 0c793817..001b006c 100644
--- a/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj
+++ b/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj
@@ -78,7 +78,8 @@
-
+
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
diff --git a/src/SMAPI.sln b/src/SMAPI.sln
index ff953751..282d8397 100644
--- a/src/SMAPI.sln
+++ b/src/SMAPI.sln
@@ -43,7 +43,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{EB35A917-6
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{09CF91E5-5BAB-4650-A200-E5EA9A633046}"
ProjectSection(SolutionItems) = preProject
- ..\build\common.targets = ..\build\common.targets
+ ..\build\build.targets = ..\build\build.targets
+ ..\build\constants.targets = ..\build\constants.targets
..\build\GlobalAssemblyInfo.cs = ..\build\GlobalAssemblyInfo.cs
..\build\prepare-install-package.targets = ..\build\prepare-install-package.targets
..\build\prepare-nuget-package.targets = ..\build\prepare-nuget-package.targets
diff --git a/src/SMAPI.Internal/RewriteFacades/SpriteBatchMethods.cs b/src/SMAPI/Framework/RewriteFacades/SpriteBatchMethods.cs
similarity index 94%
rename from src/SMAPI.Internal/RewriteFacades/SpriteBatchMethods.cs
rename to src/SMAPI/Framework/RewriteFacades/SpriteBatchMethods.cs
index 5e5d117e..5dd21b92 100644
--- a/src/SMAPI.Internal/RewriteFacades/SpriteBatchMethods.cs
+++ b/src/SMAPI/Framework/RewriteFacades/SpriteBatchMethods.cs
@@ -2,9 +2,10 @@ using System.Diagnostics.CodeAnalysis;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-namespace StardewModdingAPI.Internal.RewriteFacades
+namespace StardewModdingAPI.Framework.RewriteFacades
{
/// Provides method signatures that can be injected into mod code for compatibility between Linux/Mac or Windows.
+ /// This is public to support SMAPI rewriting and should not be referenced directly by mods.
public class SpriteBatchMethods : SpriteBatch
{
/*********
diff --git a/src/SMAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs
index c7abfbef..1063ae71 100644
--- a/src/SMAPI/Metadata/InstructionMetadata.cs
+++ b/src/SMAPI/Metadata/InstructionMetadata.cs
@@ -4,7 +4,7 @@ using StardewModdingAPI.Events;
using StardewModdingAPI.Framework.ModLoading;
using StardewModdingAPI.Framework.ModLoading.Finders;
using StardewModdingAPI.Framework.ModLoading.Rewriters;
-using StardewModdingAPI.Internal.RewriteFacades;
+using StardewModdingAPI.Framework.RewriteFacades;
using StardewValley;
namespace StardewModdingAPI.Metadata
diff --git a/src/SMAPI/StardewModdingAPI.csproj b/src/SMAPI/StardewModdingAPI.csproj
index 31bfd6fd..ca6459fe 100644
--- a/src/SMAPI/StardewModdingAPI.csproj
+++ b/src/SMAPI/StardewModdingAPI.csproj
@@ -127,6 +127,7 @@
+
@@ -313,5 +314,6 @@
-
+
+
\ No newline at end of file