This commit is contained in:
bao-qian 2017-03-06 00:25:17 +00:00
parent ccb7e5270c
commit c6e65b4e24
3 changed files with 36 additions and 4 deletions

4
Deploy/local_build.ps1 Normal file
View File

@ -0,0 +1,4 @@
New-Alias nuget.exe ".\packages\NuGet.CommandLine.*\tools\NuGet.exe"
$env:APPVEYOR_BUILD_FOLDER = Convert-Path .
$env:APPVEYOR_BUILD_VERSION = "1.2.0"
& .\Deploy\squirrel_installer.ps1

View File

@ -4,9 +4,12 @@ using System.Net;
using System.Net.Http;
using System.Net.Sockets;
using System.Threading.Tasks;
using System.Windows;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Squirrel;
using Wox.Core.Resource;
using Wox.Infrastructure;
using Wox.Infrastructure.Http;
using Wox.Infrastructure.Logger;
@ -22,11 +25,28 @@ namespace Wox.Core
try
{
const string url = Infrastructure.Constant.Github;
// todo 5/9 the return value of UpdateApp() is NULL, fucking useless!
const string url = Constant.Github;
// UpdateApp() will return value only if the app is squirrel installed
using (var m = await UpdateManager.GitHubUpdateManager(url, urlDownloader: d))
{
await m.UpdateApp();
var e = await m.CheckForUpdate();
var fe = e.FutureReleaseEntry;
var ce = e.CurrentlyInstalledVersion;
if (fe.Version > ce.Version)
{
var t = NewVersinoTips(fe.Version.ToString());
MessageBox.Show(t);
await m.DownloadReleases(e.ReleasesToApply);
await m.ApplyReleases(e);
await m.CreateUninstallerRegistryEntry();
Log.Info($"|Updater.UpdateApp|TEST <{e.Formatted()}>");
Log.Info($"|Updater.UpdateApp|TEST <{fe.Formatted()}>");
Log.Info($"|Updater.UpdateApp|TEST <{ce.Formatted()}>");
Log.Info($"|Updater.UpdateApp|TEST <{e.ReleasesToApply.Formatted()}>");
Log.Info($"|Updater.UpdateApp|TEST <{t.Formatted()}>");
}
}
}
catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
@ -99,5 +119,13 @@ namespace Wox.Core
var newVersion = version.Replace("v", ".").Replace(".", "").Replace("*", "");
return int.Parse(newVersion);
}
public static string NewVersinoTips(string version)
{
var translater = InternationalizationManager.Instance;
var tips = string.Format(translater.GetTranslation("newVersionTips"), version);
return tips;
}
}
}

View File

@ -95,7 +95,7 @@ namespace Wox
}
}
[Conditional("RELEASE")]
//[Conditional("RELEASE")]
private void AutoUpdates()
{
Task.Run(async () =>