merge

1 files changed, 6 insertions, 0 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
index a8cbcfe2d..9e150221d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
@@ -20,11 +20,13 @@ using Tango.PPC.Common.Modules;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.OS;
+using Tango.PPC.Common.Performance;
 using Tango.PPC.Common.Printing;
 using Tango.PPC.Common.RemoteAssistance;
 using Tango.PPC.Common.RemoteDesktop;
 using Tango.PPC.Common.Storage;
 using Tango.PPC.Common.Synchronization;
+using Tango.PPC.Common.SystemInfo;
 using Tango.PPC.Common.Threading;
 using Tango.PPC.Common.UpdatePackages;
 using Tango.PPC.Common.UWF;
@@ -82,6 +84,8 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Unregister<IMachineDataSynchronizer>();
             TangoIOC.Default.Unregister<IConsoleEngineService>();
             TangoIOC.Default.Unregister<IRemoteDesktopService>();
+            TangoIOC.Default.Unregister<IPerformanceService>();
+            TangoIOC.Default.Unregister<ISystemInfoService>();
 
             if (App.StartupArgs.Contains("-webDebug"))
             {
@@ -117,6 +121,8 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<IUnifiedWriteFilterManager, AlternativeUnifiedWriteFilterManager>();
             TangoIOC.Default.Register<IOperationSystemManager, DefaultOperationSystemManager>();
             TangoIOC.Default.Register<IBackupManager, DefaultBackupManager>();
+            TangoIOC.Default.Register<IPerformanceService, DefaultPerformanceService>();
+            TangoIOC.Default.Register<ISystemInfoService, DefaultSystemInfoService>();
 
             TangoIOC.Default.Register<LoadingViewVM>();
             TangoIOC.Default.Register<MainViewVM>();