Changeset 14250

Timestamp:

08/09/16 16:26:30 (8 years ago)

Author:

abeham

Message:

#2651: removed workaround, added application base directory

Location:

trunk/sources

Files:

• HeuristicLab.ExtLibs/HeuristicLab.Igraph/0.8.0-pre/HeuristicLab.Igraph-0.8.0-pre/DllImporter.cs (modified) (2 diffs)
• HeuristicLab.Tests/Builder.testsettings (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Igraph/0.8.0-pre/HeuristicLab.Igraph-0.8.0-pre/DllImporter.cs

@@ -21 +21 @@
 
 using System;
-using System.IO;
 using System.Runtime.InteropServices;
 
@@ -30 +29 @@
     private readonly static bool X86 = false;
 
-    [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-    private static extern bool SetDllDirectory(string lpPathName);
-
     static DllImporter() {
       X86 = !Environment.Is64BitProcess;
-      // Possible workaround as the builder doesn't execute the tests within the bin directory
-      if (Directory.Exists(Path.Combine(Environment.CurrentDirectory, "bin")))
-        SetDllDirectory(Path.Combine(Environment.CurrentDirectory, "bin"));
     }
 

trunk/sources/HeuristicLab.Tests/Builder.testsettings

@@ -8 +8 @@
     <TestTypeSpecific>
       <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
-        <AssemblyResolution>
+        <AssemblyResolution applicationBaseDirectory=".\bin">
           <TestDirectory useLoadContext="true" />
         </AssemblyResolution>

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -219 +219 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.igraph-0.8.0-pre, Version=0.8.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\bin\HeuristicLab.igraph-0.8.0-pre.dll</HintPath>
+    <Reference Include="HeuristicLab.IGraph-0.8.0-pre, Version=0.8.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\bin\HeuristicLab.IGraph-0.8.0-pre.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.MainForm-3.3">