Wox peoject in .net Core

Wox.Core/Wox.Core.csproj

@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <UseWpf>true</UseWpf>
-    <ProjectGuid>{B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}</ProjectGuid>
+    <UseWindowsForms>true</UseWindowsForms>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Wox.Core</RootNamespace>
     <AssemblyName>Wox.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
+  
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -26,6 +20,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -35,87 +30,40 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
+
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionAssemblyInfo.cs">
-      <Link>Properties\SolutionAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Plugin\ExecutablePlugin.cs" />
-    <Compile Include="Plugin\PluginsLoader.cs" />
-    <Compile Include="Updater.cs" />
-    <Compile Include="Resource\AvailableLanguages.cs" />
-    <Compile Include="Resource\Internationalization.cs" />
-    <Compile Include="Resource\InternationalizationManager.cs" />
-    <Compile Include="Resource\Language.cs" />
-    <Compile Include="Resource\ThemeManager.cs" />
-    <Compile Include="Plugin\PluginInstaller.cs" />
-    <Compile Include="Plugin\JsonRPCPlugin.cs" />
-    <Compile Include="Plugin\JsonPRCModel.cs" />
-    <Compile Include="Plugin\PluginConfig.cs" />
-    <Compile Include="Plugin\PluginManager.cs" />
-    <Compile Include="Plugin\PythonPlugin.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource\FontHelper.cs" />
-    <Compile Include="Resource\Theme.cs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Plugin\README.md" />
     <None Include="README.md" />
   </ItemGroup>
+  
   <ItemGroup>
-    <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj">
+    <None Remove="FodyWeavers.xml" />
-      <Project>{4fd29318-a8ab-4d8f-aa47-60bc241b8da3}</Project>
-      <Name>Wox.Infrastructure</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj">
-      <Project>{8451ecdd-2ea4-4966-bb0a-7bbc40138e80}</Project>
-      <Name>Wox.Plugin</Name>
-    </ProjectReference>
   </ItemGroup>
+
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
+  
   <ItemGroup>
-    <PackageReference Include="Fody">
+    <PackageReference Include="Fody" Version="6.1.1">
-      <Version>1.29.2</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="JetBrains.Annotations">
-      <Version>10.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>9.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody">
-      <Version>1.51.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="squirrel.windows">
-      <Version>1.5.2</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime">
-      <Version>4.0.0</Version>
     </PackageReference>
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.2.6" />
+    <PackageReference Include="SharpZipLib" Version="1.2.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <ItemGroup>
-       Other similar extension points exist, see Microsoft.Common.targets.
+    <Folder Include="Properties\" />
-  <Target Name="BeforeBuild">
+  </ItemGroup>
-  </Target>
+  
-  <Target Name="AfterBuild">
+  <ItemGroup>
-  </Target>
+    <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
-  -->
+    <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj" />
+  </ItemGroup>
+
 </Project>

Wox.Infrastructure/Http/Http.cs

@@ -19,8 +19,7 @@ namespace Wox.Infrastructure.Http
             ServicePointManager.Expect100Continue = true;
             ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls
                                                     | SecurityProtocolType.Tls11
-                                                    | SecurityProtocolType.Tls12
+                                                    | SecurityProtocolType.Tls12;
-                                                    | SecurityProtocolType.Ssl3;
         }
 
         public static HttpProxy Proxy { private get; set; }

Wox.Infrastructure/StringMatcher.cs

@@ -19,7 +19,7 @@ namespace Wox.Infrastructure
             _alphabet = alphabet;
         }
 
-        public static StringMatcher Instance { get; internal set; }
+        public static StringMatcher Instance { get; set; }
 
         [Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]
         public static int Score(string source, string target)

Wox.Infrastructure/UserSettings/Settings.cs

@@ -28,7 +28,7 @@ namespace Wox.Infrastructure.UserSettings
         public bool ShouldUsePinyin { get; set; } = true;
 
 
-        internal StringMatcher.SearchPrecisionScore QuerySearchPrecision { get; private set; } = StringMatcher.SearchPrecisionScore.Regular;
+        public StringMatcher.SearchPrecisionScore QuerySearchPrecision { get; private set; } = StringMatcher.SearchPrecisionScore.Regular;
 
         [JsonIgnore]
         public string QuerySearchPrecisionString

Wox.Infrastructure/Wox.Infrastructure.csproj

@@ -1,19 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</ProjectGuid>
     <OutputType>Library</OutputType>
