From a62d8a5383bff5631e309b1dd4a0339f9e8e4b29 Mon Sep 17 00:00:00 2001
From: Caleb Cornett <caleb.cornett@outlook.com>
Date: Sat, 13 Aug 2022 21:20:24 -0400
Subject: [PATCH] Combine all dependencies into the main csproj

---
 MoonWorks.csproj       | 10 +++++-----
 MoonWorks.sln          | 32 --------------------------------
 src/MoonWorksDllMap.cs |  6 +-----
 3 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/MoonWorks.csproj b/MoonWorks.csproj
index 31c1fce8..a20c72a0 100644
--- a/MoonWorks.csproj
+++ b/MoonWorks.csproj
@@ -11,11 +11,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include=".\lib\SDL2-CS\SDL2-CS.Core.csproj" />
-		<ProjectReference Include=".\lib\RefreshCS\RefreshCS.csproj" />
-		<ProjectReference Include=".\lib\FAudio\csharp\FAudio-CS.Core.csproj" />
-		<ProjectReference Include=".\lib\WellspringCS\WellspringCS.csproj" />
-		<ProjectReference Include=".\lib\Theorafile\csharp\Theorafile-CS.Core.csproj" />
+		<Compile Include="lib\FAudio\csharp\FAudio.cs" />
+		<Compile Include="lib\RefreshCS\src\Refresh.cs" />
+		<Compile Include="lib\SDL2-CS\src\SDL2.cs" />
+		<Compile Include="lib\Theorafile\csharp\Theorafile.cs" />
+		<Compile Include="lib\WellspringCS\WellspringCS.cs" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/MoonWorks.sln b/MoonWorks.sln
index e5362768..748c5d44 100644
--- a/MoonWorks.sln
+++ b/MoonWorks.sln
@@ -4,19 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonWorks", "MoonWorks.csproj", "{DDC9BA9B-4440-4CB3-BDB4-D5F91DE1686B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{608AA31D-F163-4096-B4EF-B9C7D21D52BB} = {608AA31D-F163-4096-B4EF-B9C7D21D52BB}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL2-CS.Core", "lib\SDL2-CS\SDL2-CS.Core.csproj", "{0929F2D8-8FE4-4452-AD1E-50760A1A19A5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FAudio-CS.Core", "lib\FAudio\csharp\FAudio-CS.Core.csproj", "{608AA31D-F163-4096-B4EF-B9C7D21D52BB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RefreshCS", "lib\RefreshCS\RefreshCS.csproj", "{AD7C94E4-0AFA-44CA-889C-110142369893}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{69D3788D-6C57-44F7-A912-B201AE6D7C04}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WellspringCS", "lib\WellspringCS\WellspringCS.csproj", "{0DD7B866-773C-4A86-8580-F436DAA28989}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,22 +15,6 @@ Global
 		{DDC9BA9B-4440-4CB3-BDB4-D5F91DE1686B}.Debug|x64.Build.0 = Debug|x64
 		{DDC9BA9B-4440-4CB3-BDB4-D5F91DE1686B}.Release|x64.ActiveCfg = Release|x64
 		{DDC9BA9B-4440-4CB3-BDB4-D5F91DE1686B}.Release|x64.Build.0 = Release|x64
-		{0929F2D8-8FE4-4452-AD1E-50760A1A19A5}.Debug|x64.ActiveCfg = Debug|x64
-		{0929F2D8-8FE4-4452-AD1E-50760A1A19A5}.Debug|x64.Build.0 = Debug|x64
-		{0929F2D8-8FE4-4452-AD1E-50760A1A19A5}.Release|x64.ActiveCfg = Release|x64
-		{0929F2D8-8FE4-4452-AD1E-50760A1A19A5}.Release|x64.Build.0 = Release|x64
-		{608AA31D-F163-4096-B4EF-B9C7D21D52BB}.Debug|x64.ActiveCfg = Debug|x64
-		{608AA31D-F163-4096-B4EF-B9C7D21D52BB}.Debug|x64.Build.0 = Debug|x64
-		{608AA31D-F163-4096-B4EF-B9C7D21D52BB}.Release|x64.ActiveCfg = Release|x64
-		{608AA31D-F163-4096-B4EF-B9C7D21D52BB}.Release|x64.Build.0 = Release|x64
-		{AD7C94E4-0AFA-44CA-889C-110142369893}.Debug|x64.ActiveCfg = Debug|x64
-		{AD7C94E4-0AFA-44CA-889C-110142369893}.Debug|x64.Build.0 = Debug|x64
-		{AD7C94E4-0AFA-44CA-889C-110142369893}.Release|x64.ActiveCfg = Release|x64
-		{AD7C94E4-0AFA-44CA-889C-110142369893}.Release|x64.Build.0 = Release|x64
-		{0DD7B866-773C-4A86-8580-F436DAA28989}.Debug|x64.ActiveCfg = Debug|x64
-		{0DD7B866-773C-4A86-8580-F436DAA28989}.Debug|x64.Build.0 = Debug|x64
-		{0DD7B866-773C-4A86-8580-F436DAA28989}.Release|x64.ActiveCfg = Release|x64
-		{0DD7B866-773C-4A86-8580-F436DAA28989}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -51,7 +22,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3D68FAA-3165-43C7-95B3-D845F0DAA918}
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0DD7B866-773C-4A86-8580-F436DAA28989} = {69D3788D-6C57-44F7-A912-B201AE6D7C04}
-	EndGlobalSection
 EndGlobal
diff --git a/src/MoonWorksDllMap.cs b/src/MoonWorksDllMap.cs
index fd9b0f39..2e628646 100644
--- a/src/MoonWorksDllMap.cs
+++ b/src/MoonWorksDllMap.cs
@@ -192,11 +192,7 @@ namespace MoonWorks
 			}
 
 			// Set the resolver callback for our native assemblies
-			NativeLibrary.SetDllImportResolver(typeof(SDL2.SDL).Assembly, MapAndLoad);
-			NativeLibrary.SetDllImportResolver(typeof(RefreshCS.Refresh).Assembly, MapAndLoad);
-			NativeLibrary.SetDllImportResolver(typeof(FAudio).Assembly, MapAndLoad);
-			NativeLibrary.SetDllImportResolver(typeof(WellspringCS.Wellspring).Assembly, MapAndLoad);
-			NativeLibrary.SetDllImportResolver(typeof(Theorafile).Assembly, MapAndLoad);
+			NativeLibrary.SetDllImportResolver(assembly, MapAndLoad);
 		}
 
 		#endregion