Merge pull request #12 from NBull92/dev

Merging Dev into master
NBull92 · Apr 30, 2020 · 02059f5 · 02059f5
2 parents 1d4dfc8 + efa927f
commit 02059f5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/Src/ImprezGarage/Bootstrapper.cs b/Src/ImprezGarage/Bootstrapper.cs
@@ -3,6 +3,7 @@
 // This code is for portfolio use only.
 //------------------------------------------------------------------------------
 
+using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
@@ -38,31 +39,38 @@ protected override void InitializeShell()
 #if !DEBUG
             Task.Run(async () =>
             {
-                // Keep in for testing locally.
-                //using (var mgr = new UpdateManager(@"D:\Documents\Nick\GitHub\ImprezGarage\Releases"))
-                //{
-                //    var updateInfo = await mgr.CheckForUpdate();
-                //    if (updateInfo.ReleasesToApply.Any())
-                //    {
-                //        await mgr.UpdateApp();
-                //        UpdateManager.RestartApp();
-                //    }
-                //}
-
-                using (var mgr = UpdateManager.GitHubUpdateManager("https://github.com/NBull92/ImprezGarage"))
+                try
                 {
-                    var updateInfo = await mgr.Result.CheckForUpdate();
-                    if (updateInfo.ReleasesToApply.Any())
+                    // Keep in for testing locally.
+                    //using (var mgr = new UpdateManager(@"D:\Documents\Nick\GitHub\ImprezGarage\Releases"))
+                    //{
+                    //    var updateInfo = await mgr.CheckForUpdate();
+                    //    if (updateInfo.ReleasesToApply.Any())
+                    //    {
+                    //        await mgr.UpdateApp();
+                    //        UpdateManager.RestartApp();
+                    //    }
+                    //}
+
+                    using (var mgr = await UpdateManager.GitHubUpdateManager("https://github.com/NBull92/ImprezGarage"))
                     {
-                        await mgr.Result.UpdateApp();
-                        UpdateManager.RestartApp();
+                        var updateInfo = await mgr.CheckForUpdate();
+                        if (updateInfo.ReleasesToApply.Any())
+                        {
+                            await mgr.UpdateApp();
+                            UpdateManager.RestartApp();
+                        }
                     }
-                }
 
-                Application.Current.Dispatcher.Invoke(() =>
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        Application.Current.MainWindow?.Show();
+                    });
+                }
+                catch (Exception e)
                 {
-                    Application.Current.MainWindow?.Show();
-                });
+
+                }
             });
 #else
             Application.Current.MainWindow?.Show();

diff --git a/Src/ImprezGarage/Properties/AssemblyInfo.cs b/Src/ImprezGarage/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.26")]
-[assembly: AssemblyFileVersion("1.0.26")]
+[assembly: AssemblyVersion("1.0.27")]
+[assembly: AssemblyFileVersion("1.0.27")]
diff --git a/Src/ImprezGarage/Views/MainWindow.xaml b/Src/ImprezGarage/Views/MainWindow.xaml
@@ -27,7 +27,6 @@
     </baseClasses:DialogViewBase.Resources>
 
     <Grid>
-        <!-- New UI -->
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="179"/>

diff --git a/Src/Modules/ImprezGarage.Modules.MyGarage/Views/MainView.xaml b/Src/Modules/ImprezGarage.Modules.MyGarage/Views/MainView.xaml
@@ -33,7 +33,7 @@
                             Command="{Binding AddNewVehicleCommand}" 
                             CommandParameter="{x:Type views:ManageVehicle}"/>
 
-            <ListBox Grid.Row="1" Margin="0,8,0,0" 
+            <ListBox Grid.Row="1" Margin="0,8,5,0" 
                      ItemsSource="{Binding Vehicles}" SelectedItem="{Binding SelectedVehicle}"
                      ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                      Background="Transparent"