Skip to content

Commit cb0a4de

Browse files
jjw24jjw24
committed
Merge branch 'dev' into add_enable_portablemode_setting
2 parents 7a6edd0 + d6f1d13 commit cb0a4de

21 files changed

+43
-39
lines changed

‎Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ private bool CanRunAsDifferentUser(string path)
194194
{
195195
case ".exe":
196196
case ".bat":
197+
case ".msi":
197198
return true;
198199

199200
default:

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ Install Visual Studio 2017/2019
8383

8484
Documentation
8585
-------------
86-
- [Wiki](https://github.com/Wox-launcher/Wox/wiki)
86+
- [Wiki](https://github.com/jjw24/Wox/wiki)
8787
- Outdated doc: [WoX doc](http://doc.wox.one).
88-
- Just ask questions in [issues](https://github.com/Wox-launcher/Wox/issues) for now.
88+
- Just ask questions in [issues](https://github.com/jjw24/Wox/issues) for now.

‎Scripts/post_build.ps1

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
param(
22
[string]$config = "Release",
3-
[string]$solution
3+
[string]$solution,
4+
[string]$targetpath
45
)
56
Write-Host "Config: $config"
67

78
function Build-Version {
8-
if ([string]::IsNullOrEmpty($env:APPVEYOR_BUILD_VERSION)) {
9-
$v = "1.2.0"
10-
} else {
9+
if ([string]::IsNullOrEmpty($env:APPVEYOR_BUILD_VERSION)) {
10+
$v = (Get-Command ${TargetPath}).FileVersionInfo.FileVersion
11+
} else {
1112
$v = $env:APPVEYOR_BUILD_VERSION
1213
}
1314

@@ -38,7 +39,8 @@ function Copy-Resources ($path, $config) {
3839
Copy-Item -Recurse -Force $project\Images\* $target\Images\
3940
Copy-Item -Recurse -Force $path\Plugins\HelloWorldPython $target\Plugins\HelloWorldPython
4041
Copy-Item -Recurse -Force $path\JsonRPC $target\JsonRPC
41-
Copy-Item -Force $path\packages\squirrel*\tools\Squirrel.exe $output\Update.exe
42+
# making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
43+
Copy-Item -Force $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe $output\Update.exe
4244
}
4345

4446
function Delete-Unused ($path, $config) {
@@ -72,7 +74,7 @@ function Zip-Release ($path, $version, $output) {
7274

7375
$input = "$path\Output\Release"
7476
Write-Host "Input path: $input"
75-
$file = "$output\Wox-$version.zip"
77+
$file = "$output\Wox-JJW24-$version.zip"
7678
Write-Host "Filename: $file"
7779

7880
[Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem")
@@ -91,21 +93,21 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
9193
Write-Host "Input path: $input"
9294
Nuget pack $spec -Version $version -Properties Configuration=Release -BasePath $input -OutputDirectory $output
9395

94-
$nupkg = "$output\Wox.$version.nupkg"
96+
$nupkg = "$output\Wox-JJW24.$version.nupkg"
9597
Write-Host "nupkg path: $nupkg"
9698
$icon = "$path\Wox\Resources\app.ico"
9799
Write-Host "icon: $icon"
98100
# Squirrel.com: https://github.com/Squirrel/Squirrel.Windows/issues/369
99-
New-Alias Squirrel $path\packages\squirrel*\tools\Squirrel.exe -Force
101+
New-Alias Squirrel $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe -Force
100102
# why we need Write-Output: https://github.com/Squirrel/Squirrel.Windows/issues/489#issuecomment-156039327
101-
# directory of releaseDir in fucking squirrel can't be same as directory ($nupkg) in releasify
103+
# directory of releaseDir in squirrel can't be same as directory ($nupkg) in releasify
102104
$temp = "$output\Temp"
103105

104106
Squirrel --releasify $nupkg --releaseDir $temp --setupIcon $icon --no-msi | Write-Output
105107
Move-Item $temp\* $output -Force
106108
Remove-Item $temp
107109

108-
$file = "$output\Wox-$version.exe"
110+
$file = "$output\Wox-JJW24-$version.exe"
109111
Write-Host "Filename: $file"
110112

111113
Move-Item "$output\Setup.exe" $file -Force
@@ -123,7 +125,8 @@ function Main {
123125
Delete-Unused $p $config
124126
$o = "$p\Output\Packages"
125127
Validate-Directory $o
126-
New-Alias Nuget $p\packages\NuGet.CommandLine.*\tools\NuGet.exe -Force
128+
# making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
129+
New-Alias Nuget $env:USERPROFILE\.nuget\packages\NuGet.CommandLine\3.4.3\tools\NuGet.exe -Force
127130
Pack-Squirrel-Installer $p $v $o
128131

129132
$isInCI = $env:APPVEYOR

‎Scripts/wox.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0"?>
22
<package>
33
<metadata>
4-
<id>Wox</id>
4+
<id>Wox-JJW24</id>
55
<title>Wox</title>
66
<version>$version$</version>
7-
<authors>happlebao</authors>
8-
<projectUrl>https://github.com/Wox-launcher/Wox</projectUrl>
9-
<iconUrl>https://raw.githubusercontent.com/Wox-launcher/Wox/master/Wox/Images/app.png</iconUrl>
7+
<authors>happlebao, Jeremy Wu</authors>
8+
<projectUrl>https://github.com/jjw24/Wox</projectUrl>
9+
<iconUrl>https://raw.githubusercontent.com/jjw24/Wox/master/Wox/Images/app.png</iconUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>Wox - a launcher for windows</description>
1212
</metadata>

‎Scripts/wox.plugin.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<metadata>
44
<id>Wox.Plugin</id>
55
<version>$version$</version>
6-
<authors>qianlifeng</authors>
7-
<licenseUrl>https://github.com/Wox-launcher/Wox/blob/master/LICENSE</licenseUrl>
8-
<projectUrl>https://github.com/Wox-launcher/Wox</projectUrl>
6+
<authors>qianlifeng, Jeremy Wu</authors>
7+
<licenseUrl>https://github.com/jjw24/Wox/blob/master/LICENSE</licenseUrl>
8+
<projectUrl>https://github.com/jjw24/Wox</projectUrl>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<description>Reference this library if you want to develop a wox plugin</description>
1111
<tags>wox</tags>

‎SolutionAssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#if DEBUG
55

66
[assembly: AssemblyConfiguration("Debug")]
7-
[assembly: AssemblyDescription("Debug build, https://github.com/Wox-launcher/Wox")]
7+
[assembly: AssemblyDescription("Debug build, https://github.com/jjw24/Wox")]
88
#else
99
[assembly: AssemblyConfiguration("Release")]
10-
[assembly: AssemblyDescription("Release build, https://github.com/Wox-launcher/Wox")]
10+
[assembly: AssemblyDescription("Release build, https://github.com/jjw24/Wox")]
1111
#endif
1212

1313
[assembly: AssemblyCompany("Wox")]
@@ -17,5 +17,5 @@
1717
[assembly: AssemblyCulture("")]
1818
[assembly: ComVisible(false)]
1919
[assembly: AssemblyVersion("1.2.0")]
20-
[assembly: AssemblyFileVersion("1.2.0.0")]
20+
[assembly: AssemblyFileVersion("1.2.0")]
2121
[assembly: AssemblyInformationalVersion("1.2.0")]

‎Wox.Infrastructure/Constant.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static class Constant
1616
public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
1717

1818
public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
19-
public const string Issue = "https://github.com/Wox-launcher/Wox/issues/new";
19+
public const string Issue = "https://github.com/jjw24/Wox/issues/new";
2020
public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
2121

2222
public static readonly int ThumbnailSize = 64;

‎Wox/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<applicationSettings>
1313
<Wox.Properties.Settings>
1414
<setting name="GithubRepo" serializeAs="String">
15-
<value>https://github.com/Wox-launcher/Wox</value>
15+
<value>https://github.com/jjw24/Wox</value>
1616
</setting>
1717
</Wox.Properties.Settings>
1818
</applicationSettings>

‎Wox/Languages/en.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<system:String x:Key="checkUpdatesFailed">Check updates failed, please check your connection and proxy settings to api.github.com.</system:String>
9494
<system:String x:Key="downloadUpdatesFailed">
9595
Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com,
96-
or go to https://github.com/Wox-launcher/Wox/releases to download updates manually.
96+
or go to https://github.com/jjw24/Wox/releases to download updates manually.
9797
</system:String>
9898
<system:String x:Key="releaseNotes">Release Notes:</system:String>
9999

‎Wox/Languages/fr.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<system:String x:Key="checkUpdates">Vérifier les mises à jour</system:String>
8787
<system:String x:Key="newVersionTips">Nouvelle version {0} disponible, veuillez redémarrer Wox</system:String>
8888
<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>
89-
<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>
89+
<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>
9090
<system:String x:Key="releaseNotes">Notes de changement :</system:String>
9191

9292
<!--Action Keyword Setting Dialog-->

0 commit comments

Comments
 (0)