1 files changed, 21 insertions, 4 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 971dde32e..145512562 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -19,7 +19,9 @@ using Tango.Integration.Operation;
 using Tango.PMR.Synchronization;
 using Tango.PPC.Common.Application;
 using Tango.PPC.Common.Connection;
+using Tango.PPC.Common.OS;
 using Tango.PPC.Common.RemoteAssistance;
+using Tango.PPC.Common.UWF;
 using Tango.Settings;
 using Tango.SharedUI.Helpers;
 using Tango.SQLExaminer;
@@ -35,6 +37,8 @@ namespace Tango.PPC.Common.MachineSetup
     public class MachineSetupManager : ExtendedObject, IMachineSetupManager
     {
         private IRemoteAssistanceProvider _remoteAssistance;
+        private IUnifiedWriteFilterManager _uwf;
+        private IWindowsActivationManager _windows_activation_manager;
 
         #region Events
 
@@ -67,9 +71,11 @@ namespace Tango.PPC.Common.MachineSetup
         /// Initializes a new instance of the <see cref="MachineSetupManager"/> class.
         /// </summary>
         /// <param name="remoteAssistance">The remote assistance.</param>
-        public MachineSetupManager(IRemoteAssistanceProvider remoteAssistance)
+        public MachineSetupManager(IRemoteAssistanceProvider remoteAssistance, IUnifiedWriteFilterManager unifiedWriterFilterManager, IWindowsActivationManager windowsActivationManager)
         {
             _remoteAssistance = remoteAssistance;
+            _uwf = unifiedWriterFilterManager;
+            _windows_activation_manager = windowsActivationManager;
         }
 
         #endregion
@@ -134,9 +140,20 @@ 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(serialNumber);
+                if (!demoMode)
+                {
+                    LogManager.Log("Activating windows license...");
+                    UpdateProgress("Activating operation system license", "Activating...");
+                    await _windows_activation_manager.Activate(setup_response.OSKey);
+
+                    LogManager.Log("Installing remote assistance...");
+                    UpdateProgress("Installing remote assistance", "Installing...");
+                    await _remoteAssistance.InstallRemoteAssistance(serialNumber);
+
+                    LogManager.Log("Activating unified write filter...");
+                    UpdateProgress("Activating disk protection", "Activating...");
+                    await _uwf.Setup();
+                }
 
                 //Create temporary folders for packages.
                 var _newPackageTempFolder = TemporaryManager.CreateFolder();