diff --git a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj index 558967d68c..1400c10a35 100644 --- a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj +++ b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.CMD Wox.Plugin.CMD - v4.0 + v4.5 512 ..\..\ true @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,15 +32,16 @@ TRACE prompt 4 + false False - ..\..\packages\log4net.2.0.3\lib\net35-full\log4net.dll + ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - - False - ..\..\packages\Newtonsoft.Json.6.0.7\lib\net35\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll + True @@ -52,8 +54,9 @@ - - ..\..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll + + False + ..\..\packages\WindowsInput.0.2.0.0\lib\net20\WindowsInput.dll diff --git a/Plugins/Wox.Plugin.CMD/packages.config b/Plugins/Wox.Plugin.CMD/packages.config index 2604e16d68..27ca96abd4 100644 --- a/Plugins/Wox.Plugin.CMD/packages.config +++ b/Plugins/Wox.Plugin.CMD/packages.config @@ -1,5 +1,6 @@  - - + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Caculator/Calculator.cs b/Plugins/Wox.Plugin.Caculator/Calculator.cs index f760746712..55ddbc8a67 100644 --- a/Plugins/Wox.Plugin.Caculator/Calculator.cs +++ b/Plugins/Wox.Plugin.Caculator/Calculator.cs @@ -1,14 +1,9 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; +using System.Collections.Generic; using System.Text.RegularExpressions; using System.Windows; using YAMP; -namespace Wox.Plugin.SystemPlugins +namespace Wox.Plugin.Caculator { public class Calculator : IPlugin { diff --git a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj index ecd106896a..1cd71c38f2 100644 --- a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj +++ b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Caculator Wox.Plugin.Caculator - v4.0 + v4.5 512 ..\..\ true @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,6 +32,7 @@ TRACE prompt 4 + false @@ -41,7 +43,8 @@ - + + False ..\..\packages\YAMP.1.4.0\lib\net35\YAMP.dll diff --git a/Plugins/Wox.Plugin.Caculator/packages.config b/Plugins/Wox.Plugin.Caculator/packages.config index 4e151aa36f..9639b55192 100644 --- a/Plugins/Wox.Plugin.Caculator/packages.config +++ b/Plugins/Wox.Plugin.Caculator/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj index a58af35ba1..dd5366f5f0 100644 --- a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj +++ b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Color Wox.Plugin.Color - v4.0 + v4.5 512 @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj index 87e3009c69..414e58b6e9 100644 --- a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj +++ b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.ControlPanel Wox.Plugin.ControlPanel - v4.0 + v4.5 512 @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj index 6fee33dade..5c8129d3c9 100644 --- a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj +++ b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Folder Wox.Plugin.Folder - v4.0 + v4.5 512 ..\..\ true @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,15 +32,16 @@ TRACE prompt 4 + false - - False - ..\..\packages\log4net.2.0.3\lib\net35-full\log4net.dll + + ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True - - False - ..\..\packages\Newtonsoft.Json.6.0.7\lib\net35\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll + True diff --git a/Plugins/Wox.Plugin.Folder/packages.config b/Plugins/Wox.Plugin.Folder/packages.config index 2604e16d68..7ffe603846 100644 --- a/Plugins/Wox.Plugin.Folder/packages.config +++ b/Plugins/Wox.Plugin.Folder/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj b/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj index 7ebd0d1c92..20a919cfcf 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj +++ b/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.PluginIndicator Wox.Plugin.PluginIndicator - v4.0 + v4.5 512 @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj index dd7ef42499..afee4f1712 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj +++ b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj @@ -9,10 +9,11 @@ Properties Wox.Plugin.PluginManagement Wox.Plugin.PluginManagement - v3.5 + v4.5 512 ..\..\ true + true @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,11 +32,12 @@ TRACE prompt 4 + false False - ..\..\packages\Newtonsoft.Json.6.0.7\lib\net35\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll diff --git a/Plugins/Wox.Plugin.PluginManagement/packages.config b/Plugins/Wox.Plugin.PluginManagement/packages.config index 4185726464..f827ca2442 100644 --- a/Plugins/Wox.Plugin.PluginManagement/packages.config +++ b/Plugins/Wox.Plugin.PluginManagement/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj index 995a0b86ec..9fcb0b2fb0 100644 --- a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj +++ b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Program Wox.Plugin.Program - v4.0 + v4.5 512 ..\..\ true @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,14 +32,16 @@ TRACE prompt 4 + false - - ..\..\packages\log4net.2.0.3\lib\net35-full\log4net.dll + + False + ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll False - ..\..\packages\Newtonsoft.Json.6.0.7\lib\net35\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll diff --git a/Plugins/Wox.Plugin.Program/packages.config b/Plugins/Wox.Plugin.Program/packages.config index 2604e16d68..7ffe603846 100644 --- a/Plugins/Wox.Plugin.Program/packages.config +++ b/Plugins/Wox.Plugin.Program/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj index a26df36cab..7b63bb2a93 100644 --- a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj +++ b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Sys Wox.Plugin.Sys - v4.0 + v4.5 512 ..\..\ true @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,10 +32,12 @@ TRACE prompt 4 + false - - ..\..\packages\log4net.2.0.3\lib\net35-full\log4net.dll + + False + ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll diff --git a/Plugins/Wox.Plugin.Sys/packages.config b/Plugins/Wox.Plugin.Sys/packages.config index 633096dcf3..3a86f257e0 100644 --- a/Plugins/Wox.Plugin.Sys/packages.config +++ b/Plugins/Wox.Plugin.Sys/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj index 71fceb3fa4..a0511852b9 100644 --- a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj +++ b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.Url Wox.Plugin.Url - v4.0 + v4.5 512 @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj index 7a33c574cd..969c9a4984 100644 --- a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj +++ b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj @@ -9,7 +9,7 @@ Properties Wox.Plugin.WebSearch Wox.Plugin.WebSearch - v4.0 + v4.5 512 ..\..\ true @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,14 +32,16 @@ TRACE prompt 4 + false - ..\..\packages\log4net.2.0.3\lib\net35-full\log4net.dll + ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True - - False - ..\..\packages\Newtonsoft.Json.6.0.7\lib\net35\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll + True diff --git a/Plugins/Wox.Plugin.WebSearch/packages.config b/Plugins/Wox.Plugin.WebSearch/packages.config index 2604e16d68..7ffe603846 100644 --- a/Plugins/Wox.Plugin.WebSearch/packages.config +++ b/Plugins/Wox.Plugin.WebSearch/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Wox.Core/Wox.Core.csproj b/Wox.Core/Wox.Core.csproj index 60115067ac..625467663c 100644 --- a/Wox.Core/Wox.Core.csproj +++ b/Wox.Core/Wox.Core.csproj @@ -9,7 +9,7 @@ Properties Wox.Core Wox.Core - v4.0 + v4.5 512 ..\ true @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,15 +32,16 @@ TRACE prompt 4 + false False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - False - ..\packages\Newtonsoft.Json.6.0.7\lib\net35\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll + True @@ -96,6 +98,7 @@ + @@ -109,9 +112,6 @@ Wox.Plugin - - - - + - + - \ No newline at end of file + diff --git a/Wox/ImageLoader/ImageLoader.cs b/Wox/ImageLoader/ImageLoader.cs index 474b47edff..e0f87147e6 100644 --- a/Wox/ImageLoader/ImageLoader.cs +++ b/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; } diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 034ab2eac4..a996b952f1 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -9,7 +9,7 @@ Properties Wox Wox - v4.0 + v4.5 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -42,6 +42,7 @@ prompt 4 true + false AnyCPU @@ -51,6 +52,7 @@ TRACE prompt 4 + false Resources\app.ico @@ -66,16 +68,18 @@ False - ..\packages\log4net.2.0.3\lib\net35-full\log4net.dll + ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - + + ..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll + True + + False - ..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll - - ..\packages\NHotkey.1.1.0.0\lib\NHotkey.dll - + + False ..\packages\NHotkey.Wpf.1.1.0.0\lib\NHotkey.Wpf.dll @@ -99,7 +103,8 @@ - + + False ..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll @@ -209,6 +214,7 @@ Designer MSBuild:Compile + MSBuild:Compile Designer @@ -258,9 +264,6 @@ Resources.Designer.cs - - Designer - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Wox/packages.config b/Wox/packages.config index 41812a60a8..b46eec7b9c 100644 --- a/Wox/packages.config +++ b/Wox/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file