+    <UseWpf>true</UseWpf>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Wox.Infrastructure</RootNamespace>
     <AssemblyName>Wox.Infrastructure</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <TargetFrameworkProfile />
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -25,6 +21,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -35,87 +32,38 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
+  
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionAssemblyInfo.cs">
-      <Link>Properties\SolutionAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Exception\ExceptionFormatter.cs" />
-    <Compile Include="Helper.cs" />
-    <Compile Include="Hotkey\InterceptKeys.cs" />
-    <Compile Include="Hotkey\KeyEvent.cs" />
-    <Compile Include="Image\ImageCache.cs" />
-    <Compile Include="Image\ImageHashGenerator.cs" />
-    <Compile Include="Image\ImageLoader.cs" />
-    <Compile Include="Image\ThumbnailReader.cs" />
-    <Compile Include="Logger\Log.cs" />
-    <Compile Include="Storage\ISavable.cs" />
-    <Compile Include="Storage\PluginJsonStorage.cs" />
-    <Compile Include="Stopwatch.cs" />
-    <Compile Include="Storage\BinaryStorage.cs" />
-    <Compile Include="Storage\JsonStorage.cs" />
-    <Compile Include="Storage\WoxJsonStorage.cs" />
-    <Compile Include="StringMatcher.cs" />
-    <Compile Include="Http\Http.cs" />
-    <Compile Include="FuzzyMatcher.cs" />
-    <Compile Include="Hotkey\GlobalHotkey.cs" />
-    <Compile Include="Hotkey\HotkeyModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Alphabet.cs" />
-    <Compile Include="UserSettings\HttpProxy.cs" />
-    <Compile Include="UserSettings\PluginHotkey.cs" />
-    <Compile Include="UserSettings\PluginSettings.cs" />
-    <Compile Include="UserSettings\Settings.cs" />
-    <Compile Include="Wox.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj">
       <Project>{8451ecdd-2ea4-4966-bb0a-7bbc40138e80}</Project>
       <Name>Wox.Plugin</Name>
     </ProjectReference>
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations">
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-      <Version>10.3.0</Version>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    </PackageReference>
+    <PackageReference Include="NLog.Schema" Version="4.7.0-rc1" />
-    <PackageReference Include="Newtonsoft.Json">
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
-      <Version>9.0.1</Version>
+    <PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
-    </PackageReference>
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
-    <PackageReference Include="NLog">
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
-      <Version>4.2.0</Version>
-    </PackageReference>
-    <PackageReference Include="NLog.Schema" GeneratePathProperty="true">
-      <Version>4.2.0</Version>
-    </PackageReference>
-    <PackageReference Include="Pinyin4DotNet" GeneratePathProperty="true">
-      <Version>2016.4.23.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime">
-      <Version>4.0.0</Version>
-    </PackageReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
-  <PropertyGroup>
+  <ItemGroup>
-    <PreBuildEvent>
+    <Folder Include="Properties\" />
-	xcopy /Y $(PkgPinyin4DotNet)\pinyindb\unicode_to_hanyu_pinyin.txt $(TargetDir)pinyindb\
+  </ItemGroup>
-	xcopy /Y $(PkgNLog_Schema)\content\NLog.xsd $(TargetDir)
+
-	</PreBuildEvent>
+  <ItemGroup>
-  </PropertyGroup>
+    <None Update="pinyindb\pinyin_gwoyeu_mapping.xml">
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-       Other similar extension points exist, see Microsoft.Common.targets.
+    </None>
-  <Target Name="BeforeBuild">
+    <None Update="pinyindb\pinyin_mapping.xml">
-  </Target>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-  <Target Name="AfterBuild">
+    </None>
-  </Target>
+    <None Update="pinyindb\unicode_to_hanyu_pinyin.txt">
-  -->
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  
 </Project>

Wox.Plugin/PluginInitContext.cs

