Load CsDebugScript.CommonUserTypes.dll in tests, so that tests can be safely executed from Visual Studio.

Author: southpolenator

Source/CsDebugScript.Scripting/ScriptCompiler.cs

@@ -25,6 +25,11 @@ internal static class ScriptCompiler
         /// </summary>
         internal const string AutoGeneratedScriptFunctionName = "ScriptFunction";
 
+        /// <summary>
+        /// Name of the CommonUserTypes dll file.
+        /// </summary>
+        private const string CommonUserTypesDll = "CsDebugScript.CommonUserTypes.dll";
+
         /// <summary>
         /// Gets the list of search folders.
         /// </summary>
@@ -60,12 +65,23 @@ private static string[] GetDefaultAssemblyReferences()
 
             // Try to find CsDebugScript.CommonUserTypes.dll
             string defaultPath = typeof(CsDebugScript.Variable).Assembly.Location;
-            string commonUserTypes = Path.Combine(Path.GetDirectoryName(defaultPath), "CsDebugScript.CommonUserTypes.dll");
+            string commonUserTypes = Path.Combine(Path.GetDirectoryName(defaultPath), CommonUserTypesDll);
 
             if (File.Exists(commonUserTypes))
             {
                 assemblyReferences.Add(commonUserTypes);
             }
+            else
+            {
+                foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+                {
+                    if (assembly.Location.EndsWith(CommonUserTypesDll))
+                    {
+                        assemblyReferences.Add(assembly.Location);
+                        break;
+                    }
+                }
+            }
 
             // Add support for System.Dynamic
             assemblyReferences.Add("Microsoft.CSharp");

Source/CsDebugScript.Scripting/ScriptExecution.cs

@@ -125,6 +125,28 @@ private static string ResolvePath(string reference, string baseFilePath)
                 return path;
             }
 
+            // Try to find path relative to current assembly location
+            try
+            {
+                string folder = typeof(ScriptExecution).Assembly.Location;
+
+                if (!Path.IsPathRooted(baseFilePath))
+                {
+                    folder = Path.GetFullPath(baseFilePath);
+                }
+
+                folder = Path.GetDirectoryName(folder);
+                path = Path.Combine(folder, reference);
+                path = Path.GetFullPath(path);
+                if (File.Exists(path))
+                {
+                    return path;
+                }
+            }
+            catch
+            {
+            }
+
             // Look into search folders
             foreach (string folder in ScriptCompiler.SearchFolders)
             {

Tests/CsDebugScript.Engine.Test/Program.cs

@@ -55,7 +55,7 @@ static void Main(string[] args)
             {
                 Action action = () =>
                 {
-                    ScriptExecution.Execute(@"..\..\..\samples\script.csx", args);
+                    ScriptExecution.Execute(@"..\..\samples\script.csx", args);
                 };
                 DbgEngDll dbgEngDll = Context.Debugger as DbgEngDll;
 

Tests/CsDebugScript.Tests/DumpInitialization.cs

@@ -11,6 +11,8 @@ public class DumpInitialization
     {
         public const string DefaultDumpPath = @"..\..\..\dumps\";
 
+        private static CommonUserTypes.NativeTypes.std.vector vector = InitializeCommonUserTypes();
+
         public DumpInitialization(string dumpPath, string defaultModuleName, string symbolPath)
         {
             if (!Path.IsPathRooted(dumpPath))
@@ -34,6 +36,18 @@ public DumpInitialization(string dumpPath, string defaultModuleName, string symb
         public InteractiveExecution InteractiveExecution { get; private set; } = new InteractiveExecution();
 
         internal bool CodeGenExecuted { get; set; }
+
+        private static CommonUserTypes.NativeTypes.std.vector InitializeCommonUserTypes()
+        {
+            try
+            {
+                return new CommonUserTypes.NativeTypes.std.vector(null);
+            }
+            catch
+            {
+                return null;
+            }
+        }
     }
 
     public class ElfCoreDumpInitialization : DumpInitialization