2 files changed, 87 insertions, 0 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index 01e67d3ce..4cc4ee46f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -275,6 +275,66 @@ namespace Tango.PPC.UI.ViewModels
             base.OnApplicationReady();
 
             StorageProvider.RegisterFileHandler(ExplorerFileDefinition.Update.Extension, HandleSoftwareUpdatePackageLoaded);
+
+            if (ApplicationManager.IsAfterUpdate)
+            {
+                RunPostUpdatePackages();
+            }
+        }
+
+        #endregion
+
+        #region Post Update Packages
+
+        private async void RunPostUpdatePackages()
+        {
+            await Task.Delay(1000);
+
+            LogManager.Log("Application was loaded after an update. Checking for required post-update packages...");
+
+            bool required = false;
+
+            try
+            {
+                required = await MachineUpdateManager.PostUpdatePackagesRequired();
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error checking for post-update packages.");
+            }
+
+            if (required)
+            {
+                LogManager.Log("Post-update packages found and needs to be installed. Navigating to machine update and running post-update packages...");
+                await NavigationManager.NavigateTo(Common.Navigation.NavigationView.MachineUpdateView);
+                await NavigateTo(MachineUpdateView.UpdateProgressView);
+                try
+                {
+                    var result = await MachineUpdateManager.RunPostUpdatePackages();
+
+                    LogManager.Log("Post-update packages installed successfully.");
+
+                    await Task.Delay(2000);
+
+                    if (result.RestartRequired)
+                    {
+                        LogManager.Log("Restart required. Restarting...");
+                        ApplicationManager.Restart();
+                    }
+                    else
+                    {
+                        await NavigationManager.NavigateTo(Common.Navigation.NavigationView.LayoutView);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error occurred while running post-update packages.");
+                }
+            }
+            else
+            {
+                LogManager.Log("No post-update packages installation required.");
+            }
         }
 
         #endregion
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/RestartingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/RestartingViewVM.cs
new file mode 100644
index 000000000..46111031b
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/RestartingViewVM.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.PPC.Common;
+
+namespace Tango.PPC.UI.ViewModels
+{
+    public class RestartingViewVM : PPCViewModel
+    {
+        public override void OnApplicationStarted()
+        {
+            
+        }
+
+        public override void OnNavigatedTo()
+        {
+            base.OnNavigatedTo();
+        }
+
+        public override void OnNavigatedFrom()
+        {
+            base.OnNavigatedFrom();
+        }
+    }
+}