diff --git a/Plugins/Wox.Plugin.CMD/CMD.cs b/Plugins/Wox.Plugin.CMD/CMD.cs index deeca82c5a..d1f6220efb 100644 --- a/Plugins/Wox.Plugin.CMD/CMD.cs +++ b/Plugins/Wox.Plugin.CMD/CMD.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection; using System.Windows.Forms; using WindowsInput; using WindowsInput.Native; +using Wox.Infrastructure; using Wox.Infrastructure.Hotkey; using Wox.Infrastructure.Logger; using Control = System.Windows.Controls.Control; @@ -202,7 +202,7 @@ namespace Wox.Plugin.CMD public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.CMD/CMDStorage.cs b/Plugins/Wox.Plugin.CMD/CMDStorage.cs index c87bf37b48..813e4a2c58 100644 --- a/Plugins/Wox.Plugin.CMD/CMDStorage.cs +++ b/Plugins/Wox.Plugin.CMD/CMDStorage.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.IO; -using System.Reflection; using Newtonsoft.Json; using Wox.Infrastructure.Storage; diff --git a/Plugins/Wox.Plugin.Caculator/Calculator.cs b/Plugins/Wox.Plugin.Caculator/Calculator.cs index 6dbfb79b53..6a496666fe 100644 --- a/Plugins/Wox.Plugin.Caculator/Calculator.cs +++ b/Plugins/Wox.Plugin.Caculator/Calculator.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.IO; -using System.Reflection; using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Windows; +using Wox.Infrastructure; using YAMP; namespace Wox.Plugin.Caculator @@ -95,7 +95,8 @@ namespace Wox.Plugin.Caculator public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); + } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj index e80e10107d..e5db93265b 100644 --- a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj +++ b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj @@ -57,6 +57,10 @@ + + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} + Wox.Infrastructure + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} Wox.Plugin diff --git a/Plugins/Wox.Plugin.Color/Color.cs b/Plugins/Wox.Plugin.Color/Color.cs index 2dd5c6d83f..2f45ce7836 100644 --- a/Plugins/Wox.Plugin.Color/Color.cs +++ b/Plugins/Wox.Plugin.Color/Color.cs @@ -4,8 +4,8 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; using System.Linq; -using System.Reflection; using System.Windows; +using Wox.Infrastructure; namespace Wox.Plugin.Color { @@ -111,7 +111,7 @@ namespace Wox.Plugin.Color public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj index b2f9af335b..0f10a9eea3 100644 --- a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj +++ b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj @@ -55,6 +55,10 @@ + + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} + Wox.Infrastructure + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} Wox.Plugin diff --git a/Plugins/Wox.Plugin.ControlPanel/ControlPanel.cs b/Plugins/Wox.Plugin.ControlPanel/ControlPanel.cs index 84e8d0b334..1d403f468b 100644 --- a/Plugins/Wox.Plugin.ControlPanel/ControlPanel.cs +++ b/Plugins/Wox.Plugin.ControlPanel/ControlPanel.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection; using Wox.Infrastructure; namespace Wox.Plugin.ControlPanel @@ -85,7 +84,7 @@ namespace Wox.Plugin.ControlPanel public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs b/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs index 150f010145..703cbba36f 100644 --- a/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs +++ b/Plugins/Wox.Plugin.Everything/ContextMenuStorage.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.IO; -using System.Reflection; using Wox.Infrastructure.Storage; using JsonProperty = Newtonsoft.Json.JsonPropertyAttribute; diff --git a/Plugins/Wox.Plugin.Everything/Main.cs b/Plugins/Wox.Plugin.Everything/Main.cs index b50d92174b..447c7db7cd 100644 --- a/Plugins/Wox.Plugin.Everything/Main.cs +++ b/Plugins/Wox.Plugin.Everything/Main.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection; using System.Runtime.InteropServices; using System.ServiceProcess; using System.Windows; +using Wox.Infrastructure; using Wox.Plugin.Everything.Everything; namespace Wox.Plugin.Everything @@ -258,7 +258,7 @@ namespace Wox.Plugin.Everything public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.Folder/FolderPlugin.cs b/Plugins/Wox.Plugin.Folder/FolderPlugin.cs index e31e701c38..dc2905accb 100644 --- a/Plugins/Wox.Plugin.Folder/FolderPlugin.cs +++ b/Plugins/Wox.Plugin.Folder/FolderPlugin.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection; using System.Windows; using System.Windows.Controls; +using Wox.Infrastructure; namespace Wox.Plugin.Folder { @@ -246,7 +246,7 @@ namespace Wox.Plugin.Folder public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.Folder/FolderStorage.cs b/Plugins/Wox.Plugin.Folder/FolderStorage.cs index f23273774d..5c63d38c36 100644 --- a/Plugins/Wox.Plugin.Folder/FolderStorage.cs +++ b/Plugins/Wox.Plugin.Folder/FolderStorage.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.IO; -using System.Reflection; using Newtonsoft.Json; using Wox.Infrastructure.Storage; diff --git a/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs b/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs index 151df63616..be2ec2990e 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs +++ b/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; using Wox.Core.Plugin; using Wox.Core.UserSettings; +using Wox.Infrastructure; namespace Wox.Plugin.PluginIndicator { @@ -41,7 +41,7 @@ namespace Wox.Plugin.PluginIndicator public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.PluginManagement/Main.cs b/Plugins/Wox.Plugin.PluginManagement/Main.cs index 45585db05e..3a0b203be9 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Main.cs +++ b/Plugins/Wox.Plugin.PluginManagement/Main.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; -using System.Reflection; using System.Text; using System.Threading; using System.Windows; using Newtonsoft.Json; +using Wox.Infrastructure; namespace Wox.Plugin.PluginManagement { @@ -244,7 +244,7 @@ namespace Wox.Plugin.PluginManagement public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj index 8ee89613dd..5fb37d3273 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj +++ b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj @@ -55,6 +55,10 @@ + + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} + Wox.Infrastructure + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} Wox.Plugin diff --git a/Plugins/Wox.Plugin.Program/ProgramCacheStorage.cs b/Plugins/Wox.Plugin.Program/ProgramCacheStorage.cs index 4f57910fb3..0aab30c17c 100644 --- a/Plugins/Wox.Plugin.Program/ProgramCacheStorage.cs +++ b/Plugins/Wox.Plugin.Program/ProgramCacheStorage.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.IO; -using System.Reflection; using Wox.Infrastructure.Storage; namespace Wox.Plugin.Program diff --git a/Plugins/Wox.Plugin.Program/ProgramStorage.cs b/Plugins/Wox.Plugin.Program/ProgramStorage.cs index a17171f7cd..1cefbe87d8 100644 --- a/Plugins/Wox.Plugin.Program/ProgramStorage.cs +++ b/Plugins/Wox.Plugin.Program/ProgramStorage.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; using System.ComponentModel; -using System.IO; -using System.Reflection; using Newtonsoft.Json; using Wox.Infrastructure.Storage; diff --git a/Plugins/Wox.Plugin.Program/Programs.cs b/Plugins/Wox.Plugin.Program/Programs.cs index 73856909e7..dc74d164ea 100644 --- a/Plugins/Wox.Plugin.Program/Programs.cs +++ b/Plugins/Wox.Plugin.Program/Programs.cs @@ -177,7 +177,7 @@ namespace Wox.Plugin.Program public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() { diff --git a/Plugins/Wox.Plugin.Sys/Sys.cs b/Plugins/Wox.Plugin.Sys/Sys.cs index 206072772a..2484911891 100644 --- a/Plugins/Wox.Plugin.Sys/Sys.cs +++ b/Plugins/Wox.Plugin.Sys/Sys.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Reflection; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Forms; @@ -193,7 +192,7 @@ namespace Wox.Plugin.Sys public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.Url/UrlPlugin.cs b/Plugins/Wox.Plugin.Url/UrlPlugin.cs index 51c8f2ed95..5a19028fc8 100644 --- a/Plugins/Wox.Plugin.Url/UrlPlugin.cs +++ b/Plugins/Wox.Plugin.Url/UrlPlugin.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Reflection; using System.Text.RegularExpressions; +using Wox.Infrastructure; namespace Wox.Plugin.Url { @@ -105,7 +105,7 @@ namespace Wox.Plugin.Url public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj index 676bf001b5..3f4758e724 100644 --- a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj +++ b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj @@ -49,6 +49,10 @@ + + {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} + Wox.Infrastructure + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} Wox.Plugin diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs b/Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs index 0e225df03c..10fc03fa2a 100644 --- a/Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs +++ b/Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection; using System.Windows.Controls; +using Wox.Infrastructure; using Wox.Plugin.WebSearch.Annotations; using Wox.Plugin.WebSearch.SuggestionSources; @@ -92,7 +92,7 @@ namespace Wox.Plugin.WebSearch public string GetLanguagesFolder() { - return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages"); + return Path.Combine(WoxDirectroy.Executable, "Languages"); } public string GetTranslatedPluginTitle() diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs b/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs index 7284ce59d8..3551715a84 100644 --- a/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs +++ b/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs @@ -1,10 +1,10 @@ using System; using System.IO; using System.Linq; -using System.Reflection; using System.Windows; using System.Windows.Media.Imaging; using Microsoft.Win32; +using Wox.Infrastructure; using Wox.Infrastructure.Exception; namespace Wox.Plugin.WebSearch @@ -12,7 +12,7 @@ namespace Wox.Plugin.WebSearch public partial class WebSearchSetting : Window { private const string _imageDirectoryName = "Images"; - private string _pluginDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + private string _pluginDirectory = WoxDirectroy.Executable; private readonly WebSearchesSetting _settingWindow; private bool _isUpdate; private WebSearch _updateWebSearch; @@ -130,7 +130,7 @@ namespace Wox.Plugin.WebSearch if (!Directory.Exists(_pluginDirectory)) { _pluginDirectory = - Path.GetDirectoryName(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)); + Path.GetDirectoryName(WoxDirectroy.Executable); } var dlg = new OpenFileDialog diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchStorage.cs b/Plugins/Wox.Plugin.WebSearch/WebSearchStorage.cs index 824ad6e261..5ae244473f 100644 --- a/Plugins/Wox.Plugin.WebSearch/WebSearchStorage.cs +++ b/Plugins/Wox.Plugin.WebSearch/WebSearchStorage.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.IO; -using System.Reflection; using Newtonsoft.Json; using Wox.Infrastructure.Storage;