- Changed lib probing paths

- Fixed a pdb error
This commit is contained in:
lukeIam authored and derivator committed 2015-12-06 13:42:28 +01:00
1 parent 73efe1e4b6
commit 95a5543a04
3 files changed
+18 -4

No files matched your search

+9
View File
@@ -52,6 +52,15 @@ namespace Vocaluxe
AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
#endif
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
if (!_EnsureSingleInstance())
return;
+1 -1
View File
@@ -517,7 +517,7 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
<x86FolderFilesToMove Include="$(TargetDir)x86\*.*"/>
</ItemGroup>
<ItemGroup>
<OtherFilesToMove Include="$(TargetDir)System.Data.SQLite.xml;$(TargetDir)VocaluxeLib.pdb;"/>
<OtherFilesToMove Include="$(TargetDir)System.Data.SQLite.xml;"/>
</ItemGroup>
<Move
SourceFiles="@(RootDLLFilesToMove)"
+8 -3
View File
@@ -1,9 +1,14 @@
<?xml version="1.0"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
<!-- Enable for WCF tracing
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</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
<system.serviceModel>
<diagnostics>
<messageLogging logEntireMessage="true" logMalformedMessages="true"