Upgrade to .net framework 4.5

Wox/App.config

@@ -7,10 +7,10 @@
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
       <file type="log4net.Util.PatternString">
         <converter>
-          <name value="WoxLogPathConverter" />
-          <type value="Wox.Helper.WoxLogPathConverter,Wox" />
+          <name value="WoxLogPathConverter"/>
+          <type value="Wox.Helper.WoxLogPathConverter,Wox"/>
         </converter>
-        <conversionPattern value="%WoxLogPathConverter{log}\\log.txt" />
+        <conversionPattern value="%WoxLogPathConverter{log}\\log.txt"/>
       </file>
       <appendToFile value="true"/>
       <rollingStyle value="Date"/>
@@ -21,12 +21,12 @@
     </appender>
     <root>
       <!-- ALL < DEBUG < INFO < WARN < ERROR < FATAL < OFF-->
-      <level value="WARN" />
+      <level value="WARN"/>
       <appender-ref ref="LogFileAppender"/>
     </root>
   </log4net>
   <runtime>
     <!--http://stackoverflow.com/questions/186854/how-to-prevent-an-exception-in-a-background-thread-from-terminating-an-applicati-->
-    <legacyUnhandledExceptionPolicy enabled="1" />
+    <legacyUnhandledExceptionPolicy enabled="1"/>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

Wox/ImageLoader/ImageLoader.cs

@@ -37,16 +37,17 @@ namespace Wox.ImageLoader
 
         private static ImageSource GetIcon(string fileName)
         {
-            if (System.IO.File.Exists(fileName) == false) return null;
-
-            Icon icon = GetFileIcon(fileName);
-            if (icon == null) icon = Icon.ExtractAssociatedIcon(fileName);
-
-            if (icon != null)
+            try
             {
-                return System.Windows.Interop.Imaging.CreateBitmapSourceFromHIcon(icon.Handle,
-                    new Int32Rect(0, 0, icon.Width, icon.Height), BitmapSizeOptions.FromEmptyOptions());
+                if (File.Exists(fileName) == false) return null;
+                Icon icon = GetFileIcon(fileName) ?? Icon.ExtractAssociatedIcon(fileName);
+                if (icon != null)
+                {
+                    return System.Windows.Interop.Imaging.CreateBitmapSourceFromHIcon(icon.Handle,
+                        new Int32Rect(0, 0, icon.Width, icon.Height), BitmapSizeOptions.FromEmptyOptions());
+                }
             }
+            catch{}
 
             return null;
         }

Wox/Wox.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Wox</RootNamespace>
     <AssemblyName>Wox</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -42,6 +42,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>true</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -51,6 +52,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\app.ico</ApplicationIcon>
@@ -66,16 +68,18 @@
     </Reference>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\log4net.2.0.3\lib\net35-full\log4net.dll</HintPath>
+      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NHotkey, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NHotkey">
       <HintPath>..\packages\NHotkey.1.1.0.0\lib\NHotkey.dll</HintPath>
     </Reference>
-    <Reference Include="NHotkey.Wpf">
+    <Reference Include="NHotkey.Wpf, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NHotkey.Wpf.1.1.0.0\lib\NHotkey.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework.Classic" />
@@ -99,7 +103,8 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="WindowsInput">
+    <Reference Include="WindowsInput, Version=1.0.4.0, Culture=neutral, PublicKeyToken=9b287f7dc5073cad, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll</HintPath>
     </Reference>
     <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -209,6 +214,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <None Include="packages.config" />
     <None Include="Themes\Light.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -258,9 +264,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="App.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Wox/packages.config

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="InputSimulator" version="1.0.4.0" targetFramework="net35" />
-  <package id="log4net" version="2.0.3" targetFramework="net35" requireReinstallation="True" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
-  <package id="NHotkey" version="1.1.0.0" targetFramework="net35" />
-  <package id="NHotkey.Wpf" version="1.1.0.0" targetFramework="net35" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net35" />
+  <package id="InputSimulator" version="1.0.4.0" targetFramework="net45" />
+  <package id="log4net" version="2.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.7" targetFramework="net45" />
+  <package id="NHotkey" version="1.1.0.0" targetFramework="net45" />
+  <package id="NHotkey.Wpf" version="1.1.0.0" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
 </packages>