diff --git a/src/modules/launcher/.gitattributes b/src/modules/launcher/.gitattributes deleted file mode 100644 index 4f81094560..0000000000 --- a/src/modules/launcher/.gitattributes +++ /dev/null @@ -1,65 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain - -PythonHome/* linguist-vendored \ No newline at end of file diff --git a/src/modules/launcher/.gitignore b/src/modules/launcher/.gitignore deleted file mode 100644 index 71e1fc6d6f..0000000000 --- a/src/modules/launcher/.gitignore +++ /dev/null @@ -1,302 +0,0 @@ -## https://github.com/github/gitignore/blob/master/VisualStudio.gitignore -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -## https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore -## C++ - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -# New to Visual Studio -*.VC.db - -## Wox specific -Output/* -/Python.Runtime.dll -Thumbs.db -RELEASES - - -*.sublime-* -*.dgml -migrateToAutomaticPackageRestore.ps1 -*.pyd -*.pyc -*.diagsession -Output-Performance.txt -*.diff \ No newline at end of file diff --git a/src/modules/launcher/Directory.Build.targets b/src/modules/launcher/Directory.Build.targets new file mode 100644 index 0000000000..04f8d7e76e --- /dev/null +++ b/src/modules/launcher/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/modules/launcher/Doc/app.ico b/src/modules/launcher/Doc/app.ico deleted file mode 100644 index 38c401c8ca..0000000000 Binary files a/src/modules/launcher/Doc/app.ico and /dev/null differ diff --git a/src/modules/launcher/Doc/app.png b/src/modules/launcher/Doc/app.png deleted file mode 100644 index 8c9ca7971a..0000000000 Binary files a/src/modules/launcher/Doc/app.png and /dev/null differ diff --git a/src/modules/launcher/Doc/app.psd b/src/modules/launcher/Doc/app.psd deleted file mode 100644 index 833fd6529a..0000000000 Binary files a/src/modules/launcher/Doc/app.psd and /dev/null differ diff --git a/src/modules/launcher/Doc/app_error.png b/src/modules/launcher/Doc/app_error.png deleted file mode 100644 index 5106d6e8a9..0000000000 Binary files a/src/modules/launcher/Doc/app_error.png and /dev/null differ diff --git a/src/modules/launcher/Doc/app_error.psd b/src/modules/launcher/Doc/app_error.psd deleted file mode 100644 index 174e9cb62d..0000000000 Binary files a/src/modules/launcher/Doc/app_error.psd and /dev/null differ diff --git a/src/modules/launcher/ISSUE_TEMPLATE.md b/src/modules/launcher/ISSUE_TEMPLATE.md deleted file mode 100644 index affc8518eb..0000000000 --- a/src/modules/launcher/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,102 +0,0 @@ - - -### Are you submitting a bug report? - -(write your answer here) - - - - - -### Steps to reproduce - - - -1. -2. -3. - -### Wox Error Window text - - -(paste here) - - -### Detailed logs - - -(drop your log file here) - -### Screenshots (optional) - - -(drop your screenshot here) - diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj b/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj index 12f349739c..e9f7298a77 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj +++ b/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj @@ -6,6 +6,7 @@ Properties Wox.Plugin.Caculator Wox.Plugin.Caculator + true false false x64 @@ -106,9 +107,5 @@ - - - - \ No newline at end of file diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj b/src/modules/launcher/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj index 550c59873c..01d2a372ca 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj +++ b/src/modules/launcher/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj @@ -109,8 +109,4 @@ - - - - \ No newline at end of file diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Main.cs b/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Main.cs index 652af40c40..8d6af797e9 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Main.cs +++ b/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Main.cs @@ -92,7 +92,7 @@ namespace Wox.Plugin.Indexer results.Add(new Result { // TODO: Localize the string - Title = "Windows indexer plugin is not running", + Title = ex.ToString(), IcoPath = "Images\\WindowsIndexerImg.bmp" }); } diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs b/src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs index 64875595a1..fb7b6ffcd1 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs +++ b/src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs @@ -32,10 +32,11 @@ namespace Wox.Plugin.Indexer.SearchHelper while (WDSResults.Read()) { // col 0 is our path in display format - Console.WriteLine("{0}", WDSResults.GetString(0)); - var result = new SearchResult { Path = WDSResults.GetString(0) }; - - yield return result; + if (WDSResults.GetString(0) != null) + { + var result = new SearchResult { Path = WDSResults.GetString(0) }; + yield return result; + } } } diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj index 37f4a2e7bd..742e35a3e9 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj +++ b/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj @@ -1,13 +1,19 @@ - + netcoreapp3.1 + {F8B870EB-D5F5-45BA-9CF7-A5C459818820} + Properties + Wox.Plugin.Indexer + Wox.Plugin.Indexer + false + false x64 true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Folder\ + ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Indexer\ DEBUG;TRACE full x64 @@ -19,7 +25,7 @@ - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Folder\ + ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Indexer\ TRACE true pdbonly @@ -39,4 +45,13 @@ + + + PreserveNewest + + + PreserveNewest + + + diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj index 1b44c3942f..d0c1cac730 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj +++ b/src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj @@ -113,13 +113,10 @@ + - + - - - - - + \ No newline at end of file diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj b/src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj index 3c93d9aa50..51fdbb375a 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj +++ b/src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj @@ -103,9 +103,5 @@ - - - - \ No newline at end of file diff --git a/src/modules/launcher/SolutionAssemblyInfo.cs b/src/modules/launcher/SolutionAssemblyInfo.cs deleted file mode 100644 index 17bc04fb3a..0000000000 --- a/src/modules/launcher/SolutionAssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -#if DEBUG - -[assembly: AssemblyConfiguration("Debug")] -[assembly: AssemblyDescription("Debug build, https://github.com/Wox-launcher/Wox")] -#else -[assembly: AssemblyConfiguration("Release")] -[assembly: AssemblyDescription("Release build, https://github.com/Wox-launcher/Wox")] -#endif - -[assembly: AssemblyCompany("Wox")] -[assembly: AssemblyProduct("Wox")] -[assembly: AssemblyCopyright("The MIT License (MIT)")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.2.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] -[assembly: AssemblyInformationalVersion("1.2.0")] \ No newline at end of file diff --git a/src/modules/launcher/Wox.Core/FodyWeavers.xsd b/src/modules/launcher/Wox.Core/FodyWeavers.xsd index 2f1b8aae7a..221aeb8a54 100644 --- a/src/modules/launcher/Wox.Core/FodyWeavers.xsd +++ b/src/modules/launcher/Wox.Core/FodyWeavers.xsd @@ -31,6 +31,16 @@ Used to control if equality checks should use the static Equals method resolved from the base class. + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + diff --git a/src/modules/launcher/Wox.Core/Updater.cs b/src/modules/launcher/Wox.Core/Updater.cs deleted file mode 100644 index 9262d78f4d..0000000000 --- a/src/modules/launcher/Wox.Core/Updater.cs +++ /dev/null @@ -1,146 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Net; -using System.Net.Http; -using System.Net.Sockets; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; -using JetBrains.Annotations; -using Squirrel; -using Newtonsoft.Json; -using Wox.Core.Resource; -using Wox.Plugin.SharedCommands; -using Wox.Infrastructure; -using Wox.Infrastructure.Http; -using Wox.Infrastructure.Logger; -using System.IO; - -namespace Wox.Core -{ - public class Updater - { - public string GitHubRepository { get; } - - public Updater(string gitHubRepository) - { - GitHubRepository = gitHubRepository; - } - - public async Task UpdateApp(bool silentIfLatestVersion = true) - { - UpdateManager updateManager; - UpdateInfo newUpdateInfo; - - try - { - updateManager = await GitHubUpdateManager(GitHubRepository); - } - catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException) - { - Log.Exception($"|Updater.UpdateApp|Please check your connection and proxy settings to api.github.com.", e); - return; - } - - try - { - // UpdateApp CheckForUpdate will return value only if the app is squirrel installed - newUpdateInfo = await updateManager.CheckForUpdate().NonNull(); - } - catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException) - { - Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to api.github.com.", e); - updateManager.Dispose(); - return; - } - - var newReleaseVersion = Version.Parse(newUpdateInfo.FutureReleaseEntry.Version.ToString()); - var currentVersion = Version.Parse(Constant.Version); - - Log.Info($"|Updater.UpdateApp|Future Release <{newUpdateInfo.FutureReleaseEntry.Formatted()}>"); - - if (newReleaseVersion <= currentVersion) - { - if (!silentIfLatestVersion) - MessageBox.Show("You already have the latest Wox version"); - updateManager.Dispose(); - return; - } - - try - { - await updateManager.DownloadReleases(newUpdateInfo.ReleasesToApply); - } - catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException) - { - Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e); - updateManager.Dispose(); - return; - } - - await updateManager.ApplyReleases(newUpdateInfo); - - if (Constant.IsPortableMode) - { - var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion.ToString()}\\{Constant.PortableFolderName}"; - FilesFolders.Copy(Constant.PortableDataPath, targetDestination); - if (!FilesFolders.VerifyBothFolderFilesEqual(Constant.PortableDataPath, targetDestination)) - MessageBox.Show(string.Format("Wox was not able to move your user profile data to the new update version. Please manually" + - "move your profile data folder from {0} to {1}", Constant.PortableDataPath, targetDestination)); - } - else - { - await updateManager.CreateUninstallerRegistryEntry(); - } - - var newVersionTips = NewVersinoTips(newReleaseVersion.ToString()); - - MessageBox.Show(newVersionTips); - Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}"); - - // always dispose UpdateManager - updateManager.Dispose(); - } - - [UsedImplicitly] - private class GithubRelease - { - [JsonProperty("prerelease")] - public bool Prerelease { get; [UsedImplicitly] set; } - - [JsonProperty("published_at")] - public DateTime PublishedAt { get; [UsedImplicitly] set; } - - [JsonProperty("html_url")] - public string HtmlUrl { get; [UsedImplicitly] set; } - } - - /// https://github.com/Squirrel/Squirrel.Windows/blob/master/src/Squirrel/UpdateManager.Factory.cs - private async Task GitHubUpdateManager(string repository) - { - var uri = new Uri(repository); - var api = $"https://api.github.com/repos{uri.AbsolutePath}/releases"; - - var json = await Http.Get(api); - - var releases = JsonConvert.DeserializeObject>(json); - var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First(); - var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/"); - - var client = new WebClient { Proxy = Http.WebProxy() }; - var downloader = new FileDownloader(client); - - var manager = new UpdateManager(latestUrl, urlDownloader: downloader); - - return manager; - } - - public string NewVersinoTips(string version) - { - var translater = InternationalizationManager.Instance; - var tips = string.Format(translater.GetTranslation("newVersionTips"), version); - return tips; - } - - } -} \ No newline at end of file diff --git a/src/modules/launcher/Wox.Core/Wox.Core.csproj b/src/modules/launcher/Wox.Core/Wox.Core.csproj index b68200051f..590edda3ec 100644 --- a/src/modules/launcher/Wox.Core/Wox.Core.csproj +++ b/src/modules/launcher/Wox.Core/Wox.Core.csproj @@ -58,16 +58,11 @@ - - + - - - - diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index 8a1fe64f43..afeaef5c68 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -49,8 +49,8 @@ - - + + diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.cs b/src/modules/launcher/Wox.Infrastructure/Wox.cs index 1604c69960..522975441e 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.cs +++ b/src/modules/launcher/Wox.Infrastructure/Wox.cs @@ -7,7 +7,7 @@ namespace Wox.Infrastructure { public static class Constant { - public const string Wox = "Wox"; + public const string Wox = "PowerLauncher"; public const string Plugins = "Plugins"; private static readonly Assembly Assembly = Assembly.GetExecutingAssembly(); @@ -33,7 +33,7 @@ namespace Wox.Infrastructure public static readonly string DataDirectory = DetermineDataDirectory(); public static readonly string PluginsDirectory = Path.Combine(DataDirectory, Plugins); public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins); - public const string Issue = "https://github.com/Wox-launcher/Wox/issues/new"; + public const string Issue = "https://github.com/microsoft/PowerToys/issues/new"; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; public static readonly int ThumbnailSize = 64; diff --git a/src/modules/launcher/Wox.Launcher/dllmain.cpp b/src/modules/launcher/Wox.Launcher/dllmain.cpp index 773c726525..76057c0e13 100644 --- a/src/modules/launcher/Wox.Launcher/dllmain.cpp +++ b/src/modules/launcher/Wox.Launcher/dllmain.cpp @@ -131,7 +131,7 @@ public: { SHELLEXECUTEINFO sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\launcher\\Wox.exe"; + sei.lpFile = L"modules\\launcher\\PowerLauncher.exe"; sei.nShow = SW_SHOWNORMAL; ShellExecuteEx(&sei); diff --git a/src/modules/launcher/Wox.Plugin/FodyWeavers.xsd b/src/modules/launcher/Wox.Plugin/FodyWeavers.xsd index 2f1b8aae7a..221aeb8a54 100644 --- a/src/modules/launcher/Wox.Plugin/FodyWeavers.xsd +++ b/src/modules/launcher/Wox.Plugin/FodyWeavers.xsd @@ -31,6 +31,16 @@ Used to control if equality checks should use the static Equals method resolved from the base class. + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + diff --git a/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs b/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs index b48a6ef581..4b0a7d6d56 100644 --- a/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs +++ b/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Wox")] +[assembly: InternalsVisibleTo("PowerLauncher")] [assembly: InternalsVisibleTo("Wox.Core")] [assembly: InternalsVisibleTo("Wox.Test")] \ No newline at end of file diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index 353f62c1a7..55d01df17f 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -59,7 +59,7 @@ - + diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index a0fe13e072..3ddcec6c93 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -48,13 +48,12 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - \ No newline at end of file diff --git a/src/modules/launcher/Wox.sln b/src/modules/launcher/Wox.sln deleted file mode 100644 index cbceab9b88..0000000000 --- a/src/modules/launcher/Wox.sln +++ /dev/null @@ -1,339 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.271 -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}" -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}" - ProjectSection(ProjectDependencies) = postProject - {230AE83F-E92E-4E69-8355-426B305DA9C0} = {230AE83F-E92E-4E69-8355-426B305DA9C0} - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0} = {1EE20B48-82FB-48A2-8086-675D6DDAB4F0} - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC} = {0B9DE348-9361-4940-ADB6-F5953BFFCCEC} - {FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {FDB3555B-58EF-4AE6-B5F1-904719637AB4} - {59BD9891-3837-438A-958D-ADC7F91F6F7E} = {59BD9891-3837-438A-958D-ADC7F91F6F7E} - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} - {F35190AA-4758-4D9E-A193-E3BDF6AD3567} = {F35190AA-4758-4D9E-A193-E3BDF6AD3567} - {9B130CC5-14FB-41FF-B310-0A95B6894C37} = {9B130CC5-14FB-41FF-B310-0A95B6894C37} - {FDED22C8-B637-42E8-824A-63B5B6E05A3A} = {FDED22C8-B637-42E8-824A-63B5B6E05A3A} - {A3DCCBCA-ACC1-421D-B16E-210896234C26} = {A3DCCBCA-ACC1-421D-B16E-210896234C26} - {049490F0-ECD2-4148-9B39-2135EC346EBE} = {049490F0-ECD2-4148-9B39-2135EC346EBE} - {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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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 - .gitattributes = .gitattributes - .gitignore = .gitignore - appveyor.yml = appveyor.yml - LICENSE = LICENSE - Scripts\post_build.ps1 = Scripts\post_build.ps1 - README.md = README.md - SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs - Scripts\wox.nuspec = Scripts\wox.nuspec - 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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.BrowserBookmark", "Plugins\Wox.Plugin.BrowserBookmark\Wox.Plugin.BrowserBookmark.csproj", "{9B130CC5-14FB-41FF-B310-0A95B6894C37}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.ActiveCfg = Debug|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.Build.0 = Debug|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x86.ActiveCfg = Debug|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x86.Build.0 = Debug|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|Any CPU.Build.0 = Release|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|x64.ActiveCfg = Release|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|x64.Build.0 = Release|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|x86.ActiveCfg = Release|Any CPU - {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|x86.Build.0 = Release|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|x64.ActiveCfg = Debug|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|x64.Build.0 = Debug|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|x86.ActiveCfg = Debug|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|x86.Build.0 = Debug|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Any CPU.Build.0 = Release|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x64.ActiveCfg = Release|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x64.Build.0 = Release|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x86.ActiveCfg = Release|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x86.Build.0 = Release|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.ActiveCfg = Debug|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.Build.0 = Debug|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.ActiveCfg = Debug|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.Build.0 = Debug|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.Build.0 = Release|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.ActiveCfg = Release|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.Build.0 = Release|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.ActiveCfg = Release|Any CPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.Build.0 = Release|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x64.ActiveCfg = Debug|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x64.Build.0 = Debug|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x86.ActiveCfg = Debug|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x86.Build.0 = Debug|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|Any CPU.Build.0 = Release|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|x64.ActiveCfg = Release|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|x64.Build.0 = Release|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|x86.ActiveCfg = Release|Any CPU - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|x86.Build.0 = Release|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Debug|x64.ActiveCfg = Debug|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Debug|x64.Build.0 = Debug|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Debug|x86.ActiveCfg = Debug|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Debug|x86.Build.0 = Debug|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Release|Any CPU.Build.0 = Release|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Release|x64.ActiveCfg = Release|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Release|x64.Build.0 = Release|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Release|x86.ActiveCfg = Release|Any CPU - {049490F0-ECD2-4148-9B39-2135EC346EBE}.Release|x86.Build.0 = Release|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Debug|x64.ActiveCfg = Debug|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Debug|x64.Build.0 = Debug|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Debug|x86.ActiveCfg = Debug|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Debug|x86.Build.0 = Debug|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Release|Any CPU.Build.0 = Release|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Release|x64.ActiveCfg = Release|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Release|x64.Build.0 = Release|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Release|x86.ActiveCfg = Release|Any CPU - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Release|x86.Build.0 = Release|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Debug|x64.ActiveCfg = Debug|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Debug|x64.Build.0 = Debug|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Debug|x86.ActiveCfg = Debug|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Debug|x86.Build.0 = Debug|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Release|Any CPU.Build.0 = Release|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Release|x64.ActiveCfg = Release|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Release|x64.Build.0 = Release|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Release|x86.ActiveCfg = Release|Any CPU - {FDB3555B-58EF-4AE6-B5F1-904719637AB4}.Release|x86.Build.0 = Release|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Debug|x64.ActiveCfg = Debug|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Debug|x64.Build.0 = Debug|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Debug|x86.ActiveCfg = Debug|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Debug|x86.Build.0 = Debug|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|Any CPU.Build.0 = Release|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|x64.ActiveCfg = Release|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|x64.Build.0 = Release|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|x86.ActiveCfg = Release|Any CPU - {403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|x86.Build.0 = Release|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|x64.ActiveCfg = Debug|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|x64.Build.0 = Debug|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|x86.ActiveCfg = Debug|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|x86.Build.0 = Debug|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|Any CPU.Build.0 = Release|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|x64.ActiveCfg = Release|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|x64.Build.0 = Release|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|x86.ActiveCfg = Release|Any CPU - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|x86.Build.0 = Release|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x64.ActiveCfg = Debug|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x64.Build.0 = Debug|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x86.ActiveCfg = Debug|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x86.Build.0 = Debug|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|Any CPU.Build.0 = Release|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.ActiveCfg = Release|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.Build.0 = Release|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x86.ActiveCfg = Release|Any CPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x86.Build.0 = Release|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|x64.ActiveCfg = Debug|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|x64.Build.0 = Debug|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|x86.ActiveCfg = Debug|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|x86.Build.0 = Debug|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Release|Any CPU.Build.0 = Release|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Release|x64.ActiveCfg = Release|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Release|x64.Build.0 = Release|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Release|x86.ActiveCfg = Release|Any CPU - {FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Release|x86.Build.0 = Release|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Debug|x64.ActiveCfg = Debug|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Debug|x64.Build.0 = Debug|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Debug|x86.ActiveCfg = Debug|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Debug|x86.Build.0 = Debug|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Release|Any CPU.Build.0 = Release|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Release|x64.ActiveCfg = Release|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Release|x64.Build.0 = Release|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Release|x86.ActiveCfg = Release|Any CPU - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}.Release|x86.Build.0 = Release|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Debug|x64.ActiveCfg = Debug|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Debug|x64.Build.0 = Debug|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Debug|x86.ActiveCfg = Debug|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Debug|x86.Build.0 = Debug|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|Any CPU.Build.0 = Release|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|Any CPU.Deploy.0 = Release|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|x64.ActiveCfg = Release|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|x64.Build.0 = Release|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|x86.ActiveCfg = Release|Any CPU - {A3DCCBCA-ACC1-421D-B16E-210896234C26}.Release|x86.Build.0 = Release|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Debug|x64.ActiveCfg = Debug|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Debug|x64.Build.0 = Debug|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Debug|x86.ActiveCfg = Debug|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Debug|x86.Build.0 = Debug|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Release|Any CPU.Build.0 = Release|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Release|x64.ActiveCfg = Release|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Release|x64.Build.0 = Release|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Release|x86.ActiveCfg = Release|Any CPU - {F35190AA-4758-4D9E-A193-E3BDF6AD3567}.Release|x86.Build.0 = Release|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Debug|x64.ActiveCfg = Debug|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Debug|x64.Build.0 = Debug|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Debug|x86.ActiveCfg = Debug|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Debug|x86.Build.0 = Debug|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Release|Any CPU.Build.0 = Release|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Release|x64.ActiveCfg = Release|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Release|x64.Build.0 = Release|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Release|x86.ActiveCfg = Release|Any CPU - {230AE83F-E92E-4E69-8355-426B305DA9C0}.Release|x86.Build.0 = Release|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Debug|x64.ActiveCfg = Debug|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Debug|x64.Build.0 = Debug|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Debug|x86.ActiveCfg = Debug|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Debug|x86.Build.0 = Debug|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Release|Any CPU.Build.0 = Release|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Release|x64.ActiveCfg = Release|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Release|x64.Build.0 = Release|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Release|x86.ActiveCfg = Release|Any CPU - {03FFA443-5F50-48D5-8869-F3DF316803AA}.Release|x86.Build.0 = Release|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Debug|x64.ActiveCfg = Debug|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Debug|x64.Build.0 = Debug|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Debug|x86.ActiveCfg = Debug|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Debug|x86.Build.0 = Debug|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|Any CPU.Build.0 = Release|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x64.ActiveCfg = Release|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x64.Build.0 = Release|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x86.ActiveCfg = Release|Any CPU - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x86.Build.0 = Release|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Debug|x64.ActiveCfg = Debug|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Debug|x64.Build.0 = Debug|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Debug|x86.ActiveCfg = Debug|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Debug|x86.Build.0 = Debug|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Release|Any CPU.Build.0 = Release|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Release|x64.ActiveCfg = Release|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Release|x64.Build.0 = Release|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Release|x86.ActiveCfg = Release|Any CPU - {59BD9891-3837-438A-958D-ADC7F91F6F7E}.Release|x86.Build.0 = Release|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x64.ActiveCfg = Debug|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x64.Build.0 = Debug|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x86.ActiveCfg = Debug|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x86.Build.0 = Debug|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Release|Any CPU.Build.0 = Release|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Release|x64.ActiveCfg = Release|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Release|x64.Build.0 = Release|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Release|x86.ActiveCfg = Release|Any CPU - {9B130CC5-14FB-41FF-B310-0A95B6894C37}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {049490F0-ECD2-4148-9B39-2135EC346EBE} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {403B57F2-1856-4FC7-8A24-36AB346B763E} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {1EE20B48-82FB-48A2-8086-675D6DDAB4F0} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {FDED22C8-B637-42E8-824A-63B5B6E05A3A} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {0B9DE348-9361-4940-ADB6-F5953BFFCCEC} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {A3DCCBCA-ACC1-421D-B16E-210896234C26} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {F35190AA-4758-4D9E-A193-E3BDF6AD3567} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {230AE83F-E92E-4E69-8355-426B305DA9C0} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {03FFA443-5F50-48D5-8869-F3DF316803AA} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {59BD9891-3837-438A-958D-ADC7F91F6F7E} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - {9B130CC5-14FB-41FF-B310-0A95B6894C37} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F26ACB50-3F6C-4907-B0C9-1ADACC1D0DED} - EndGlobalSection -EndGlobal diff --git a/src/modules/launcher/Wox.sln.DotSettings b/src/modules/launcher/Wox.sln.DotSettings deleted file mode 100644 index 09b4804417..0000000000 --- a/src/modules/launcher/Wox.sln.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - SDK \ No newline at end of file diff --git a/src/modules/launcher/Wox/App.xaml.cs b/src/modules/launcher/Wox/App.xaml.cs index f6dcc8ee2f..01e35d2d67 100644 --- a/src/modules/launcher/Wox/App.xaml.cs +++ b/src/modules/launcher/Wox/App.xaml.cs @@ -25,7 +25,6 @@ namespace Wox private Settings _settings; private MainViewModel _mainVM; private SettingWindowViewModel _settingsVM; - private readonly Updater _updater = new Updater(Wox.Properties.Settings.Default.GithubRepo); private readonly Alphabet _alphabet = new Alphabet(); private StringMatcher _stringMatcher; @@ -53,7 +52,7 @@ namespace Wox ImageLoader.Initialize(); - _settingsVM = new SettingWindowViewModel(_updater); + _settingsVM = new SettingWindowViewModel(); _settings = _settingsVM.Settings; _alphabet.Initialize(_settings); @@ -83,40 +82,11 @@ namespace Wox RegisterExitEvents(); - AutoStartup(); - AutoUpdates(); - _mainVM.MainWindowVisibility = _settings.HideOnStartup ? Visibility.Hidden : Visibility.Visible; Log.Info("|App.OnStartup|End Wox startup ---------------------------------------------------- "); }); } - - private void AutoStartup() - { - } - - //[Conditional("RELEASE")] - private void AutoUpdates() - { - Task.Run(async () => - { - if (_settings.AutoUpdates) - { - // check udpate every 5 hours - var timer = new Timer(1000 * 60 * 60 * 5); - timer.Elapsed += async (s, e) => - { - await _updater.UpdateApp(); - }; - timer.Start(); - - // check updates on startup - await _updater.UpdateApp(); - } - }); - } - private void RegisterExitEvents() { AppDomain.CurrentDomain.ProcessExit += (s, e) => Dispose(); diff --git a/src/modules/launcher/Wox/FodyWeavers.xsd b/src/modules/launcher/Wox/FodyWeavers.xsd index 2f1b8aae7a..221aeb8a54 100644 --- a/src/modules/launcher/Wox/FodyWeavers.xsd +++ b/src/modules/launcher/Wox/FodyWeavers.xsd @@ -31,6 +31,16 @@ Used to control if equality checks should use the static Equals method resolved from the base class. + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + diff --git a/src/modules/launcher/Wox/Images/app.png b/src/modules/launcher/Wox/Images/app.png index 8c9ca7971a..8311fd5d41 100644 Binary files a/src/modules/launcher/Wox/Images/app.png and b/src/modules/launcher/Wox/Images/app.png differ diff --git a/src/modules/launcher/Wox/Images/app_error.png b/src/modules/launcher/Wox/Images/app_error.png index 5106d6e8a9..ca781a9c40 100644 Binary files a/src/modules/launcher/Wox/Images/app_error.png and b/src/modules/launcher/Wox/Images/app_error.png differ diff --git a/src/modules/launcher/Wox/Properties/Resources.Designer.cs b/src/modules/launcher/Wox/Properties/Resources.Designer.cs index 26a9ddff90..87f02e8ec4 100644 --- a/src/modules/launcher/Wox/Properties/Resources.Designer.cs +++ b/src/modules/launcher/Wox/Properties/Resources.Designer.cs @@ -63,9 +63,10 @@ namespace Wox.Properties { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon app { + internal static System.Drawing.Icon placeholderLauncher + { get { - object obj = ResourceManager.GetObject("app", resourceCulture); + object obj = ResourceManager.GetObject("placeholderLauncher", resourceCulture); return ((System.Drawing.Icon)(obj)); } } diff --git a/src/modules/launcher/Wox/Properties/Resources.resx b/src/modules/launcher/Wox/Properties/Resources.resx index 3ae43d89b0..9709239a7e 100644 --- a/src/modules/launcher/Wox/Properties/Resources.resx +++ b/src/modules/launcher/Wox/Properties/Resources.resx @@ -112,13 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\app.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\placeholderLauncher.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/src/modules/launcher/Wox/Properties/Settings.Designer.cs b/src/modules/launcher/Wox/Properties/Settings.Designer.cs index be9020f6e6..a394e85313 100644 --- a/src/modules/launcher/Wox/Properties/Settings.Designer.cs +++ b/src/modules/launcher/Wox/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ namespace Wox.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/Wox-launcher/Wox")] + [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/Microsoft/PowerToys")] public string GithubRepo { get { return ((string)(this["GithubRepo"])); diff --git a/src/modules/launcher/Wox/Properties/Settings.settings b/src/modules/launcher/Wox/Properties/Settings.settings index 1fc52390be..60156e31b4 100644 --- a/src/modules/launcher/Wox/Properties/Settings.settings +++ b/src/modules/launcher/Wox/Properties/Settings.settings @@ -1,9 +1,9 @@  - + - https://github.com/Wox-launcher/Wox + https://github.com/Microsoft/PowerToys \ No newline at end of file diff --git a/src/modules/launcher/Wox/PublicAPIInstance.cs b/src/modules/launcher/Wox/PublicAPIInstance.cs index 21057a78e9..a1b2e5119e 100644 --- a/src/modules/launcher/Wox/PublicAPIInstance.cs +++ b/src/modules/launcher/Wox/PublicAPIInstance.cs @@ -4,8 +4,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; using System.Windows; -using Squirrel; -using Wox.Core; + using Wox.Core.Plugin; using Wox.Core.Resource; using Wox.Helper; @@ -63,12 +62,12 @@ namespace Wox // which will cause ungraceful exit SaveAppAllSettings(); - UpdateManager.RestartApp(); + Squirrel.UpdateManager.RestartApp(); } public void CheckForNewUpdate() { - _settingsVM.UpdateApp(); + //_settingsVM.UpdateApp(); } public void SaveAppAllSettings() @@ -101,7 +100,7 @@ namespace Wox { Application.Current.Dispatcher.Invoke(() => { - var msg = useMainWindowAsOwner ? new Msg {Owner = Application.Current.MainWindow} : new Msg(); + var msg = useMainWindowAsOwner ? new Msg { Owner = Application.Current.MainWindow } : new Msg(); msg.Show(title, subTitle, iconPath); }); } diff --git a/src/modules/launcher/Wox/Resources/app.ico b/src/modules/launcher/Wox/Resources/app.ico deleted file mode 100644 index 38c401c8ca..0000000000 Binary files a/src/modules/launcher/Wox/Resources/app.ico and /dev/null differ diff --git a/src/modules/launcher/Wox/Resources/placeholderLauncher.ico b/src/modules/launcher/Wox/Resources/placeholderLauncher.ico new file mode 100644 index 0000000000..8aa98e515d Binary files /dev/null and b/src/modules/launcher/Wox/Resources/placeholderLauncher.ico differ diff --git a/src/modules/launcher/Wox/ResultListBox.xaml.cs b/src/modules/launcher/Wox/ResultListBox.xaml.cs index 6b46644900..1f8b1a1513 100644 --- a/src/modules/launcher/Wox/ResultListBox.xaml.cs +++ b/src/modules/launcher/Wox/ResultListBox.xaml.cs @@ -6,7 +6,6 @@ namespace Wox { public partial class ResultListBox { - protected object _lock = new object(); private Point _lastpos; private ListBoxItem curItem = null; public ResultListBox() @@ -24,34 +23,25 @@ namespace Wox private void OnMouseEnter(object sender, MouseEventArgs e) { - lock(_lock) - { - curItem = (ListBoxItem)sender; - var p = e.GetPosition((IInputElement)sender); - _lastpos = p; - } + curItem = (ListBoxItem)sender; + var p = e.GetPosition((IInputElement)sender); + _lastpos = p; } private void OnMouseMove(object sender, MouseEventArgs e) { - lock(_lock) + var p = e.GetPosition((IInputElement)sender); + if (_lastpos != p) { - var p = e.GetPosition((IInputElement)sender); - if (_lastpos != p) - { - ((ListBoxItem)sender).IsSelected = true; - } + ((ListBoxItem)sender).IsSelected = true; } } private void ListBox_PreviewMouseDown(object sender, MouseButtonEventArgs e) { - lock(_lock) + if (curItem != null) { - if (curItem != null) - { - curItem.IsSelected = true; - } + curItem.IsSelected = true; } } } diff --git a/src/modules/launcher/Wox/UpdateManager.cs b/src/modules/launcher/Wox/UpdateManager.cs new file mode 100644 index 0000000000..0dde3b8b2c --- /dev/null +++ b/src/modules/launcher/Wox/UpdateManager.cs @@ -0,0 +1,65 @@ +// code block is from +// unblocking https://github.com/Squirrel/Squirrel.Windows/blob/master/src/Squirrel/UpdateManager.cs +// https://github.com/Squirrel/Squirrel.Windows/blob/develop/COPYING +// license is MIT + +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; +using System.Threading; + +namespace Squirrel +{ + public sealed partial class UpdateManager + { + public static void RestartApp(string exeToStart = null, string arguments = null) + { + // NB: Here's how this method works: + // + // 1. We're going to pass the *name* of our EXE and the params to + // Update.exe + // 2. Update.exe is going to grab our PID (via getting its parent), + // then wait for us to exit. + // 3. We exit cleanly, dropping any single-instance mutexes or + // whatever. + // 4. Update.exe unblocks, then we launch the app again, possibly + // launching a different version than we started with (this is why + // we take the app's *name* rather than a full path) + + exeToStart = exeToStart ?? Path.GetFileName(Assembly.GetEntryAssembly().Location); + var argsArg = arguments != null ? + string.Format("-a \"{0}\"", arguments) : ""; + + Process.Start(getUpdateExe(), string.Format("--processStartAndWait {0} {1}", exeToStart, argsArg)); + + // NB: We have to give update.exe some time to grab our PID, but + // we can't use WaitForInputIdle because we probably don't have + // whatever WaitForInputIdle considers a message loop. + Thread.Sleep(500); + Environment.Exit(0); + } + + static string getUpdateExe() + { + var assembly = Assembly.GetEntryAssembly(); + + // Are we update.exe? + if (assembly != null && + Path.GetFileName(assembly.Location).Equals("update.exe", StringComparison.OrdinalIgnoreCase) && + assembly.Location.IndexOf("app-", StringComparison.OrdinalIgnoreCase) == -1 && + assembly.Location.IndexOf("SquirrelTemp", StringComparison.OrdinalIgnoreCase) == -1) + { + return Path.GetFullPath(assembly.Location); + } + + assembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly(); + + var updateDotExe = Path.Combine(Path.GetDirectoryName(assembly.Location), "..\\Update.exe"); + var target = new FileInfo(updateDotExe); + + if (!target.Exists) throw new Exception("Update.exe not found, not a Squirrel-installed app?"); + return target.FullName; + } + } +} diff --git a/src/modules/launcher/Wox/ViewModel/SettingWindowViewModel.cs b/src/modules/launcher/Wox/ViewModel/SettingWindowViewModel.cs index f9160df9f0..f3b9e14b8e 100644 --- a/src/modules/launcher/Wox/ViewModel/SettingWindowViewModel.cs +++ b/src/modules/launcher/Wox/ViewModel/SettingWindowViewModel.cs @@ -21,12 +21,10 @@ namespace Wox.ViewModel { public class SettingWindowViewModel : BaseModel { - private readonly Updater _updater; private readonly WoxJsonStorage _storage; - public SettingWindowViewModel(Updater updater) + public SettingWindowViewModel() { - _updater = updater; _storage = new WoxJsonStorage(); Settings = _storage.Load(); Settings.PropertyChanged += (s, e) => @@ -42,11 +40,6 @@ namespace Wox.ViewModel public Settings Settings { get; set; } - public async void UpdateApp() - { - await _updater.UpdateApp(false); - } - public void Save() { _storage.Save(); @@ -122,50 +115,6 @@ namespace Wox.ViewModel public List Languages => _translater.LoadAvailableLanguages(); public IEnumerable MaxResultsRange => Enumerable.Range(2, 16); - public string TestProxy() - { - var proxyServer = Settings.Proxy.Server; - var proxyUserName = Settings.Proxy.UserName; - if (string.IsNullOrEmpty(proxyServer)) - { - return InternationalizationManager.Instance.GetTranslation("serverCantBeEmpty"); - } - if (Settings.Proxy.Port <= 0) - { - return InternationalizationManager.Instance.GetTranslation("portCantBeEmpty"); - } - - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(_updater.GitHubRepository); - - if (string.IsNullOrEmpty(proxyUserName) || string.IsNullOrEmpty(Settings.Proxy.Password)) - { - request.Proxy = new WebProxy(proxyServer, Settings.Proxy.Port); - } - else - { - request.Proxy = new WebProxy(proxyServer, Settings.Proxy.Port) - { - Credentials = new NetworkCredential(proxyUserName, Settings.Proxy.Password) - }; - } - try - { - var response = (HttpWebResponse)request.GetResponse(); - if (response.StatusCode == HttpStatusCode.OK) - { - return InternationalizationManager.Instance.GetTranslation("proxyIsCorrect"); - } - else - { - return InternationalizationManager.Instance.GetTranslation("proxyConnectFailed"); - } - } - catch - { - return InternationalizationManager.Instance.GetTranslation("proxyConnectFailed"); - } - } - #endregion #region plugin @@ -281,11 +230,6 @@ namespace Wox.ViewModel Title = "Install plugins from: ", SubTitle = Plugin }, - new Result - { - Title = $"Open Source: {_updater.GitHubRepository}", - SubTitle = "Please star it!" - } }; var vm = new ResultsViewModel(); vm.AddResults(results, "PREVIEW"); @@ -392,9 +336,6 @@ namespace Wox.ViewModel #endregion #region about - - public string Github => _updater.GitHubRepository; - public string ReleaseNotes => _updater.GitHubRepository + @"/releases/latest"; public static string Version => Constant.Version; public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes); #endregion diff --git a/src/modules/launcher/Wox/Wox.csproj b/src/modules/launcher/Wox/Wox.csproj index 919ef223a1..3d32410fd2 100644 --- a/src/modules/launcher/Wox/Wox.csproj +++ b/src/modules/launcher/Wox/Wox.csproj @@ -6,10 +6,11 @@ true true Wox.App - Resources\app.ico + Resources\placeholderLauncher.ico app.manifest false false + PowerLauncher x64 @@ -60,17 +61,18 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + + @@ -181,11 +183,8 @@ + - - - - \ No newline at end of file diff --git a/src/modules/launcher/Wox/app.png b/src/modules/launcher/Wox/app.png index 8c9ca7971a..ae307b7c77 100644 Binary files a/src/modules/launcher/Wox/app.png and b/src/modules/launcher/Wox/app.png differ diff --git a/src/modules/launcher/appveyor.yml b/src/modules/launcher/appveyor.yml deleted file mode 100644 index 20efd8dcc0..0000000000 --- a/src/modules/launcher/appveyor.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: 1.3.{build} -image: Visual Studio 2017 -configuration: Release -platform: Any CPU -assembly_info: - patch: true - file: AssemblyInfo.* - assembly_version: '{version}' - assembly_file_version: '{version}' - assembly_informational_version: '{version}' -before_build: -- ps: nuget restore -build: - project: Wox.sln -after_test: -artifacts: -- path: 'Output\Packages\Wox-*.zip' - name: zipped_binary -- path: 'Output\Packages\Wox.Plugin.*.nupkg' - name: nuget_package -- path: 'Output\Packages\Wox-*.*' - name: installer -- path: 'Output\Packages\RELEASES' - name: installer -deploy: - provider: NuGet - api_key: - secure: yybUOFgBuGVpbmOVZxsurC8OpkClzt9dR+/54WpMWcq6b6oyMatciaelRPnXsjRn - artifact: nuget_package - on: - branch: api \ No newline at end of file diff --git a/src/modules/launcher/azure-pipelines.yml b/src/modules/launcher/azure-pipelines.yml deleted file mode 100644 index 5307ec0067..0000000000 --- a/src/modules/launcher/azure-pipelines.yml +++ /dev/null @@ -1,34 +0,0 @@ -# .NET Desktop -# Build and run tests for .NET Desktop or Windows classic desktop solutions. -# Add steps that publish symbols, save build artifacts, and more: -# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net - -trigger: -- master -- dev - -pool: - vmImage: 'vs2017-win2016' #'due to windows SDK dependency for building UWP project' - -variables: - solution: '**/*.sln' - buildPlatform: 'Any CPU' - buildConfiguration: 'Release' - -steps: -- task: NuGetToolInstaller@1 - -- task: NuGetCommand@2 - inputs: - restoreSolution: '$(solution)' - -- task: VSBuild@1 - inputs: - solution: '$(solution)' - platform: '$(buildPlatform)' - configuration: '$(buildConfiguration)' - -- task: VSTest@2 - inputs: - platform: '$(buildPlatform)' - configuration: '$(buildConfiguration)'