diff --git a/Source/Reloaded.Assembler/Assembler.cs b/Source/Reloaded.Assembler/Assembler.cs index ec66993..e66e211 100644 --- a/Source/Reloaded.Assembler/Assembler.cs +++ b/Source/Reloaded.Assembler/Assembler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -199,16 +199,10 @@ private string GetFasmDLLPath() throw new FasmWrapperException("Appropriate FASM DLL for X86/64 has not been found in either current or library directory."); } - /// - /// Gets the directory of the currently executing assembly. - /// - private string GetExecutingDLLDirectory() - { - string codeBase = Assembly.GetExecutingAssembly().CodeBase; - UriBuilder uri = new UriBuilder(codeBase); - string path = Uri.UnescapeDataString(uri.Path); - return Path.GetDirectoryName(path); - } + /// + /// Gets the directory of the currently executing assembly. + /// + private string GetExecutingDLLDirectory() => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); /// /// Attempts to allocate the memory to store the text to be supplied to FASM assembler.