- Changed lib probing paths
- Fixed a pdb error
This commit is contained in:
1 parent
73efe1e4b6
commit
95a5543a04
3 files changed
+17
-3
No files matched your search
@@ -52,6 +52,15 @@ namespace Vocaluxe
|
|||||||
AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
|
AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
|
||||||
#endif
|
#endif
|
||||||
AppDomain.CurrentDomain.AssemblyResolve += _AssemblyResolver;
|
AppDomain.CurrentDomain.AssemblyResolve += _AssemblyResolver;
|
||||||
|
COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\"));
|
||||||
|
#if ARCH_X86
|
||||||
|
COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\x86\\"));
|
||||||
|
#endif
|
||||||
|
#if ARCH_X64
|
||||||
|
COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\x64\\"));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// Close program if there is another instance running
|
// Close program if there is another instance running
|
||||||
if (!_EnsureSingleInstance())
|
if (!_EnsureSingleInstance())
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -517,7 +517,7 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
|
|||||||
<x86FolderFilesToMove Include="$(TargetDir)x86\*.*"/>
|
<x86FolderFilesToMove Include="$(TargetDir)x86\*.*"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<OtherFilesToMove Include="$(TargetDir)System.Data.SQLite.xml;$(TargetDir)VocaluxeLib.pdb;"/>
|
<OtherFilesToMove Include="$(TargetDir)System.Data.SQLite.xml;"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Move
|
<Move
|
||||||
SourceFiles="@(RootDLLFilesToMove)"
|
SourceFiles="@(RootDLLFilesToMove)"
|
||||||
|
|||||||
+7
-2
@@ -1,8 +1,13 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
|
</startup>
|
||||||
|
<runtime>
|
||||||
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
|
<probing privatePath="libs\managed\;libs\unmanaged;libs\;.;libs\managed\x64\;libs\unmanaged\x64\;libs\x64\;.\x64\;libs\managed\x86\;libs\unmanaged\x86\;libs\x86\;.\x86\" />
|
||||||
|
</assemblyBinding>
|
||||||
|
</runtime>
|
||||||
<!-- Enable for WCF tracing
|
<!-- Enable for WCF tracing
|
||||||
<system.serviceModel>
|
<system.serviceModel>
|
||||||
<diagnostics>
|
<diagnostics>
|
||||||
|
|||||||
Reference in new issue
Block a user