Fix binary detection if no RID is specified

Author: Qonfused

mtgosdk/scripts/wine-run.sh

@@ -13,27 +13,50 @@ if [ -z "$PROJECT_OR_SLN" ]; then
   PROJECT_OR_SLN="."
 fi
 
-echo "--- Building $PROJECT_OR_SLN (win-x64, Framework-Dependent) ---"
+echo "--- Building $PROJECT_OR_SLN (Framework-Dependent) ---"
 dotnet build "$PROJECT_OR_SLN"
 
+# Get the project name to look for the matching executable
+# If the input contains a path, take the filename. Then strip any C# project/solution extension.
+PROJECT_NAME=$(basename "$PROJECT_OR_SLN" | sed -E 's/\.(csproj|sln|fsproj|vbproj)$//')
+
 # Search for the executable in the most common output paths
 if [ -d "bin" ]; then
-    EXE_PATH=$(find bin -name "*.exe" | grep "win-x64" | head -n 1)
+    # Prioritize exact matches for .exe or .dll (for tests)
+    EXE_PATH=$(find bin -name "${PROJECT_NAME}.exe" -o -name "${PROJECT_NAME}.dll" | head -n 1)
+    # Fallback to any executable if the exact match wasn't found
+    if [ -z "$EXE_PATH" ]; then
+        EXE_PATH=$(find bin -name "*.exe" | head -n 1)
+    fi
 fi
 
 if [ -z "$EXE_PATH" ]; then
-    if [ -f "$PROJECT_OR_SLN" ]; then
+    BASE_DIR=""
+    if [ -d "$PROJECT_OR_SLN" ]; then
+        BASE_DIR="$PROJECT_OR_SLN"
+    elif [ -f "$PROJECT_OR_SLN" ]; then
         BASE_DIR=$(dirname "$PROJECT_OR_SLN")
-        if [ -d "$BASE_DIR/bin" ]; then
-            EXE_PATH=$(find "$BASE_DIR/bin" -name "*.exe" | grep "win-x64" | head -n 1)
+    fi
+
+    if [ -n "$BASE_DIR" ] && [ -d "$BASE_DIR/bin" ]; then
+        # Prioritize exact matches for .exe or .dll (for tests)
+        EXE_PATH=$(find "$BASE_DIR/bin" -name "${PROJECT_NAME}.exe" -o -name "${PROJECT_NAME}.dll" | head -n 1)
+        # Fallback to any executable if the exact match wasn't found
+        if [ -z "$EXE_PATH" ]; then
+            EXE_PATH=$(find "$BASE_DIR/bin" -name "*.exe" | head -n 1)
         fi
     fi
 fi
 
 if [ -f "$EXE_PATH" ]; then
     echo "--- Running $EXE_PATH via Wine ---"
-    wine "$EXE_PATH" "$@"
+    # If it's a DLL, we run it via the windows dotnet host
+    if [[ "$EXE_PATH" == *.dll ]]; then
+        wine "C:\\dotnet\\dotnet.exe" "$EXE_PATH" "$@"
+    else
+        wine "$EXE_PATH" "$@"
+    fi
 else
-    echo "Error: Could not find win-x64 executable for $PROJECT_OR_SLN"
+    echo "Error: Could not find executable for $PROJECT_OR_SLN"
     exit 1
 fi

mtgosdk/scripts/wine-shell.sh

@@ -11,7 +11,7 @@ alias run='wine-run'
 alias wine-dotnet='wine C:\\dotnet\\dotnet.exe'
 echo "----------------------------------------------------"
 echo "  Wine Shell Initialized"
-echo "  'dotnet build' -> Produces win-x64 binaries (Framework-Dependent)"
+echo "  'dotnet build' -> Produces framework-dependent binaries"
 echo "  'run' -> Runs 'wine-run' (Build + Wine Run)"
 echo "  'wine-dotnet' -> Runs the native Windows .NET SDK in Wine"
 echo "----------------------------------------------------"