diff --git a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj index 684662df5..b98733caf 100644 --- a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj +++ b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj @@ -1,19 +1,18 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {03FFA443-5F50-48D5-8869-F3DF316803AA} - Library Properties HelloWorldCSharp HelloWorldCSharp - v4.7.2 - 512 - true - + false + false + + Library + + AnyCPU true @@ -25,6 +24,7 @@ 4 false + AnyCPU pdbonly @@ -35,47 +35,26 @@ 4 false - - - - - - - - - - - - - - - - - + PreserveNewest + - - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} - Wox.Plugin - + - + PreserveNewest - - + + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj b/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj index 96dc790a0..95766d08e 100644 --- a/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj +++ b/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj @@ -1,22 +1,15 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {9B130CC5-14FB-41FF-B310-0A95B6894C37} - Library Properties Wox.Plugin.BrowserBookmark Wox.Plugin.BrowserBookmark - v4.7.2 - 512 - ..\..\ - true - - - + false + false + true full @@ -27,6 +20,7 @@ 4 false + pdbonly true @@ -36,34 +30,14 @@ 4 false - - - - - - - - - - - - - - - - - - - - SettingsControl.xaml - - + PreserveNewest + Always @@ -80,16 +54,12 @@ Always + - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + MSBuild:Compile @@ -97,30 +67,22 @@ PreserveNewest + MSBuild:Compile Designer + - - 1.0.111 - - - 1.0.111 - - - 1.0.0 - + + + - - - + + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj b/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj index 82230aa52..bb841fd3c 100644 --- a/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj +++ b/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj @@ -1,19 +1,15 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {59BD9891-3837-438A-958D-ADC7F91F6F7E} - Library Properties Wox.Plugin.Caculator Wox.Plugin.Caculator - v4.7.2 - 512 - ..\..\ - + false + false + true full @@ -24,6 +20,7 @@ 4 false + pdbonly true @@ -33,48 +30,24 @@ 4 false - - - ..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll - True - - - ..\..\packages\Mages.1.5.0\lib\net35\Mages.Core.dll - True - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - - + PreserveNewest + - - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + PreserveNewest + MSBuild:Compile @@ -82,6 +55,7 @@ PreserveNewest + MSBuild:Compile @@ -89,6 +63,7 @@ PreserveNewest + MSBuild:Compile @@ -96,6 +71,7 @@ PreserveNewest + MSBuild:Compile @@ -103,6 +79,7 @@ PreserveNewest + MSBuild:Compile @@ -110,6 +87,7 @@ PreserveNewest + MSBuild:Compile @@ -117,27 +95,15 @@ PreserveNewest + - - 10.3.0 - - - 1.5.0 - - - 4.0.0 - + + + - - - - - - + + + + + \ 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 d61dceca1..38e84fa2b 100644 --- a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj +++ b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj @@ -1,18 +1,15 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {F35190AA-4758-4D9E-A193-E3BDF6AD3567} - Library Properties Wox.Plugin.Color Wox.Plugin.Color - v4.7.2 - 512 - + false + false + true full @@ -23,6 +20,7 @@ 4 false + pdbonly true @@ -32,43 +30,24 @@ 4 false - - - ..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll - True - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - + PreserveNewest + PreserveNewest + - - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + MSBuild:Compile @@ -76,6 +55,7 @@ PreserveNewest + MSBuild:Compile @@ -83,6 +63,7 @@ PreserveNewest + MSBuild:Compile @@ -90,6 +71,7 @@ PreserveNewest + MSBuild:Compile @@ -97,6 +79,7 @@ PreserveNewest + MSBuild:Compile @@ -104,6 +87,7 @@ PreserveNewest + MSBuild:Compile @@ -111,20 +95,14 @@ PreserveNewest + - - 10.3.0 - - - 4.0.0 - + + - - + + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj index dbc0e01ea..14d7db95f 100644 --- a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj +++ b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj @@ -1,18 +1,15 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {1EE20B48-82FB-48A2-8086-675D6DDAB4F0} - Library Properties Wox.Plugin.ControlPanel Wox.Plugin.ControlPanel - v4.7.2 - 512 - + false + false + true full @@ -23,6 +20,7 @@ 4 false + pdbonly true @@ -32,45 +30,24 @@ 4 false - - - ..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll - True - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - - - + PreserveNewest + - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + PreserveNewest + MSBuild:Compile @@ -78,6 +55,7 @@ PreserveNewest + MSBuild:Compile @@ -85,6 +63,7 @@ PreserveNewest + MSBuild:Compile @@ -92,6 +71,7 @@ PreserveNewest + MSBuild:Compile @@ -99,6 +79,7 @@ PreserveNewest + MSBuild:Compile @@ -106,6 +87,7 @@ PreserveNewest + MSBuild:Compile @@ -113,20 +95,14 @@ PreserveNewest + - - 10.3.0 - - - 4.0.0 - + + - - + + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj index ba45a5de7..6d7d8ac68 100644 --- a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj +++ b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj @@ -1,19 +1,15 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {230AE83F-E92E-4E69-8355-426B305DA9C0} - Library Properties Wox.Plugin.Everything Wox.Plugin.Everything - v4.7.2 - 512 - ..\Wox\ - + false + false + true full @@ -25,6 +21,7 @@ AnyCPU false + pdbonly true @@ -34,48 +31,7 @@ 4 false - - - - - - ..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll - True - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - EverythingSettings.xaml - - - - - - - - - - - - - - - - + PreserveNewest @@ -102,21 +58,18 @@ PreserveNewest + PreserveNewest + - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + MSBuild:Compile @@ -124,6 +77,7 @@ PreserveNewest + MSBuild:Compile @@ -131,6 +85,7 @@ PreserveNewest + MSBuild:Compile @@ -138,6 +93,7 @@ PreserveNewest + MSBuild:Compile @@ -145,6 +101,7 @@ PreserveNewest + MSBuild:Compile @@ -152,6 +109,7 @@ PreserveNewest + Designer @@ -163,27 +121,15 @@ PreserveNewest + - - 10.3.0 - - - 9.0.1 - - - 4.0.0 - + + + - - - - - - + + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Folder/Main.cs b/Plugins/Wox.Plugin.Folder/Main.cs index 53e298eb6..c6c2d2254 100644 --- a/Plugins/Wox.Plugin.Folder/Main.cs +++ b/Plugins/Wox.Plugin.Folder/Main.cs @@ -102,7 +102,7 @@ namespace Wox.Plugin.Folder { try { - Process.Start(path); + Process.Start("explorer", path); return true; } catch (Exception ex) @@ -254,7 +254,7 @@ namespace Wox.Plugin.Folder { try { - Process.Start(filePath); + Process.Start("explorer", filePath); } catch (Exception ex) { @@ -285,7 +285,7 @@ namespace Wox.Plugin.Folder Score = 500, Action = c => { - Process.Start(search); + Process.Start("explorer", search); return true; } }; diff --git a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj index d87e5d3aa..6fb870737 100644 --- a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj +++ b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj @@ -1,19 +1,16 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} - Library Properties Wox.Plugin.Folder Wox.Plugin.Folder - v4.7.2 - 512 - ..\..\ - + true + false + false + true full @@ -24,6 +21,7 @@ 4 false + pdbonly true @@ -33,45 +31,13 @@ 4 false - - - ..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll - True - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - - - FolderPluginSettings.xaml - - - - + PreserveNewest + MSBuild:Compile @@ -120,38 +86,26 @@ PreserveNewest + - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + PreserveNewest + - - 10.3.0 - - - 9.0.1 - - - 4.0.0 - + + + - - + + + + + \ 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 9d202276b..1d1902eba 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj +++ b/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj @@ -1,18 +1,15 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {FDED22C8-B637-42E8-824A-63B5B6E05A3A} - Library Properties Wox.Plugin.PluginIndicator Wox.Plugin.PluginIndicator - v4.7.2 - 512 - + false + false + true full @@ -23,6 +20,7 @@ 4 false + pdbonly true @@ -32,42 +30,25 @@ 4 false - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - + PreserveNewest + - - {b749f0db-8e75-47db-9e5e-265d16d0c0d2} - Wox.Core - - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + + PreserveNewest + MSBuild:Compile @@ -75,6 +56,7 @@ PreserveNewest + MSBuild:Compile @@ -82,6 +64,7 @@ PreserveNewest + MSBuild:Compile @@ -89,6 +72,7 @@ PreserveNewest + MSBuild:Compile @@ -96,6 +80,7 @@ PreserveNewest + MSBuild:Compile @@ -103,6 +88,7 @@ PreserveNewest + MSBuild:Compile @@ -110,20 +96,14 @@ PreserveNewest + - - 10.3.0 - - - 4.0.0 - + + - - + + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj index 13081457f..62f59df4e 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj +++ b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj @@ -1,19 +1,16 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {049490F0-ECD2-4148-9B39-2135EC346EBE} - Library Properties Wox.Plugin.PluginManagement Wox.Plugin.PluginManagement - v4.7.2 - 512 - ..\..\ - + true + false + false + true full @@ -24,6 +21,7 @@ 4 false + pdbonly true @@ -33,42 +31,24 @@ 4 false + - - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - - - - - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + PreserveNewest + PreserveNewest + MSBuild:Compile @@ -76,6 +56,7 @@ PreserveNewest + MSBuild:Compile @@ -83,6 +64,7 @@ PreserveNewest + MSBuild:Compile @@ -90,6 +72,7 @@ PreserveNewest + MSBuild:Compile @@ -97,6 +80,7 @@ PreserveNewest + MSBuild:Compile @@ -104,6 +88,7 @@ PreserveNewest + MSBuild:Compile @@ -111,27 +96,15 @@ PreserveNewest + - - 10.3.0 - - - 9.0.1 - - - 4.0.0 - + + + - - - - - - + + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Program/Programs/Win32.cs b/Plugins/Wox.Plugin.Program/Programs/Win32.cs index 53ac2065c..214c1b70f 100644 --- a/Plugins/Wox.Plugin.Program/Programs/Win32.cs +++ b/Plugins/Wox.Plugin.Program/Programs/Win32.cs @@ -62,7 +62,8 @@ namespace Wox.Plugin.Program.Programs var info = new ProcessStartInfo { FileName = FullPath, - WorkingDirectory = ParentDirectory + WorkingDirectory = ParentDirectory, + UseShellExecute = true }; Main.StartProcess(Process.Start, info); @@ -102,7 +103,12 @@ namespace Wox.Plugin.Program.Programs Title = api.GetTranslation("wox_plugin_program_run_as_different_user"), Action = _ => { - var info = FullPath.SetProcessStartInfo(ParentDirectory); + var info = new ProcessStartInfo + { + FileName = FullPath, + WorkingDirectory = ParentDirectory, + UseShellExecute = true + }; Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info)); @@ -119,7 +125,8 @@ namespace Wox.Plugin.Program.Programs { FileName = FullPath, WorkingDirectory = ParentDirectory, - Verb = "runas" + Verb = "runas", + UseShellExecute = true }; Task.Run(() => Main.StartProcess(Process.Start, info)); @@ -133,7 +140,9 @@ namespace Wox.Plugin.Program.Programs Title = api.GetTranslation("wox_plugin_program_open_containing_folder"), Action = _ => { - Main.StartProcess(Process.Start, new ProcessStartInfo(ParentDirectory)); + + + Main.StartProcess(Process.Start, new ProcessStartInfo("explorer", ParentDirectory)); return true; }, diff --git a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj index 2bb84e641..762b11e0e 100644 --- a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj +++ b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj @@ -1,21 +1,17 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {FDB3555B-58EF-4AE6-B5F1-904719637AB4} - Library Properties Wox.Plugin.Program Wox.Plugin.Program - v4.7.2 - 512 - ..\..\ - - - + true + true + false + false + true full @@ -26,6 +22,7 @@ 4 false + pdbonly true @@ -35,58 +32,28 @@ 4 false - - - .\AppxPackagingTlb.dll - True - - - - - - .\ShObjIdlTlb.dll - True - - - - - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - AddProgramSource.xaml - - - - - - - - - - - - ProgramSetting.xaml - - - - ProgramSuffixes.xaml - - - - + PreserveNewest + + + + + + + + .\AppxPackagingTlb.dll + True + + + .\ShObjIdlTlb.dll + True + + + PreserveNewest @@ -109,6 +76,7 @@ PreserveNewest + MSBuild:Compile @@ -135,48 +103,22 @@ Designer PreserveNewest - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - + - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + - - 10.3.0 - - - 9.0.1 - - - 4.2.0 - - - 4.0.0 - - - 10.0.14393.3 - + + + + + + + + + - - \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj b/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj index 998eb7ac6..3181d1146 100644 --- a/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj +++ b/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj @@ -1,19 +1,16 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} - Library Properties Wox.Plugin.Shell Wox.Plugin.Shell - v4.7.2 - 512 - ..\..\ - + true + false + false + true full @@ -24,6 +21,7 @@ 4 false + pdbonly true @@ -33,42 +31,7 @@ 4 false - - - ..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll - True - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - ..\..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll - True - - - - - Properties\SolutionAssemblyInfo.cs - - - - - - ShellSetting.xaml - - + Always @@ -94,26 +57,24 @@ PreserveNewest + - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + PreserveNewest + PreserveNewest + MSBuild:Compile @@ -130,26 +91,16 @@ Designer + - - 1.0.4 - - - 10.3.0 - - - 9.0.1 - - - 4.0.0 - + + + + - - + + + + + \ 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 aa6d15233..a2c1a9ee0 100644 --- a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj +++ b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj @@ -1,19 +1,16 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {0B9DE348-9361-4940-ADB6-F5953BFFCCEC} - Library Properties Wox.Plugin.Sys Wox.Plugin.Sys - v4.7.2 - 512 - ..\..\ - + true + false + false + true full @@ -24,6 +21,7 @@ 4 false + pdbonly true @@ -33,43 +31,12 @@ 4 false + - - ..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll - True - - - - - - - - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - - SysSettings.xaml - - - - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + PreserveNewest @@ -112,53 +79,51 @@ Designer + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + + + - - 10.3.0 - - - 4.0.0 - + + - - + \ 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 9c10da5ab..163cadba6 100644 --- a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj +++ b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj @@ -1,18 +1,16 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {A3DCCBCA-ACC1-421D-B16E-210896234C26} - Library + true Properties Wox.Plugin.Url Wox.Plugin.Url - v4.7.2 - 512 - + false + false + true full @@ -23,6 +21,7 @@ 4 false + pdbonly true @@ -32,49 +31,24 @@ 4 false - - - ..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll - True - - - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - - - SettingsControl.xaml - - + PreserveNewest + - - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - + + + PreserveNewest + MSBuild:Compile @@ -82,6 +56,7 @@ PreserveNewest + MSBuild:Compile @@ -89,6 +64,7 @@ PreserveNewest + MSBuild:Compile @@ -96,6 +72,7 @@ PreserveNewest + MSBuild:Compile @@ -103,6 +80,7 @@ PreserveNewest + MSBuild:Compile @@ -110,31 +88,14 @@ PreserveNewest + - - MSBuild:Compile - Designer - PreserveNewest - - - Designer - MSBuild:Compile - + + + - - 10.3.0 - - - 4.0.0 - + - - + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj index 64415af15..54ce4d724 100644 --- a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj +++ b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj @@ -1,19 +1,15 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {403B57F2-1856-4FC7-8A24-36AB346B763E} - Library Properties Wox.Plugin.WebSearch Wox.Plugin.WebSearch - v4.7.2 - 512 - ..\..\ - + false + false + true full @@ -24,6 +20,7 @@ 4 false + pdbonly true @@ -33,39 +30,7 @@ 4 false - - - - - - - - - - - - - - - - Properties\SolutionAssemblyInfo.cs - - - - - - - - - - SettingsControl.xaml - - - - SearchSourceSetting.xaml - - - + PreserveNewest @@ -160,47 +125,33 @@ Designer - - - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2} - Wox.Core - - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - - + PreserveNewest + PreserveNewest + - - 10.3.0 - - - 9.0.1 - - - 4.0.0 - + + + - - + + + + + + + + + + + \ No newline at end of file diff --git a/Wox.Core/FodyWeavers.xml b/Wox.Core/FodyWeavers.xml index bb0f322ee..4e68ed1a8 100644 --- a/Wox.Core/FodyWeavers.xml +++ b/Wox.Core/FodyWeavers.xml @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Wox.Core/Plugin/PluginsLoader.cs b/Wox.Core/Plugin/PluginsLoader.cs index 3f5f9ad32..c575743f3 100644 --- a/Wox.Core/Plugin/PluginsLoader.cs +++ b/Wox.Core/Plugin/PluginsLoader.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.Loader; using Wox.Infrastructure; using Wox.Infrastructure.Exception; using Wox.Infrastructure.Logger; @@ -37,7 +38,7 @@ namespace Wox.Core.Plugin { #if DEBUG - var assembly = Assembly.Load(AssemblyName.GetAssemblyName(metadata.ExecuteFilePath)); + var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(metadata.ExecuteFilePath); var types = assembly.GetTypes(); var type = types.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(typeof(IPlugin))); var plugin = (IPlugin)Activator.CreateInstance(type); @@ -45,7 +46,7 @@ namespace Wox.Core.Plugin Assembly assembly; try { - assembly = Assembly.Load(AssemblyName.GetAssemblyName(metadata.ExecuteFilePath)); + assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(metadata.ExecuteFilePath); } catch (Exception e) { diff --git a/Wox.Core/Wox.Core.csproj b/Wox.Core/Wox.Core.csproj index 01f1117b3..310612f61 100644 --- a/Wox.Core/Wox.Core.csproj +++ b/Wox.Core/Wox.Core.csproj @@ -8,6 +8,8 @@ Properties Wox.Core Wox.Core + false + false diff --git a/Wox.Infrastructure/Wox.Infrastructure.csproj b/Wox.Infrastructure/Wox.Infrastructure.csproj index fc8329a55..539d295ff 100644 --- a/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -8,6 +8,8 @@ Properties Wox.Infrastructure Wox.Infrastructure + false + false diff --git a/Wox.Plugin/FodyWeavers.xml b/Wox.Plugin/FodyWeavers.xml index bb0f322ee..4e68ed1a8 100644 --- a/Wox.Plugin/FodyWeavers.xml +++ b/Wox.Plugin/FodyWeavers.xml @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Wox.Plugin/SharedCommands/SearchWeb.cs b/Wox.Plugin/SharedCommands/SearchWeb.cs index f91025bff..37ea6a2e7 100644 --- a/Wox.Plugin/SharedCommands/SearchWeb.cs +++ b/Wox.Plugin/SharedCommands/SearchWeb.cs @@ -28,7 +28,12 @@ namespace Wox.Plugin.SharedCommands } catch (System.ComponentModel.Win32Exception) { - Process.Start(url); + var psi = new ProcessStartInfo + { + FileName = url, + UseShellExecute = true + }; + Process.Start(psi); } } diff --git a/Wox.Plugin/Wox.Plugin.csproj b/Wox.Plugin/Wox.Plugin.csproj index 8171f3ed6..6239fb00c 100644 --- a/Wox.Plugin/Wox.Plugin.csproj +++ b/Wox.Plugin/Wox.Plugin.csproj @@ -8,6 +8,8 @@ Properties Wox.Plugin Wox.Plugin + false + false diff --git a/Wox.Test/Wox.Test.csproj b/Wox.Test/Wox.Test.csproj index 480375b21..7e0a2ce89 100644 --- a/Wox.Test/Wox.Test.csproj +++ b/Wox.Test/Wox.Test.csproj @@ -1,21 +1,16 @@ - - - + + - Debug - AnyCPU + netcoreapp3.1 {FF742965-9A80-41A5-B042-D6C7D3A21708} Library Properties Wox.Test Wox.Test - v4.7.2 - 512 - ..\ - - - + + + true full @@ -26,6 +21,7 @@ 4 false + pdbonly true @@ -35,55 +31,23 @@ 4 false + - - + + + + + - - Properties\SolutionAssemblyInfo.cs - - - - - - + + + + + - - {A3DCCBCA-ACC1-421D-B16E-210896234C26} - Wox.Plugin.Url - - - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2} - Wox.Core - - - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} - Wox.Infrastructure - - - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} - Wox.Plugin - + - - - 4.2.1409.1722 - - - 3.12.0 - - - 3.15.1 - - - - + \ No newline at end of file diff --git a/Wox.sln b/Wox.sln index cbceab9b8..1c00c7bc0 100644 --- a/Wox.sln +++ b/Wox.sln @@ -1,18 +1,18 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.271 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29806.167 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Test", "Wox.Test\Wox.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}" ProjectSection(ProjectDependencies) = postProject {DB90F671-D861-46BB-93A3-F1304F5BA1C5} = {DB90F671-D861-46BB-93A3-F1304F5BA1C5} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin", "Wox.Plugin\Wox.Plugin.csproj", "{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin", "Wox.Plugin\Wox.Plugin.csproj", "{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox", "Wox\Wox.csproj", "{DB90F671-D861-46BB-93A3-F1304F5BA1C5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox", "Wox\Wox.csproj", "{DB90F671-D861-46BB-93A3-F1304F5BA1C5}" ProjectSection(ProjectDependencies) = postProject {230AE83F-E92E-4E69-8355-426B305DA9C0} = {230AE83F-E92E-4E69-8355-426B305DA9C0} {1EE20B48-82FB-48A2-8086-675D6DDAB4F0} = {1EE20B48-82FB-48A2-8086-675D6DDAB4F0} @@ -29,29 +29,29 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox", "Wox\Wox.csproj", "{D {403B57F2-1856-4FC7-8A24-36AB346B763E} = {403B57F2-1856-4FC7-8A24-36AB346B763E} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Infrastructure", "Wox.Infrastructure\Wox.Infrastructure.csproj", "{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Infrastructure", "Wox.Infrastructure\Wox.Infrastructure.csproj", "{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.PluginManagement", "Plugins\Wox.Plugin.PluginManagement\Wox.Plugin.PluginManagement.csproj", "{049490F0-ECD2-4148-9B39-2135EC346EBE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.PluginManagement", "Plugins\Wox.Plugin.PluginManagement\Wox.Plugin.PluginManagement.csproj", "{049490F0-ECD2-4148-9B39-2135EC346EBE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Core", "Wox.Core\Wox.Core.csproj", "{B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Core", "Wox.Core\Wox.Core.csproj", "{B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Program", "Plugins\Wox.Plugin.Program\Wox.Plugin.Program.csproj", "{FDB3555B-58EF-4AE6-B5F1-904719637AB4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Program", "Plugins\Wox.Plugin.Program\Wox.Plugin.Program.csproj", "{FDB3555B-58EF-4AE6-B5F1-904719637AB4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.WebSearch", "Plugins\Wox.Plugin.WebSearch\Wox.Plugin.WebSearch.csproj", "{403B57F2-1856-4FC7-8A24-36AB346B763E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.WebSearch", "Plugins\Wox.Plugin.WebSearch\Wox.Plugin.WebSearch.csproj", "{403B57F2-1856-4FC7-8A24-36AB346B763E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.ControlPanel", "Plugins\Wox.Plugin.ControlPanel\Wox.Plugin.ControlPanel.csproj", "{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.ControlPanel", "Plugins\Wox.Plugin.ControlPanel\Wox.Plugin.ControlPanel.csproj", "{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Folder", "Plugins\Wox.Plugin.Folder\Wox.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Folder", "Plugins\Wox.Plugin.Folder\Wox.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.PluginIndicator", "Plugins\Wox.Plugin.PluginIndicator\Wox.Plugin.PluginIndicator.csproj", "{FDED22C8-B637-42E8-824A-63B5B6E05A3A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.PluginIndicator", "Plugins\Wox.Plugin.PluginIndicator\Wox.Plugin.PluginIndicator.csproj", "{FDED22C8-B637-42E8-824A-63B5B6E05A3A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Sys", "Plugins\Wox.Plugin.Sys\Wox.Plugin.Sys.csproj", "{0B9DE348-9361-4940-ADB6-F5953BFFCCEC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Sys", "Plugins\Wox.Plugin.Sys\Wox.Plugin.Sys.csproj", "{0B9DE348-9361-4940-ADB6-F5953BFFCCEC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Url", "Plugins\Wox.Plugin.Url\Wox.Plugin.Url.csproj", "{A3DCCBCA-ACC1-421D-B16E-210896234C26}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Url", "Plugins\Wox.Plugin.Url\Wox.Plugin.Url.csproj", "{A3DCCBCA-ACC1-421D-B16E-210896234C26}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Color", "Plugins\Wox.Plugin.Color\Wox.Plugin.Color.csproj", "{F35190AA-4758-4D9E-A193-E3BDF6AD3567}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Color", "Plugins\Wox.Plugin.Color\Wox.Plugin.Color.csproj", "{F35190AA-4758-4D9E-A193-E3BDF6AD3567}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Everything", "Plugins\Wox.Plugin.Everything\Wox.Plugin.Everything.csproj", "{230AE83F-E92E-4E69-8355-426B305DA9C0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Everything", "Plugins\Wox.Plugin.Everything\Wox.Plugin.Everything.csproj", "{230AE83F-E92E-4E69-8355-426B305DA9C0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FFD651C7-0546-441F-BC8C-D4EE8FD01EA7}" ProjectSection(SolutionItems) = preProject @@ -66,13 +66,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Scripts\wox.plugin.nuspec = Scripts\wox.plugin.nuspec EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldCSharp", "Plugins\HelloWorldCSharp\HelloWorldCSharp.csproj", "{03FFA443-5F50-48D5-8869-F3DF316803AA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorldCSharp", "Plugins\HelloWorldCSharp\HelloWorldCSharp.csproj", "{03FFA443-5F50-48D5-8869-F3DF316803AA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Shell", "Plugins\Wox.Plugin.Shell\Wox.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Shell", "Plugins\Wox.Plugin.Shell\Wox.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Calculator", "Plugins\Wox.Plugin.Calculator\Wox.Plugin.Calculator.csproj", "{59BD9891-3837-438A-958D-ADC7F91F6F7E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Calculator", "Plugins\Wox.Plugin.Calculator\Wox.Plugin.Calculator.csproj", "{59BD9891-3837-438A-958D-ADC7F91F6F7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.BrowserBookmark", "Plugins\Wox.Plugin.BrowserBookmark\Wox.Plugin.BrowserBookmark.csproj", "{9B130CC5-14FB-41FF-B310-0A95B6894C37}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.BrowserBookmark", "Plugins\Wox.Plugin.BrowserBookmark\Wox.Plugin.BrowserBookmark.csproj", "{9B130CC5-14FB-41FF-B310-0A95B6894C37}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Wox/FodyWeavers.xml b/Wox/FodyWeavers.xml index bb0f322ee..4e68ed1a8 100644 --- a/Wox/FodyWeavers.xml +++ b/Wox/FodyWeavers.xml @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 89a096299..177bba9da 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -8,6 +8,8 @@ Wox.App Resources\app.ico app.manifest + false + false @@ -53,6 +55,7 @@ + @@ -61,10 +64,14 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + + +