Changeset 14250


Ignore:
Timestamp:
08/09/16 16:26:30 (12 months ago)
Author:
abeham
Message:

#2651: removed workaround, added application base directory

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Igraph/0.8.0-pre/HeuristicLab.Igraph-0.8.0-pre/DllImporter.cs

    r14247 r14250  
    2121
    2222using System;
    23 using System.IO;
    2423using System.Runtime.InteropServices;
    2524
     
    3029    private readonly static bool X86 = false;
    3130
    32     [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
    33     private static extern bool SetDllDirectory(string lpPathName);
    34 
    3531    static DllImporter() {
    3632      X86 = !Environment.Is64BitProcess;
    37       // Possible workaround as the builder doesn't execute the tests within the bin directory
    38       if (Directory.Exists(Path.Combine(Environment.CurrentDirectory, "bin")))
    39         SetDllDirectory(Path.Combine(Environment.CurrentDirectory, "bin"));
    4033    }
    4134
  • trunk/sources/HeuristicLab.Tests/Builder.testsettings

    r14247 r14250  
    88    <TestTypeSpecific>
    99      <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
    10         <AssemblyResolution>
     10        <AssemblyResolution applicationBaseDirectory=".\bin">
    1111          <TestDirectory useLoadContext="true" />
    1212        </AssemblyResolution>
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r14244 r14250  
    219219      <Private>False</Private>
    220220    </Reference>
    221     <Reference Include="HeuristicLab.igraph-0.8.0-pre, Version=0.8.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    222       <SpecificVersion>False</SpecificVersion>
    223       <HintPath>..\bin\HeuristicLab.igraph-0.8.0-pre.dll</HintPath>
     221    <Reference Include="HeuristicLab.IGraph-0.8.0-pre, Version=0.8.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     222      <SpecificVersion>False</SpecificVersion>
     223      <HintPath>..\bin\HeuristicLab.IGraph-0.8.0-pre.dll</HintPath>
     224      <Private>False</Private>
    224225    </Reference>
    225226    <Reference Include="HeuristicLab.MainForm-3.3">
Note: See TracChangeset for help on using the changeset viewer.