mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-22 08:53:08 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
bao-qian 2015-11-11 01:18:16 +00:00
commit b5a08c3ba4
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wox.Core/Wox.Core.csproj
View File

@ -27,7 +27,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>..\Output\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

10
Wox.Infrastructure/Logger/Log.cs
View File

@ -1,4 +1,5 @@
using NLog; using System.Diagnostics;
using NLog;
using Wox.Infrastructure.Exception; using Wox.Infrastructure.Exception;
namespace Wox.Infrastructure.Logger namespace Wox.Infrastructure.Logger
@ -12,7 +13,12 @@ namespace Wox.Infrastructure.Logger
#if DEBUG #if DEBUG
throw e; throw e;
#else #else
logger.Error(e.Message + "\r\n" + e.StackTrace); while (e.InnerException != null)
{
logger.Error(e.Message);
logger.Error(e.StackTrace);
e = e.InnerException;
}
#endif #endif
} }

5
Wox/App.config
View File

@ -1,10 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<runtime>
<!--http://stackoverflow.com/questions/186854/how-to-prevent-an-exception-in-a-background-thread-from-terminating-an-application-->
<!--prevent non-ui exception crash wox-->
<legacyUnhandledExceptionPolicy enabled="1" />
</runtime>
<startup> <startup>
<supportedRuntime version="v2.0.50727" /> <supportedRuntime version="v2.0.50727" />
<supportedRuntime version="v4.0" /> <supportedRuntime version="v4.0" />

2
Wox/App.xaml.cs
View File

@ -42,7 +42,7 @@ namespace Wox
} }
[Conditional("DEBUG")] [Conditional("RELEASE")]
private void RegisterUnhandledException() private void RegisterUnhandledException()
{ {
// let exception throw as normal is better for Debug // let exception throw as normal is better for Debug

3
Wox/Wox.csproj
View File

@ -48,7 +48,7 @@
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>..\Output\Release\</OutputPath> <OutputPath>..\Output\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE;RELEASE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
@ -364,7 +364,6 @@ cd "$(TargetDir)Plugins" &amp; del /s /q NAppUpdate.Framework.dll
cd "$(TargetDir)Plugins" &amp; del /s /q Wox.Infrastructure.dll cd "$(TargetDir)Plugins" &amp; del /s /q Wox.Infrastructure.dll
cd "$(TargetDir)Plugins" &amp; del /s /q Wox.Infrastructure.pdb cd "$(TargetDir)Plugins" &amp; del /s /q Wox.Infrastructure.pdb
cd "$(TargetDir)Plugins" &amp; del /s /q Newtonsoft.Json.dll cd "$(TargetDir)Plugins" &amp; del /s /q Newtonsoft.Json.dll
cd "$(TargetDir)Plugins" &amp; del /s /q WindowsInput.dll
)</PostBuildEvent> )</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.