Improve dbgshim.dll locator (fixes #276)

dnSpyEx · Dec 19, 2023 · 8e245f6 · 8e245f6
1 parent 836b371
commit 8e245f6
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Utilities/DotNetHelpers.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Utilities/DotNetHelpers.cs
@@ -143,6 +143,11 @@ public static string GetDebugShimFilename(int bitness) {
 			default:	throw new ArgumentOutOfRangeException(nameof(bitness));
 			}
 #elif NET
+			string path = Path.Combine(basePath, filename);
+			// If dnSpy is published, the file will be located in the app directory
+			if (File.Exists(path))
+				return path;
+			// If dnSpy is ran from source, the file will be located in a different directory
 			return Path.Combine(basePath, "runtimes", RuntimeInformation.RuntimeIdentifier, "native", filename);
 #else
 #error Unknown target framework