reorganise to avoid errors deploying web app, fix WMI error in Linux installer

2 files changed, 3 insertions, 61 deletions

diff --git a/src/SMAPI.Internal/RewriteFacades/SpriteBatchMethods.cs b/src/SMAPI.Internal/RewriteFacades/SpriteBatchMethods.cs
deleted file mode 100644
index 5e5d117e..00000000
--- a/src/SMAPI.Internal/RewriteFacades/SpriteBatchMethods.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-
-namespace StardewModdingAPI.Internal.RewriteFacades
-{
-    /// <summary>Provides <see cref="SpriteBatch"/> method signatures that can be injected into mod code for compatibility between Linux/Mac or Windows.</summary>
-    public class SpriteBatchMethods : SpriteBatch
-    {
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Construct an instance.</summary>
-        public SpriteBatchMethods(GraphicsDevice graphicsDevice) : base(graphicsDevice) { }
-
-
-        /****
-        ** MonoGame signatures
-        ****/
-        [SuppressMessage("ReSharper", "CS0109", Justification = "The 'new' modifier applies when compiled on Linux/Mac.")]
-        public new void Begin(SpriteSortMode sortMode, BlendState blendState, SamplerState samplerState, DepthStencilState depthStencilState, RasterizerState rasterizerState, Effect effect, Matrix? matrix)
-        {
-            base.Begin(sortMode, blendState, samplerState, depthStencilState, rasterizerState, effect, matrix ?? Matrix.Identity);
-        }
-
-        /****
-        ** XNA signatures
-        ****/
-        [SuppressMessage("ReSharper", "CS0109", Justification = "The 'new' modifier applies when compiled on Windows.")]
-        public new void Begin()
-        {
-            base.Begin();
-        }
-
-        [SuppressMessage("ReSharper", "CS0109", Justification = "The 'new' modifier applies when compiled on Windows.")]
-        public new void Begin(SpriteSortMode sortMode, BlendState blendState)
-        {
-            base.Begin(sortMode, blendState);
-        }
-
-        [SuppressMessage("ReSharper", "CS0109", Justification = "The 'new' modifier applies when compiled on Windows.")]
-        public new void Begin(SpriteSortMode sortMode, BlendState blendState, SamplerState samplerState, DepthStencilState depthStencilState, RasterizerState rasterizerState)
-        {
-            base.Begin(sortMode, blendState, samplerState, depthStencilState, rasterizerState);
-        }
-
-        [SuppressMessage("ReSharper", "CS0109", Justification = "The 'new' modifier applies when compiled on Windows.")]
-        public new void Begin(SpriteSortMode sortMode, BlendState blendState, SamplerState samplerState, DepthStencilState depthStencilState, RasterizerState rasterizerState, Effect effect)
-        {
-            base.Begin(sortMode, blendState, samplerState, depthStencilState, rasterizerState, effect);
-        }
-
-        [SuppressMessage("ReSharper", "CS0109", Justification = "The 'new' modifier applies when compiled on Windows.")]
-        public new void Begin(SpriteSortMode sortMode, BlendState blendState, SamplerState samplerState, DepthStencilState depthStencilState, RasterizerState rasterizerState, Effect effect, Matrix transformMatrix)
-        {
-            base.Begin(sortMode, blendState, samplerState, depthStencilState, rasterizerState, effect, transformMatrix);
-        }
-    }
-}
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 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <!-- WMI for environment info -->
+    <Reference Condition="'$(OS)' == 'Windows_NT'" Include="System.Management" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\build\GlobalAssemblyInfo.cs">
@@ -41,9 +43,8 @@
     <Compile Include="Models\ModSeachModel.cs" />
     <Compile Include="Platform.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RewriteFacades\SpriteBatchMethods.cs" />
     <Compile Include="SemanticVersionImpl.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\build\common.targets" />
+  <Import Project="..\..\build\constants.targets" />
 </Project>
\ No newline at end of file