From 2b8d237fd4585d14ea837764ac247d4cd200158f Mon Sep 17 00:00:00 2001
From: Ethan Lee <flibitijibibo@gmail.com>
Date: Mon, 1 Mar 2021 09:20:52 -0500
Subject: [PATCH] Support SDL2-CS.Settings.props for both project types

---
 SDL2-CS.Core.csproj | 2 +-
 SDL2-CS.csproj      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/SDL2-CS.Core.csproj b/SDL2-CS.Core.csproj
index 8962fde..0d7a856 100644
--- a/SDL2-CS.Core.csproj
+++ b/SDL2-CS.Core.csproj
@@ -11,7 +11,7 @@
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	</PropertyGroup>
 	<PropertyGroup>
-		<SDLSettingsPropsFilePath>$(SolutionDir)SDL-CS.Settings.props</SDLSettingsPropsFilePath>
+		<SDLSettingsPropsFilePath>$(SolutionDir)SDL2-CS.Settings.props</SDLSettingsPropsFilePath>
 	</PropertyGroup>
 	<Import Project="$(SDLSettingsPropsFilePath)" Condition="Exists('$(SDLSettingsPropsFilePath)')" />
 	<Target Name="ValidatePropsFilePath" BeforeTargets="BeforeBuild">
diff --git a/SDL2-CS.csproj b/SDL2-CS.csproj
index 68da8c8..3575229 100644
--- a/SDL2-CS.csproj
+++ b/SDL2-CS.csproj
@@ -75,6 +75,14 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <SDLSettingsPropsFilePath>$(SolutionDir)SDL2-CS.Settings.props</SDLSettingsPropsFilePath>
+  </PropertyGroup>
+  <Import Project="$(SDLSettingsPropsFilePath)" Condition="Exists('$(SDLSettingsPropsFilePath)')" />
+  <Target Name="ValidatePropsFilePath" BeforeTargets="BeforeBuild">
+    <Message Importance="High" Text="No property overrides found at '$(SDLSettingsPropsFilePath)'" Condition="!Exists('$(SDLSettingsPropsFilePath)')" />
+    <Message Importance="High" Text="Loaded property overrides from '$(SDLSettingsPropsFilePath)'" Condition="Exists('$(SDLSettingsPropsFilePath)')" />
+  </Target>
   <ItemGroup>
     <Compile Include="src\SDL2.cs" />
     <Compile Include="src\SDL2_image.cs" />