Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
stajs committed Oct 14, 2015
1 parent 5172486 commit dbf6c1c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
16 changes: 14 additions & 2 deletions LIC.Malone.Client.Desktop/ViewModels/AppViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,12 @@ public AppViewModel()

private async void CheckForUpdates()
{
/*
Here be dragons!
Warning: Be *really* careful with changes to the updating code because you could break installed clients. Ensure
any changes are tested thoroughly.
*/

// Waiting on https://github.com/Squirrel/Squirrel.Windows/pull/464.
//var token = ConfigurationManager.AppSettings["GitHubPersonalAccessToken"];

Expand All @@ -488,6 +494,12 @@ private async void CheckForUpdates()
{
var currentVersion = updateManager.CurrentlyInstalledVersion();

if (currentVersion == null)
{
MaloneVersion = "Not installed, update disabled.";
return;
}

MaloneVersion = "Checking for update...";

var hasFailed = false;
Expand Down Expand Up @@ -520,7 +532,7 @@ private async void CheckForUpdates()
return;
}

MaloneVersion = string.Format("Updating to v{0}", latestVersion);
MaloneVersion = string.Format("Updating from v{0} to v{1}...", currentVersion, latestVersion);

var releases = updateInfo.ReleasesToApply;
await updateManager.DownloadReleases(releases);
Expand Down Expand Up @@ -551,7 +563,7 @@ private async void CheckForUpdates()
{
if (e.Message.Contains("Update.exe not found"))
{
MaloneVersion = "Update disabled";
MaloneVersion = string.Format("Update disabled: {0}", e.Message);
return;
}

Expand Down
6 changes: 3 additions & 3 deletions Solution Items/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
// http://blog.ploeh.dk/2013/12/10/semantic-versioning-with-continuous-deployment/
// http://docs.nuget.org/create/nuspec-reference#Replacement_Tokens

[assembly: AssemblyVersion("0.8.0")]
[assembly: AssemblyFileVersion("0.8.0")]
[assembly: AssemblyInformationalVersion("0.8.0")]
[assembly: AssemblyVersion("0.9.0")]
[assembly: AssemblyFileVersion("0.9.0")]
[assembly: AssemblyInformationalVersion("0.9.0")]

0 comments on commit dbf6c1c

Please sign in to comment.