From ff1a131a3c8be140c88863944e22727b2fa6bab2 Mon Sep 17 00:00:00 2001
From: JoshHeaps <joheaps98@gmail.com>
Date: Thu, 3 Jul 2025 20:41:15 +0000
Subject: [PATCH] Fix file path issues (hopefully)

---
 JoshHeaps.Net/JoshHeaps.Net.csproj            |  5 ++--
 .../Services/Implementations/Stockfish.cs     | 27 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/JoshHeaps.Net/JoshHeaps.Net.csproj b/JoshHeaps.Net/JoshHeaps.Net.csproj
index 0a2e87a..52e2186 100644
--- a/JoshHeaps.Net/JoshHeaps.Net.csproj
+++ b/JoshHeaps.Net/JoshHeaps.Net.csproj
@@ -11,8 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Resources/**"
-          CopyToPublishDirectory="PreserveNewest" />
+    <Content Include="Resources/**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/JoshHeaps.Net/Services/Implementations/Stockfish.cs b/JoshHeaps.Net/Services/Implementations/Stockfish.cs
index 9e2208d..0f68109 100644
--- a/JoshHeaps.Net/Services/Implementations/Stockfish.cs
+++ b/JoshHeaps.Net/Services/Implementations/Stockfish.cs
@@ -20,24 +20,21 @@ public sealed class Stockfish : IAsyncDisposable
     public Stockfish(int skill = 20, int hash = 256)
     {
         _skill = skill;
-        string exePath = string.Empty;
+        string baseDir = AppContext.BaseDirectory;                // always points to the folder that holds your DLL / EXE
+        string fileName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                  ? "stockfish-windows-x86-64-avx2.exe"
+                  : RuntimeInformation.IsOSPlatform(OSPlatform.OSX)
+                    ? "stockfish-mac-x86-64-avx2"
+                    : "stockfish-ubuntu-x86-64-sse41-popcnt";   // default: Linux
 
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        string exePath = Path.Combine(baseDir, "Resources", fileName);
+        
+        if (!File.Exists(exePath))
         {
-            string relativeFilePath = @"\Resources\stockfish-windows-x86-64-avx2.exe";
-            exePath = Assembly.GetExecutingAssembly().Location.Split(@"\bin\")[0] + relativeFilePath;
+            throw new FileNotFoundException($"Stockfish executable not found at {exePath}. " +
+                "Ensure the file is present in the Resources folder of your project.");
         }
-        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-        {
-            string relativeFilePath = @"/Resources/stockfish-ubuntu-x86-64-sse41-popcnt";
-            exePath = Assembly.GetExecutingAssembly().Location.Split(@"/bin/")[0] + relativeFilePath;
-        }
-        else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-        {
-            string relativeFilePath = @"/Resources/stockfish-mac-x86-64-avx2";
-            exePath = Assembly.GetExecutingAssembly().Location.Split(@"/bin/")[0] + relativeFilePath;
-        }
-
+        
         Console.Write(exePath);
 
         _p = new Process