Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 21 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index 3d816c89a..ead508488 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -19,6 +19,7 @@ using Tango.Integration.Operation;
 using Tango.PMR.Synchronization;
 using Tango.PPC.Common.Application;
 using Tango.PPC.Common.Connection;
+using Tango.PPC.Common.RemoteAssistance;
 using Tango.Settings;
 using Tango.SharedUI.Helpers;
 using Tango.SQLExaminer;
@@ -33,6 +34,8 @@ namespace Tango.PPC.Common.MachineSetup
     /// <seealso cref="Tango.PPC.Common.MachineSetup.IMachineSetupManager" />
     public class MachineSetupManager : ExtendedObject, IMachineSetupManager
     {
+        private IRemoteAssistanceProvider _remoteAssistance;
+
         #region Events
 
         /// <summary>
@@ -58,6 +61,19 @@ namespace Tango.PPC.Common.MachineSetup
 
         #endregion
 
+        #region Constructor
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MachineSetupManager"/> class.
+        /// </summary>
+        /// <param name="remoteAssistance">The remote assistance.</param>
+        public MachineSetupManager(IRemoteAssistanceProvider remoteAssistance)
+        {
+            _remoteAssistance = remoteAssistance;
+        }
+
+        #endregion
+
         #region Public Methods
 
         /// <summary>
@@ -95,7 +111,7 @@ namespace Tango.PPC.Common.MachineSetup
                 }
 
                 //Connect to machine service and get matching packages for this machine.
-                UpdateProgress("Downloading software package", "Connecting to machine service...");
+                UpdateProgress("Validating serial number", "Connecting to machine service...");
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
@@ -118,6 +134,10 @@ namespace Tango.PPC.Common.MachineSetup
 
                 LogManager.Log($"Machine setup response received: {Environment.NewLine}{setup_response.ToJsonString()}");
 
+                LogManager.Log("Installing remote assistance...");
+                UpdateProgress("Installing remote assistance", "Installing...");
+                await _remoteAssistance.InstallRemoteAssistance();
+
                 //Create temporary folders for packages.
                 var _newPackageTempFolder = TemporaryManager.CreateFolder();
                 _newPackageTempFolder.Persist = true;