merge conflicts

1 files changed, 30 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
index 85d61d4cc..421b4ee54 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
@@ -4,12 +4,27 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.PMR.Synchronization;
+using Tango.PPC.Common.Publish;
+using Tango.PPC.Common.UpdatePackages;
 using Tango.PPC.Common.Web;
 
 namespace Tango.PPC.Common.MachineUpdate
 {
     public interface IMachineUpdateManager
     {
+        /// <summary>
+        /// Occurs when an application update is available.
+        /// </summary>
+        event EventHandler<CheckForUpdateResponse> UpdateAvailable;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to automatically check for new application updates.
+        /// </summary>
+        bool EnableAutoCheckForUpdates { get; set; }
+
+        /// <summary>
+        /// Gets the current machine update progress status.
+        /// </summary>
         MachineUpdateProgress Status { get; }
 
         /// <summary>
@@ -29,14 +44,14 @@ namespace Tango.PPC.Common.MachineUpdate
         /// <param name="setupFirmware">if set to <c>true</c> updates the embedded device firmware.</param>
         /// <param name="setupFPGA">if set to <c>true</c> updates the embedded device FPGA version and other parameters.</param>
         /// <returns></returns>
-        Task<MachineUpdateResult> Update(String serialNumber, bool setupFirmware, bool setupFPGA);
+        Task<MachineUpdateResult> Update(bool setupFirmware, bool setupFPGA);
 
         /// <summary>
         /// Performs a machine update using the specified software update package path.
         /// </summary>
         /// <param name="fileName">Name of the file.</param>
         /// <returns></returns>
-        Task<MachineUpdateResult> UpdateFromTUP(String fileName);
+        Task<MachineUpdateResult> UpdateFromTUP(String fileName, bool setupFirmware, bool setupFPGA);
 
         /// <summary>
         /// Checks if any update are available for the specified machine serial number.
@@ -63,6 +78,18 @@ namespace Tango.PPC.Common.MachineUpdate
         /// </summary>
         /// <param name="filePath">The file path.</param>
         /// <returns></returns>
-        Task<UpdatePackageFile> GetUpdatePackageFileInfo(String filePath);
+        Task<PublishInfo> GetUpdatePackageFileInfo(String filePath);
+
+        /// <summary>
+        /// Checks whether any post update packages needs to be installed.
+        /// </summary>
+        /// <returns></returns>
+        Task<bool> PostUpdatePackagesRequired();
+
+        /// <summary>
+        /// Runs all post update packages.
+        /// </summary>
+        /// <returns></returns>
+        Task<PackageRunnerResult> RunPostUpdatePackages();
     }
 }