@@ -4,7 +4,7 @@ namespace Wox.Plugin
 {
     public class PluginInitContext
     {
-        public PluginMetadata CurrentPluginMetadata { get; internal set; }
+        public PluginMetadata CurrentPluginMetadata { get; set; }
 
         /// <summary>
         /// Public APIs for plugin invocation

Wox.Plugin/PluginMetadata.cs

@@ -24,7 +24,7 @@ namespace Wox.Plugin
         public string PluginDirectory
         {
             get { return _pluginDirectory; }
-            internal set
+            set
             {
                 _pluginDirectory = value;
                 ExecuteFilePath = Path.Combine(value, ExecuteFileName);

Wox.Plugin/PluginPair.cs

@@ -2,8 +2,8 @@
 {
     public class PluginPair
     {
-        public IPlugin Plugin { get; internal set; }
+        public IPlugin Plugin { get; set; }
-        public PluginMetadata Metadata { get; internal set; }
+        public PluginMetadata Metadata { get; set; }
 
         
 

Wox.Plugin/Query.cs

@@ -6,7 +6,7 @@ namespace Wox.Plugin
 {
     public class Query
     {
-        internal Query() { }
+        public Query() { }
 
         /// <summary>
         /// to allow unit tests for plug ins
@@ -23,7 +23,7 @@ namespace Wox.Plugin
         /// Raw query, this includes action keyword if it has
         /// We didn't recommend use this property directly. You should always use Search property.
         /// </summary>
-        public string RawQuery { get; internal set; }
+        public string RawQuery { get; set; }
 
         /// <summary>
         /// Search part of a query.
@@ -31,7 +31,7 @@ namespace Wox.Plugin
         /// Since we allow user to switch a exclusive plugin to generic plugin, 
         /// so this property will always give you the "real" query part of the query
         /// </summary>
-        public string Search { get; internal set; }
+        public string Search { get; set; }
 
         /// <summary>
         /// The raw query splited into a string array.
@@ -96,10 +96,10 @@ namespace Wox.Plugin
         public override string ToString() => RawQuery;
 
         [Obsolete("Use ActionKeyword, this property will be removed in v1.3.0")]
-        public string ActionName { get; internal set; }
+        public string ActionName { get; set; }
 
         [Obsolete("Use Search instead, this property will be removed in v1.3.0")]
-        public List<string> ActionParameters { get; internal set; }
+        public List<string> ActionParameters { get; set; }
 
         [Obsolete("Use Search instead, this method will be removed in v1.3.0")]
         public string GetAllRemainingParameter() => Search;

Wox.Plugin/Result.cs

@@ -55,7 +55,7 @@ namespace Wox.Plugin
         /// <summary>
         /// Only resulsts that originQuery match with curren query will be displayed in the panel
         /// </summary>
-        internal Query OriginQuery { get; set; }
+        public Query OriginQuery { get; set; }
 
         /// <summary>
         /// Plugin directory
@@ -122,6 +122,6 @@ namespace Wox.Plugin
         /// <summary>
         /// Plugin ID that generated this result
         /// </summary>
-        public string PluginID { get; internal set; }
+        public string PluginID { get; set; }
     }
 }

Wox.Plugin/Wox.Plugin.csproj

@@ -1,20 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}</ProjectGuid>
+    <UseWPF>true</UseWPF>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Wox.Plugin</RootNamespace>
     <AssemblyName>Wox.Plugin</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
+  
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -26,6 +21,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -35,75 +31,33 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
+  
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionAssemblyInfo.cs">
-      <Link>Properties\SolutionAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AllowedLanguage.cs" />
-    <Compile Include="BaseModel.cs" />
-    <Compile Include="EventHandler.cs" />
-    <Compile Include="Feature.cs" />
-    <Compile Include="Features\IContextMenu.cs" />
-    <Compile Include="Features\IExclusiveQuery.cs" />
-    <Compile Include="Features\IInstantQuery.cs" />
-    <Compile Include="Interfaces\IReloadable.cs" />
-    <Compile Include="IPlugin.cs" />
-    <Compile Include="IPublicAPI.cs" />
-    <Compile Include="ISettingProvider.cs" />
-    <Compile Include="PluginPair.cs" />
-    <Compile Include="PluginInitContext.cs" />
-    <Compile Include="PluginMetadata.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Query.cs" />
-    <Compile Include="Result.cs" />
-    <Compile Include="ActionContext.cs" />
-    <Compile Include="SharedCommands\SearchWeb.cs" />
-    <Compile Include="SharedCommands\ShellCommand.cs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Remove="FodyWeavers.xml" />
+  </ItemGroup>
+  
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Fody">
+    <PackageReference Include="Fody" Version="6.1.1">
-      <Version>1.29.2</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="JetBrains.Annotations">
-      <Version>10.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="Mono.Cecil">
-      <Version>0.9.6.1</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>9.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody">
-      <Version>1.51.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Runtime">
-      <Version>4.0.0</Version>
     </PackageReference>
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.2.6" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <ItemGroup>
-       Other similar extension points exist, see Microsoft.Common.targets.
+    <Folder Include="Properties\" />
-  <Target Name="BeforeBuild">
+  </ItemGroup>
-  </Target>
+
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

Wox/Helper/SingleInstance.cs

@@ -273,13 +273,15 @@ namespace Wox.Helper
         private static IList<string> GetCommandLineArgs( string uniqueApplicationName )
         {
             string[] args = null;
-            if (AppDomain.CurrentDomain.ActivationContext == null)
+
+            try
             {
                 // The application was not clickonce deployed, get args from standard API's
                 args = Environment.GetCommandLineArgs();
             }
-            else
+            catch (NotSupportedException)
             {
+              
                 // The application was clickonce deployed
                 // Clickonce deployed apps cannot recieve traditional commandline arguments
                 // As a workaround commandline arguments can be written to a shared location before 

Wox/MainWindow.xaml

@@ -14,7 +14,7 @@
         AllowDrop="True"
         ShowInTaskbar="False"
         Style="{DynamicResource WindowStyle}"
-        Icon="Images\app.png"
+        Icon="Images/app.png"
         AllowsTransparency="True"
         Loaded="OnLoaded"
         Initialized="OnInitialized"

Wox/Wox.csproj

@@ -1,39 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DB90F671-D861-46BB-93A3-F1304F5BA1C5}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>Wox</RootNamespace>
+    <UseWPF>true</UseWPF>
-    <AssemblyName>Wox</AssemblyName>
+    <UseWindowsForms>true</UseWindowsForms>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <StartupObject>Wox.App</StartupObject>
-    <FileAlignment>512</FileAlignment>
+    <ApplicationIcon>Resources\app.ico</ApplicationIcon>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <WarningLevel>4</WarningLevel>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <TargetFrameworkProfile />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <PublishUrl>发布\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -45,7 +22,8 @@
     <UseVSHostingProcess>true</UseVSHostingProcess>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -55,401 +33,150 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup>
+
-    <ApplicationIcon>Resources\app.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>Wox.App</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PresentationUI, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <ApplicationDefinition Remove="App.xaml" />
-    <Reference Include="ReachFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Printing" />
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
   </ItemGroup>
+  
   <ItemGroup>
-    <Compile Include="..\SolutionAssemblyInfo.cs">
+    <Page Include="App.xaml" />
-      <Link>Properties\SolutionAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Converters\HighlightTextConverter.cs" />
-    <Compile Include="Helper\SingletonWindowOpener.cs" />
-    <Compile Include="PublicAPIInstance.cs" />
-    <Compile Include="ReportWindow.xaml.cs" />
-    <Compile Include="ResultListBox.xaml.cs">
-      <DependentUpon>ResultListBox.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Settings.cs" />
-    <Compile Include="Storage\HistoryItem.cs" />
-    <Compile Include="Storage\QueryHistory.cs" />
-    <Compile Include="Storage\TopMostRecord.cs" />
-    <Compile Include="Storage\UserSelectedRecord.cs" />
-    <Compile Include="ViewModel\RelayCommand.cs" />
-    <Compile Include="ViewModel\MainViewModel.cs" />
-    <Compile Include="ViewModel\PluginViewModel.cs" />
-    <Compile Include="ViewModel\ResultViewModel.cs" />
-    <Compile Include="ViewModel\ResultsViewModel.cs" />
-    <Compile Include="ViewModel\SettingWindowViewModel.cs" />
-    <Page Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="ActionKeywords.xaml.cs">
-      <DependentUpon>ActionKeywords.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Helper\DataWebRequestFactory.cs" />
-    <Compile Include="Helper\ErrorReporting.cs" />
-    <Compile Include="Helper\SingleInstance.cs" />
-    <Compile Include="Helper\SyntaxSugars.cs" />
-    <Compile Include="Helper\WallpaperPathRetrieval.cs" />
-    <Compile Include="Helper\WindowsInteropHelper.cs" />
-    <Compile Include="CustomQueryHotkeySetting.xaml.cs">
-      <DependentUpon>CustomQueryHotkeySetting.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Helper\DWMDropShadow.cs" />
-    <Compile Include="HotkeyControl.xaml.cs">
-      <DependentUpon>HotkeyControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Msg.xaml.cs">
-      <DependentUpon>Msg.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SettingWindow.xaml.cs">
-      <DependentUpon>SettingWindow.xaml</DependentUpon>
-    </Compile>
-    <Page Include="ActionKeywords.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CustomQueryHotkeySetting.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="HotkeyControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <None Include="App.config" />
-    <None Include="app.manifest" />
-    <Content Include="Languages\zh-cn.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Resource Include="Images\update.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
-    <None Include="Images\up.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Images\down.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Resource Include="Images\history.png" />
-    <Resource Include="Images\app_error.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="FodyWeavers.xml" />
-    <Content Include="Languages\en.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\zh-tw.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\ru.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\fr.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\ja.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\de.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\pl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\nl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\da.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\ko.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\it.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\nb-NO.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\pt-br.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\sr.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\uk-UA.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\sk.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Languages\tr.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Msg.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ReportWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ResultListBox.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="SettingWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <None Include="Themes\Light.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="Themes\Base.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="Themes\Pink.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Themes\Metro Server.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="Themes\Dark.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="Themes\Gray.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Page Include="Themes\BlackAndWhite.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Page>
-    <Page Include="Themes\BlurBlack.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Page>
-    <Page Include="Themes\BlurWhite.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Page>
   </ItemGroup>
+  
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Page Remove="Themes\ThemeBuilder\Template.xaml" />
-      <SubType>Code</SubType>
+  </ItemGroup>
-    </Compile>
+
-    <Compile Include="Properties\Resources.Designer.cs">
+  <ItemGroup>
-      <AutoGen>True</AutoGen>
+    <PackageReference Include="Fody" Version="6.1.1">
-      <DesignTime>True</DesignTime>
+      <PrivateAssets>all</PrivateAssets>
-      <DependentUpon>Resources.resx</DependentUpon>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </Compile>
+    </PackageReference>
-    <Compile Include="Properties\Settings.Designer.cs">
+    <PackageReference Include="InputSimulator" Version="1.0.4" />
-      <AutoGen>True</AutoGen>
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-      <DependentUpon>Settings.settings</DependentUpon>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    <PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
-    </Compile>
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <PackageReference Include="NuGet.CommandLine" Version="5.4.0">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <PrivateAssets>all</PrivateAssets>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </EmbeddedResource>
+    </PackageReference>
-    <None Include="Properties\Settings.settings">
+    <PackageReference Include="PropertyChanged.Fody" Version="3.2.6" />
-      <Generator>SettingsSingleFileGenerator</Generator>
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Wox.Core\Wox.Core.csproj" />
+    <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
+    <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Images\app.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Wox.Core\Wox.Core.csproj">
-      <Project>{B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}</Project>
-      <Name>Wox.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj">
-      <Project>{4fd29318-a8ab-4d8f-aa47-60bc241b8da3}</Project>
-      <Name>Wox.Infrastructure</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj">
-      <Project>{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}</Project>
-      <Name>Wox.Plugin</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
     <Resource Include="Images\app.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
-  </ItemGroup>
+    <None Update="Images\app_error.png">
-  <ItemGroup>
-    <Resource Include="Images\file.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
+    </None>
-    <Resource Include="Images\open.png">
+    <None Update="Images\Browser.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
+    </None>
-  </ItemGroup>
+    <None Update="Images\calculator.png">
-  <ItemGroup>
-    <None Include="Resources\app.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\sleep.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
+    </None>
+    <None Update="Images\cancel.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\close.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\cmd.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\color.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\copy.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\down.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\EXE.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\file.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\find.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\folder.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\history.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\image.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\Link.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\lock.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\logoff.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\New Message.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\ok.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\open.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\plugin.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\recyclebin.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\restart.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\search.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\settings.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\shutdown.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\sleep.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\up.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\update.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Images\warning.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
-  <ItemGroup>
+
-    <PackageReference Include="Fody">
+  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-      <Version>1.29.2</Version>
+    <Exec Command="taskkill /f /fi &quot;IMAGENAME eq Wox.exe&quot;" />
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="InputSimulator">
-      <Version>1.0.4</Version>
-    </PackageReference>
-    <PackageReference Include="JetBrains.Annotations">
-      <Version>10.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>9.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="NHotkey.Wpf">
-      <Version>1.2.1</Version>
-    </PackageReference>
-    <PackageReference Include="NLog">
-      <Version>4.2.0</Version>
-    </PackageReference>
-    <PackageReference Include="NuGet.CommandLine">
-      <Version>3.4.3</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody">
-      <Version>1.51.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="squirrel.windows">
-      <Version>1.5.2</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime">
-      <Version>4.0.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>powershell.exe -NoProfile -ExecutionPolicy Bypass -File $(SolutionDir)Scripts\post_build.ps1 $(ConfigurationName) $(SolutionDir)</PostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PreBuildEvent>taskkill /f /fi "IMAGENAME eq Wox.exe"</PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-       !-->
-  <Target Name="BeforeBuild">
   </Target>
-  <Target Name="AfterBuild">
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="powershell.exe -NoProfile -ExecutionPolicy Bypass -File $(SolutionDir)Scripts\post_build.ps1 $(ConfigurationName) $(SolutionDir)" />
   </Target>
 </Project>