tweak the Squirrel

MaterialDesignInXAML · May 6, 2016 · 05623ae · 05623ae
1 parent 488e18c
commit 05623ae
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/F1InXAML/App.xaml b/F1InXAML/App.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:F1InXAML"
              xmlns:dragablz="http://dragablz.net/winfx/xaml/dragablz"
-             Startup="App_OnStartup">
+             Startup="App_OnStartup" Exit="App_OnExit">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/F1InXAML/App.xaml.cs b/F1InXAML/App.xaml.cs
@@ -15,7 +15,10 @@ namespace F1InXAML
     /// Interaction logic for App.xaml
     /// </summary>
     public partial class App : Application
-    {    
+    {
+        private static Task<UpdateManager> _updateManager = null;
+
+
         private void App_OnStartup(object sender, StartupEventArgs e)
         {
             //Timeline.DesiredFrameRateProperty.OverrideMetadata(typeof(Timeline),
@@ -29,25 +32,20 @@ private void App_OnStartup(object sender, StartupEventArgs e)
             var mainWindow = new MainWindow {DataContext = new MainViewModel()};
             mainWindow.Show();
 
-#if RELEASE
             Task.Factory.StartNew(CheckForUpdates);           
-#endif
         }
 
         private static async void CheckForUpdates()
+        {              
+            _updateManager = UpdateManager.GitHubUpdateManager("https://github.com/MaterialDesignInXAML/F1InXAML", "F1ix");
+
+            if (_updateManager.Result.IsInstalledApp)
+                await _updateManager.Result.UpdateApp();
+        }
+
+        private void App_OnExit(object sender, ExitEventArgs e)
         {
-            using (var mgr = UpdateManager.GitHubUpdateManager("https://github.com/MaterialDesignInXAML/F1InXAML"))
-            {
-                try
-                {
-                    mgr.Result.UpdateApp();
-                }
-                catch (Exception)
-                {
-
-                }
-
-            }
+            _updateManager?.Dispose();
         }
     }
 }
diff --git a/F1InXAML/Properties/AssemblyInfo.cs b/F1InXAML/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2")]
-[assembly: AssemblyFileVersion("1.0.2")]
+[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyFileVersion("1.0.3")]
diff --git a/F1ix.1.0.2.nupkg → F1ix.1.0.3.nupkg b/F1ix.1.0.2.nupkg → F1ix.1.0.3.nupkg
diff --git a/Releases/RELEASES b/Releases/RELEASES
@@ -1 +1,3 @@
-6E28337E544E7ED7B0CEACE28C637E4747563455 F1ix-1.0.2-full.nupkg 3206929
+6E28337E544E7ED7B0CEACE28C637E4747563455 F1ix-1.0.2-full.nupkg 3206929
+9D70F6DD33F856994BD4C7DBC1E28CABF649B7BE F1ix-1.0.3-delta.nupkg 11952
+2D2F003962C8C0FA5F18FC10FED349013D9ABC35 F1ix-1.0.3-full.nupkg 3207107
diff --git a/Releases/Setup.exe b/Releases/Setup.exe
diff --git a/Releases/Setup.msi b/Releases/Setup.msi