From c0bdb3d4a6e4e921e04f3b28c1ec090dde0d75de Mon Sep 17 00:00:00 2001
From: ConfiG <cgytrus@cgyt.ru>
Date: Sun, 18 Jun 2023 21:43:29 +0300
Subject: [PATCH] fmod xd

---
 .gitignore                                       |  1 +
 DaggerFramework.Fmod/DaggerFramework.Fmod.csproj | 13 +++----------
 DaggerFramework.sln                              |  7 -------
 DaggerFramework/DaggerFramework.csproj           |  6 +++++-
 NuGet.config                                     |  5 +++--
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index ff3042b..9ecacbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ msbuild.wrn
 
 
 # FMOD binaries (I cannot distribute them)
+DaggerFramework.Fmod/*.nupkg
 DaggerFramework.Fmod/runtimes/**/*.dll
 DaggerFramework.Fmod/runtimes/**/*.so*
 # !binaries/fmod/windows/WINDOWS_BINARIES_HERE
diff --git a/DaggerFramework.Fmod/DaggerFramework.Fmod.csproj b/DaggerFramework.Fmod/DaggerFramework.Fmod.csproj
index 83c7dee..6404f2f 100644
--- a/DaggerFramework.Fmod/DaggerFramework.Fmod.csproj
+++ b/DaggerFramework.Fmod/DaggerFramework.Fmod.csproj
@@ -2,20 +2,13 @@
 
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
-        <EnableDefaultItems>false</EnableDefaultItems>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+        <Nullable>disable</Nullable>
         <PackProject>true</PackProject>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageOutputPath>bin/</PackageOutputPath>
+        <PackageOutputPath>./</PackageOutputPath>
+        <Version>0.2.2.8</Version>
     </PropertyGroup>
 
-    <ItemGroup>
-        <Compile Include="fmod.cs" />
-        <Compile Include="fmod_dsp.cs" />
-        <Compile Include="fmod_errors.cs" />
-        <Compile Include="fmod_studio.cs" />
-    </ItemGroup>
-
     <ItemGroup>
         <Content Include="runtimes/**" Link="runtimes/%(RecursiveDir)/%(Filename)%(Extension)">
             <PackagePath>runtimes/</PackagePath>
diff --git a/DaggerFramework.sln b/DaggerFramework.sln
index ddf0970..743441e 100644
--- a/DaggerFramework.sln
+++ b/DaggerFramework.sln
@@ -7,13 +7,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGame", "TestGame\TestGa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaggerFramework", "DaggerFramework\DaggerFramework.csproj", "{DA4FDEDC-AA81-4336-844F-562F9E763974}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaggerFramework.Fmod", "DaggerFramework.Fmod\DaggerFramework.Fmod.csproj", "{50C6FEB4-8141-4B89-AF17-D0644576287F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Folder", "Solution Folder", "{EE70E84B-A471-4B5B-AE5B-B2712E6553EB}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		README.md = README.md
-		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
 Global
@@ -33,9 +30,5 @@ Global
 		{DA4FDEDC-AA81-4336-844F-562F9E763974}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA4FDEDC-AA81-4336-844F-562F9E763974}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA4FDEDC-AA81-4336-844F-562F9E763974}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50C6FEB4-8141-4B89-AF17-D0644576287F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50C6FEB4-8141-4B89-AF17-D0644576287F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50C6FEB4-8141-4B89-AF17-D0644576287F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50C6FEB4-8141-4B89-AF17-D0644576287F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/DaggerFramework/DaggerFramework.csproj b/DaggerFramework/DaggerFramework.csproj
index b357f57..1cd7198 100644
--- a/DaggerFramework/DaggerFramework.csproj
+++ b/DaggerFramework/DaggerFramework.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DaggerFramework.Fmod" Version="1.0.0" />
+        <PackageReference Include="DaggerFramework.Fmod" Version="0.2.2.8" />
         <PackageReference Include="ImGui.NET" Version="1.89.4" />
         <PackageReference Include="Raylib-cs" Version="4.2.0.1" />
         <PackageReference Include="Silk.NET" Version="2.17.0" />
@@ -16,4 +16,8 @@
         <PackageReference Include="StbVorbisSharp" Version="1.22.4" />
     </ItemGroup>
 
+    <Target Name="BuildFmod" BeforeTargets="BeforeBuild">
+        <MSBuild Projects="../DaggerFramework.Fmod/DaggerFramework.Fmod.csproj" Targets="Restore;Build" />
+    </Target>
+
 </Project>
\ No newline at end of file
diff --git a/NuGet.config b/NuGet.config
index 31822a2..105eae9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,5 +1,6 @@
-<configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
     <packageSources>
-        <add key="DaggerFramework.Fmod Local" value="./DaggerFramework.Fmod/bin" />
+        <add key="FMOD Local" value=".\DaggerFramework.Fmod" />
     </packageSources>
 </configuration>