From d80934c235ff65f4dffffd300b841d6e8e701204 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 27 Mar 2020 19:13:22 +1100 Subject: [PATCH 1/3] Update post_build script's packages reference path (#173) * Update post_build script's packages reference path * Change to static version * remove inappropriate word --- Scripts/post_build.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1 index eb302a6c6..45d3f7b69 100644 --- a/Scripts/post_build.ps1 +++ b/Scripts/post_build.ps1 @@ -38,7 +38,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) { @@ -96,9 +97,9 @@ function Pack-Squirrel-Installer ($path, $version, $output) { $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 @@ -123,7 +124,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 From f90268d5bd1b544890f7b5933d8a7cc38c27ed3f Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 31 Mar 2020 23:10:27 +1100 Subject: [PATCH 2/3] Add msi extension to run as different user (#174) --- Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs b/Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs index 130fd7007..646093f92 100644 --- a/Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs +++ b/Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs @@ -194,6 +194,7 @@ namespace Wox.Plugin.Folder { case ".exe": case ".bat": + case ".msi": return true; default: From d6f1d133bec9794b1d78c02754ce240da0dbf2f9 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 31 Mar 2020 23:20:40 +1100 Subject: [PATCH 3/3] Re-point url back to this fork (#154) * JJW24 Version Do not merge * Update issue link to jjw24 * Remove check * Update to get build version locally from SolutionAssemblyInfo * update url to point to jjw24 repo --- README.md | 4 ++-- Scripts/post_build.ps1 | 15 ++++++++------- Scripts/wox.nuspec | 8 ++++---- Scripts/wox.plugin.nuspec | 6 +++--- SolutionAssemblyInfo.cs | 6 +++--- Wox.Infrastructure/Wox.cs | 2 +- Wox/App.config | 2 +- Wox/Languages/en.xaml | 2 +- Wox/Languages/fr.xaml | 2 +- Wox/Languages/it.xaml | 2 +- Wox/Languages/ja.xaml | 2 +- Wox/Languages/nb-NO.xaml | 2 +- Wox/Languages/pt-br.xaml | 2 +- Wox/Languages/sk.xaml | 2 +- Wox/Languages/sr.xaml | 2 +- Wox/Languages/tr.xaml | 2 +- Wox/Properties/Settings.Designer.cs | 4 ++-- Wox/Properties/Settings.settings | 2 +- Wox/SettingWindow.xaml | 2 +- Wox/Wox.csproj | 2 +- 20 files changed, 36 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 732dd242f..5f6a9648f 100644 --- a/README.md +++ b/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. diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1 index 45d3f7b69..5179aad6a 100644 --- a/Scripts/post_build.ps1 +++ b/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)) { - $v = "1.2.0" - } else { + if ([string]::IsNullOrEmpty($env:APPVEYOR_BUILD_VERSION)) { + $v = (Get-Command ${TargetPath}).FileVersionInfo.FileVersion + } else { $v = $env:APPVEYOR_BUILD_VERSION } @@ -73,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") @@ -92,7 +93,7 @@ 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" @@ -106,7 +107,7 @@ function Pack-Squirrel-Installer ($path, $version, $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 diff --git a/Scripts/wox.nuspec b/Scripts/wox.nuspec index 681099663..ed400f404 100644 --- a/Scripts/wox.nuspec +++ b/Scripts/wox.nuspec @@ -1,12 +1,12 @@ - Wox + Wox-JJW24 Wox $version$ - happlebao - https://github.com/Wox-launcher/Wox - https://raw.githubusercontent.com/Wox-launcher/Wox/master/Wox/Images/app.png + happlebao, Jeremy Wu + https://github.com/jjw24/Wox + https://raw.githubusercontent.com/jjw24/Wox/master/Wox/Images/app.png false Wox - a launcher for windows diff --git a/Scripts/wox.plugin.nuspec b/Scripts/wox.plugin.nuspec index d88c91af8..0cf598860 100644 --- a/Scripts/wox.plugin.nuspec +++ b/Scripts/wox.plugin.nuspec @@ -3,9 +3,9 @@ Wox.Plugin $version$ - qianlifeng - https://github.com/Wox-launcher/Wox/blob/master/LICENSE - https://github.com/Wox-launcher/Wox + qianlifeng, Jeremy Wu + https://github.com/jjw24/Wox/blob/master/LICENSE + https://github.com/jjw24/Wox false Reference this library if you want to develop a wox plugin wox diff --git a/SolutionAssemblyInfo.cs b/SolutionAssemblyInfo.cs index 17bc04fb3..ba7afad6d 100644 --- a/SolutionAssemblyInfo.cs +++ b/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")] \ No newline at end of file diff --git a/Wox.Infrastructure/Wox.cs b/Wox.Infrastructure/Wox.cs index d09e7b904..16629e4fb 100644 --- a/Wox.Infrastructure/Wox.cs +++ b/Wox.Infrastructure/Wox.cs @@ -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/jjw24/Wox/issues/new"; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; public static readonly int ThumbnailSize = 64; diff --git a/Wox/App.config b/Wox/App.config index 5f570a630..2e2e8a3bb 100644 --- a/Wox/App.config +++ b/Wox/App.config @@ -12,7 +12,7 @@ - https://github.com/Wox-launcher/Wox + https://github.com/jjw24/Wox diff --git a/Wox/Languages/en.xaml b/Wox/Languages/en.xaml index dca044dc1..4f48b1dbc 100644 --- a/Wox/Languages/en.xaml +++ b/Wox/Languages/en.xaml @@ -93,7 +93,7 @@ Check updates failed, please check your connection and proxy settings to api.github.com. 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. Release Notes: diff --git a/Wox/Languages/fr.xaml b/Wox/Languages/fr.xaml index 2f8ebc8fc..0c2f9df53 100644 --- a/Wox/Languages/fr.xaml +++ b/Wox/Languages/fr.xaml @@ -86,7 +86,7 @@ Vérifier les mises à jour Nouvelle version {0} disponible, veuillez redémarrer Wox É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. - É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. + É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. Notes de changement : diff --git a/Wox/Languages/it.xaml b/Wox/Languages/it.xaml index 7696e9dc9..07a517be0 100644 --- a/Wox/Languages/it.xaml +++ b/Wox/Languages/it.xaml @@ -88,7 +88,7 @@ Ricerca aggiornamenti fallita, per favore controlla la tua connessione e le eventuali impostazioni proxy per api.github.com. 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. Note di rilascio: diff --git a/Wox/Languages/ja.xaml b/Wox/Languages/ja.xaml index d9a203a24..107281718 100644 --- a/Wox/Languages/ja.xaml +++ b/Wox/Languages/ja.xaml @@ -91,7 +91,7 @@ アップデートの確認に失敗しました、api.github.com への接続とプロキシ設定を確認してください。 更新のダウンロードに失敗しました、github-cloud.s3.amazonaws.com への接続とプロキシ設定を確認するか、 - https://github.com/Wox-launcher/Wox/releases から手動でアップデートをダウンロードしてください。 + https://github.com/jjw24/Wox/releases から手動でアップデートをダウンロードしてください。 リリースノート: diff --git a/Wox/Languages/nb-NO.xaml b/Wox/Languages/nb-NO.xaml index c7f294d93..f436ace51 100644 --- a/Wox/Languages/nb-NO.xaml +++ b/Wox/Languages/nb-NO.xaml @@ -88,7 +88,7 @@ Oppdateringssjekk feilet, vennligst sjekk tilkoblingen og proxy-innstillene for api.github.com. 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. Versjonsmerknader: diff --git a/Wox/Languages/pt-br.xaml b/Wox/Languages/pt-br.xaml index bd4e70f24..32852bda4 100644 --- a/Wox/Languages/pt-br.xaml +++ b/Wox/Languages/pt-br.xaml @@ -88,7 +88,7 @@ Falha ao procurar atualizações, confira sua conexão e configuração de proxy para api.github.com. 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. Notas de Versão: diff --git a/Wox/Languages/sk.xaml b/Wox/Languages/sk.xaml index 7a7f083ca..7180fc8da 100644 --- a/Wox/Languages/sk.xaml +++ b/Wox/Languages/sk.xaml @@ -89,7 +89,7 @@ Kontrola aktualizácií zlyhala, prosím, skontrolujte pripojenie na internet a nastavenie proxy k api.github.com. 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í. Poznámky k vydaniu: diff --git a/Wox/Languages/sr.xaml b/Wox/Languages/sr.xaml index dd8826e1c..96cbffc34 100644 --- a/Wox/Languages/sr.xaml +++ b/Wox/Languages/sr.xaml @@ -88,7 +88,7 @@ Neuspešna provera ažuriranja, molim Vas proverite vašu vezu i podešavanja za proksi prema api.github.com. 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. U novoj verziji: diff --git a/Wox/Languages/tr.xaml b/Wox/Languages/tr.xaml index 82445e2ac..40dba2a11 100644 --- a/Wox/Languages/tr.xaml +++ b/Wox/Languages/tr.xaml @@ -92,7 +92,7 @@ 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. 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. Sürüm Notları: diff --git a/Wox/Properties/Settings.Designer.cs b/Wox/Properties/Settings.Designer.cs index be9020f6e..afa2aca78 100644 --- a/Wox/Properties/Settings.Designer.cs +++ b/Wox/Properties/Settings.Designer.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // 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"])); diff --git a/Wox/Properties/Settings.settings b/Wox/Properties/Settings.settings index 1fc52390b..cf08a9102 100644 --- a/Wox/Properties/Settings.settings +++ b/Wox/Properties/Settings.settings @@ -3,7 +3,7 @@ - https://github.com/Wox-launcher/Wox + https://github.com/jjw24/Wox \ No newline at end of file diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml index 7fe6d8750..3c12bda6f 100644 --- a/Wox/SettingWindow.xaml +++ b/Wox/SettingWindow.xaml @@ -384,7 +384,7 @@ - + diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 56a4ed97b..ccfde096a 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -441,7 +441,7 @@ - powershell.exe -NoProfile -ExecutionPolicy Bypass -File $(SolutionDir)Scripts\post_build.ps1 $(ConfigurationName) $(SolutionDir) + powershell.exe -NoProfile -ExecutionPolicy Bypass -File $(SolutionDir)Scripts\post_build.ps1 $(ConfigurationName) $(SolutionDir) $(TargetPath) taskkill /f /fi "IMAGENAME eq Wox.exe"