Merge branch 'dev' into add_enable_portablemode_setting

Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs

@@ -194,6 +194,7 @@ namespace Wox.Plugin.Folder
             {
                 case ".exe":
                 case ".bat":
+                case ".msi":
                     return true;
 
                 default:

README.md

@@ -83,6 +83,6 @@ Install Visual Studio 2017/2019
 
 Documentation
 -------------
-- [Wiki](https://github.com/Wox-launcher/Wox/wiki)
+- [Wiki](https://github.com/jjw24/Wox/wiki)
 - Outdated doc: [WoX doc](http://doc.wox.one).
-- Just ask questions in [issues](https://github.com/Wox-launcher/Wox/issues) for now.
+- Just ask questions in [issues](https://github.com/jjw24/Wox/issues) for now.

Scripts/post_build.ps1

@@ -1,13 +1,14 @@
 param(
     [string]$config = "Release", 
-    [string]$solution
+    [string]$solution,
+	[string]$targetpath
 )
 Write-Host "Config: $config"
 
 function Build-Version {
-    if ([string]::IsNullOrEmpty($env:APPVEYOR_BUILD_VERSION)) {
+	if ([string]::IsNullOrEmpty($env:APPVEYOR_BUILD_VERSION)) {
-        $v = "1.2.0"
+		$v = (Get-Command ${TargetPath}).FileVersionInfo.FileVersion
-    } else {
+	} else {
         $v = $env:APPVEYOR_BUILD_VERSION
     }
 
@@ -38,7 +39,8 @@ function Copy-Resources ($path, $config) {
     Copy-Item -Recurse -Force $project\Images\* $target\Images\
     Copy-Item -Recurse -Force $path\Plugins\HelloWorldPython $target\Plugins\HelloWorldPython
     Copy-Item -Recurse -Force $path\JsonRPC $target\JsonRPC
-    Copy-Item -Force $path\packages\squirrel*\tools\Squirrel.exe $output\Update.exe
+    # making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
+    Copy-Item -Force $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe $output\Update.exe
 }
 
 function Delete-Unused ($path, $config) {
@@ -72,7 +74,7 @@ function Zip-Release ($path, $version, $output) {
 
     $input = "$path\Output\Release"
     Write-Host "Input path:  $input"
-    $file = "$output\Wox-$version.zip"
+    $file = "$output\Wox-JJW24-$version.zip"
     Write-Host "Filename: $file"
 
     [Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem")
@@ -91,21 +93,21 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
     Write-Host "Input path:  $input"
     Nuget pack $spec -Version $version -Properties Configuration=Release -BasePath $input -OutputDirectory  $output
 
-    $nupkg = "$output\Wox.$version.nupkg"
+    $nupkg = "$output\Wox-JJW24.$version.nupkg"
     Write-Host "nupkg path: $nupkg"
     $icon = "$path\Wox\Resources\app.ico"
     Write-Host "icon: $icon"
     # Squirrel.com: https://github.com/Squirrel/Squirrel.Windows/issues/369
-    New-Alias Squirrel $path\packages\squirrel*\tools\Squirrel.exe -Force
+    New-Alias Squirrel $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe -Force
     # why we need Write-Output: https://github.com/Squirrel/Squirrel.Windows/issues/489#issuecomment-156039327
-    # directory of releaseDir in fucking squirrel can't be same as directory ($nupkg) in releasify
+    # directory of releaseDir in squirrel can't be same as directory ($nupkg) in releasify
     $temp = "$output\Temp"
 
     Squirrel --releasify $nupkg --releaseDir $temp --setupIcon $icon --no-msi | Write-Output
     Move-Item $temp\* $output -Force
     Remove-Item $temp
     
-    $file = "$output\Wox-$version.exe"
+    $file = "$output\Wox-JJW24-$version.exe"
     Write-Host "Filename: $file"
 
     Move-Item "$output\Setup.exe" $file -Force
@@ -123,7 +125,8 @@ function Main {
         Delete-Unused $p $config
         $o = "$p\Output\Packages"
         Validate-Directory $o
-        New-Alias Nuget $p\packages\NuGet.CommandLine.*\tools\NuGet.exe -Force
+        # making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
+        New-Alias Nuget $env:USERPROFILE\.nuget\packages\NuGet.CommandLine\3.4.3\tools\NuGet.exe -Force
         Pack-Squirrel-Installer $p $v $o
     
         $isInCI = $env:APPVEYOR

Scripts/wox.nuspec

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>Wox</id>
+    <id>Wox-JJW24</id>
     <title>Wox</title>
     <version>$version$</version>
-    <authors>happlebao</authors>
+    <authors>happlebao, Jeremy Wu</authors>
-    <projectUrl>https://github.com/Wox-launcher/Wox</projectUrl>
+    <projectUrl>https://github.com/jjw24/Wox</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/Wox-launcher/Wox/master/Wox/Images/app.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/jjw24/Wox/master/Wox/Images/app.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Wox - a launcher for windows</description>
   </metadata>

Scripts/wox.plugin.nuspec

@@ -3,9 +3,9 @@
   <metadata>
     <id>Wox.Plugin</id>
     <version>$version$</version>
-    <authors>qianlifeng</authors>
+    <authors>qianlifeng, Jeremy Wu</authors>
-    <licenseUrl>https://github.com/Wox-launcher/Wox/blob/master/LICENSE</licenseUrl>
+    <licenseUrl>https://github.com/jjw24/Wox/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/Wox-launcher/Wox</projectUrl>
+    <projectUrl>https://github.com/jjw24/Wox</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Reference this library if you want to develop a wox plugin</description>
     <tags>wox</tags>

SolutionAssemblyInfo.cs

@@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
 #if DEBUG
 
 [assembly: AssemblyConfiguration("Debug")]
-[assembly: AssemblyDescription("Debug build, https://github.com/Wox-launcher/Wox")]
+[assembly: AssemblyDescription("Debug build, https://github.com/jjw24/Wox")]
 #else
 [assembly: AssemblyConfiguration("Release")]
-[assembly: AssemblyDescription("Release build, https://github.com/Wox-launcher/Wox")]
+[assembly: AssemblyDescription("Release build, https://github.com/jjw24/Wox")]
 #endif
 
 [assembly: AssemblyCompany("Wox")]
@@ -17,5 +17,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: AssemblyVersion("1.2.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0")]
 [assembly: AssemblyInformationalVersion("1.2.0")]

Wox.Infrastructure/Constant.cs

@@ -16,7 +16,7 @@ namespace Wox.Infrastructure
         public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
         
         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/jjw24/Wox/issues/new";
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
 
         public static readonly int ThumbnailSize = 64;

Wox/App.config

@@ -12,7 +12,7 @@
   <applicationSettings>
     <Wox.Properties.Settings>
       <setting name="GithubRepo" serializeAs="String">
-        <value>https://github.com/Wox-launcher/Wox</value>
+        <value>https://github.com/jjw24/Wox</value>
       </setting>
     </Wox.Properties.Settings>
   </applicationSettings>

Wox/Languages/en.xaml

@@ -93,7 +93,7 @@
     <system:String x:Key="checkUpdatesFailed">Check updates failed, please check your connection and proxy settings to api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
         Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com, 
-        or go to https://github.com/Wox-launcher/Wox/releases to download updates manually.
+        or go to https://github.com/jjw24/Wox/releases to download updates manually.
     </system:String>
     <system:String x:Key="releaseNotes">Release Notes:</system:String>
 

Wox/Languages/fr.xaml

@@ -86,7 +86,7 @@
     <system:String x:Key="checkUpdates">Vérifier les mises à jour</system:String>
     <system:String x:Key="newVersionTips">Nouvelle version {0} disponible, veuillez redémarrer Wox</system:String>
     <system:String x:Key="checkUpdatesFailed">Échec de la vérification de la mise à jour, vérifiez votre connexion et vos paramètres de configuration proxy pour pouvoir acceder à api.github.com.</system:String>
-    <system:String x:Key="downloadUpdatesFailed">Échec du téléchargement de la mise à jour, vérifiez votre connexion et vos paramètres de configuration proxy pour pouvoir acceder à github-cloud.s3.amazonaws.com, ou téléchargez manuelement la mise à jour sur https://github.com/Wox-launcher/Wox/releases.</system:String>
+    <system:String x:Key="downloadUpdatesFailed">Échec du téléchargement de la mise à jour, vérifiez votre connexion et vos paramètres de configuration proxy pour pouvoir acceder à github-cloud.s3.amazonaws.com, ou téléchargez manuelement la mise à jour sur https://github.com/jjw24/Wox/releases.</system:String>
     <system:String x:Key="releaseNotes">Notes de changement :</system:String>
 
     <!--Action Keyword Setting Dialog-->

Wox/Languages/it.xaml

@@ -88,7 +88,7 @@
     <system:String x:Key="checkUpdatesFailed">Ricerca aggiornamenti fallita, per favore controlla la tua connessione e le eventuali impostazioni proxy per api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
 		Download degli aggiornamenti fallito, per favore controlla la tua connessione ed eventuali impostazioni proxy per github-cloud.s3.amazonaws.com, 
-		oppure vai su https://github.com/Wox-launcher/Wox/releases per scaricare gli aggiornamenti manualmente.
+		oppure vai su https://github.com/jjw24/Wox/releases per scaricare gli aggiornamenti manualmente.
     </system:String>
     <system:String x:Key="releaseNotes">Note di rilascio:</system:String>
 

Wox/Languages/ja.xaml

@@ -91,7 +91,7 @@
     <system:String x:Key="checkUpdatesFailed">アップデートの確認に失敗しました、api.github.com への接続とプロキシ設定を確認してください。</system:String>
     <system:String x:Key="downloadUpdatesFailed">
         更新のダウンロードに失敗しました、github-cloud.s3.amazonaws.com への接続とプロキシ設定を確認するか、
-        https://github.com/Wox-launcher/Wox/releases から手動でアップデートをダウンロードしてください。
+        https://github.com/jjw24/Wox/releases から手動でアップデートをダウンロードしてください。
     </system:String>
     <system:String x:Key="releaseNotes">リリースノート:</system:String>
 

Wox/Languages/nb-NO.xaml

@@ -88,7 +88,7 @@
     <system:String x:Key="checkUpdatesFailed">Oppdateringssjekk feilet, vennligst sjekk tilkoblingen og proxy-innstillene for api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
         Nedlastning av oppdateringer feilet, vennligst sjekk tilkoblingen og proxy-innstillene for github-cloud.s3.amazonaws.com, 
-        eller gå til https://github.com/Wox-launcher/Wox/releases for å laste ned oppdateringer manuelt.
+        eller gå til https://github.com/jjw24/Wox/releases for å laste ned oppdateringer manuelt.
     </system:String>
     <system:String x:Key="releaseNotes">Versjonsmerknader:</system:String>
 

Wox/Languages/pt-br.xaml

@@ -88,7 +88,7 @@
     <system:String x:Key="checkUpdatesFailed">Falha ao procurar atualizações, confira sua conexão e configuração de proxy para api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
         Falha ao baixar atualizações, confira sua conexão e configuração de proxy para github-cloud.s3.amazonaws.com,
-        ou acesse https://github.com/Wox-launcher/Wox/releases para baixar manualmente.
+        ou acesse https://github.com/jjw24/Wox/releases para baixar manualmente.
     </system:String>
     <system:String x:Key="releaseNotes">Notas de Versão:</system:String>
 

Wox/Languages/sk.xaml

@@ -89,7 +89,7 @@
     <system:String x:Key="checkUpdatesFailed">Kontrola aktualizácií zlyhala, prosím, skontrolujte pripojenie na internet a nastavenie proxy k api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
         Sťahovanie aktualizácií zlyhalo, skontrolujte pripojenie na internet a nastavenie proxy k github-cloud.s3.amazonaws.com, 
-        alebo prejdite na https://github.com/Wox-launcher/Wox/releases pre manuálne stiahnutie aktualizácií.
+        alebo prejdite na https://github.com/jjw24/Wox/releases pre manuálne stiahnutie aktualizácií.
     </system:String>
     <system:String x:Key="releaseNotes">Poznámky k vydaniu:</system:String>
 

Wox/Languages/sr.xaml

@@ -88,7 +88,7 @@
     <system:String x:Key="checkUpdatesFailed">Neuspešna provera ažuriranja, molim Vas proverite vašu vezu i podešavanja za proksi prema api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
         Neuspešno preuzimanje ažuriranja, molim Vas proverite vašu vezu i podešavanja za proksi prema github-cloud.s3.amazonaws.com, 
-        ili posetite https://github.com/Wox-launcher/Wox/releases da preuzmete ažuriranja ručno.
+        ili posetite https://github.com/jjw24/Wox/releases da preuzmete ažuriranja ručno.
     </system:String>
     <system:String x:Key="releaseNotes">U novoj verziji:</system:String>
 

Wox/Languages/tr.xaml

@@ -92,7 +92,7 @@
     <system:String x:Key="checkUpdatesFailed">Güncelleme kontrolü başarısız oldu. Lütfen bağlantınız ve vekil sunucu ayarlarınızın api.github.com adresine ulaşabilir olduğunu kontrol edin.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
         Güncellemenin yüklenmesi başarısız oldu. Lütfen bağlantınız ve vekil sunucu ayarlarınızın github-cloud.s3.amazonaws.com
-        adresine ulaşabilir olduğunu kontrol edin ya da https://github.com/Wox-launcher/Wox/releases adresinden güncellemeyi elle indirin.
+        adresine ulaşabilir olduğunu kontrol edin ya da https://github.com/jjw24/Wox/releases adresinden güncellemeyi elle indirin.
     </system:String>
     <system:String x:Key="releaseNotes">Sürüm Notları:</system:String>
 

Wox/Properties/Settings.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -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/jjw24/Wox")]
         public string GithubRepo {
             get {
                 return ((string)(this["GithubRepo"]));

Wox/Properties/Settings.settings

@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="GithubRepo" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://github.com/Wox-launcher/Wox</Value>
+      <Value Profile="(Default)">https://github.com/jjw24/Wox</Value>
     </Setting>
   </Settings>
 </SettingsFile>

Wox/SettingWindow.xaml

@@ -387,7 +387,7 @@
                         <Run Text="{Binding Github, Mode=OneWay}" />
                     </Hyperlink>
                 </TextBlock>
-                <TextBlock Grid.Row="2" Grid.Column="0" Text="{DynamicResource version}" />
+                <TextBlock Grid.Row="2" Grid.Column="0" Text="JJW24 Version" />
                 <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Version}" />
                 <TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource releaseNotes}" />
                 <TextBlock Grid.Row="3" Grid.Column="1">

Wox/Wox.csproj

@@ -441,7 +441,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>powershell.exe -NoProfile -ExecutionPolicy Bypass -File $(SolutionDir)Scripts\post_build.ps1 $(ConfigurationName) $(SolutionDir)</PostBuildEvent>
+    <PostBuildEvent>powershell.exe -NoProfile -ExecutionPolicy Bypass -File $(SolutionDir)Scripts\post_build.ps1 $(ConfigurationName) $(SolutionDir) $(TargetPath)</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>taskkill /f /fi "IMAGENAME eq Wox.exe"</PreBuildEvent>