1 files changed, 9 insertions, 13 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModelLocator.cs
index 077b30663..5921a2f15 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModelLocator.cs
@@ -1,6 +1,4 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Ioc;
-using Microsoft.Practices.ServiceLocation;
+using Tango.Core.DI;
 using Tango.MachineStudio.Technician.Navigation;
 using Tango.MachineStudio.Technician.ViewModels;
 
@@ -17,22 +15,20 @@ namespace Tango.MachineStudio.Technician
         /// </summary>
         static ViewModelLocator()
         {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
+            TangoIOC.Default.Register<MainViewVM>();
+            TangoIOC.Default.Register<SensorsViewVM>();
+            TangoIOC.Default.Register<MachineTechViewVM>();
 
-            SimpleIoc.Default.Register<MainViewVM>();
-            SimpleIoc.Default.Register<SensorsViewVM>();
-            SimpleIoc.Default.Register<MachineTechViewVM>();
+            TangoIOC.Default.Unregister<TechNavigationManager>();
 
-            SimpleIoc.Default.Unregister<TechNavigationManager>();
-
-            SimpleIoc.Default.Register<TechNavigationManager, TechNavigationManager>();
+            TangoIOC.Default.Register<TechNavigationManager, TechNavigationManager>();
         }
 
         public static MainViewVM MainViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MainViewVM>();
+                return TangoIOC.Default.GetInstance<MainViewVM>();
             }
         }
 
@@ -40,7 +36,7 @@ namespace Tango.MachineStudio.Technician
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<SensorsViewVM>();
+                return TangoIOC.Default.GetInstance<SensorsViewVM>();
             }
         }
 
@@ -48,7 +44,7 @@ namespace Tango.MachineStudio.Technician
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MachineTechViewVM>();
+                return TangoIOC.Default.GetInstance<MachineTechViewVM>();
             }
         }
     }