From 45ac8eaf0e03d87c2f9728b2b7c84922c6f6a37d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 18 Dec 2018 13:29:22 +0200 Subject: Implemented OS activation + UWF. Added OSKey to MACHINES table and machine service. --- .../MachineSetup/MachineSetupManager.cs | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup') 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 class. /// /// The remote assistance. - 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(); -- cgit v1.3.1