Implemented new TangoIOC container & TangoMessenger.

Got rid of MVVMLite libs !
Got rid of IShutdownRequestBlocker, IShutdownListener, IModuleRequestListener.
Implemented IStudioViewModel & StudioViewModel.

7 files changed, 148 insertions, 122 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/App.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/App.config
index f89af9711..2031d1be1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/App.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/App.config
@@ -16,6 +16,46 @@
         <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index 8eabcc605..baa6042f0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -40,15 +40,6 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
-    </Reference>
     <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
@@ -58,9 +49,6 @@
     <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
     <Reference Include="SimpleValidator, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\SimpleValidator.0.6.1.0\lib\net40\SimpleValidator.dll</HintPath>
     </Reference>
@@ -68,7 +56,7 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\..\..\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index da2bdf631..d2506c362 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -1,6 +1,4 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Ioc;
-using Microsoft.Practices.ServiceLocation;
+using Tango.Core.DI;
 using Tango.MachineStudio.DB.ViewModels;
 
 namespace Tango.MachineStudio.DB
@@ -16,65 +14,64 @@ namespace Tango.MachineStudio.DB
         /// </summary>
         static ViewModelLocator()
         {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-            SimpleIoc.Default.Register<MainViewVM>();
-            SimpleIoc.Default.Register<MachinesViewVM>();
-            SimpleIoc.Default.Register<OrganizationsViewVM>();
-            SimpleIoc.Default.Register<AddressesViewVM>();
-            SimpleIoc.Default.Register<UsersViewVM>();
-            SimpleIoc.Default.Register<RolesViewVM>();
-            SimpleIoc.Default.Register<PermissionsViewVM>();
-            SimpleIoc.Default.Register<MachineVersionsViewVM>();
-            SimpleIoc.Default.Register<ConfigurationsViewVM>();
+            TangoIOC.Default.Register<MainViewVM>();
+            TangoIOC.Default.Register<MachinesViewVM>();
+            TangoIOC.Default.Register<OrganizationsViewVM>();
+            TangoIOC.Default.Register<AddressesViewVM>();
+            TangoIOC.Default.Register<UsersViewVM>();
+            TangoIOC.Default.Register<RolesViewVM>();
+            TangoIOC.Default.Register<PermissionsViewVM>();
+            TangoIOC.Default.Register<MachineVersionsViewVM>();
+            TangoIOC.Default.Register<ConfigurationsViewVM>();
 
-            SimpleIoc.Default.Register<ApplicationDisplayPanelVersionsViewVM>();
-            SimpleIoc.Default.Register<ApplicationFirmwareVersionsViewVM>();
-            SimpleIoc.Default.Register<ApplicationOsVersionsViewVM>();
-            SimpleIoc.Default.Register<ApplicationVersionsViewVM>();
-            SimpleIoc.Default.Register<EmbeddedFirmwareVersionsViewVM>();
-            SimpleIoc.Default.Register<EmbeddedSoftwareVersionsViewVM>();
-            SimpleIoc.Default.Register<HardwareVersionsViewVM>();
+            TangoIOC.Default.Register<ApplicationDisplayPanelVersionsViewVM>();
+            TangoIOC.Default.Register<ApplicationFirmwareVersionsViewVM>();
+            TangoIOC.Default.Register<ApplicationOsVersionsViewVM>();
+            TangoIOC.Default.Register<ApplicationVersionsViewVM>();
+            TangoIOC.Default.Register<EmbeddedFirmwareVersionsViewVM>();
+            TangoIOC.Default.Register<EmbeddedSoftwareVersionsViewVM>();
+            TangoIOC.Default.Register<HardwareVersionsViewVM>();
 
-            SimpleIoc.Default.Register<IdsPacksViewVM>();
-            SimpleIoc.Default.Register<IdsPackFormulasViewVM>();
-            SimpleIoc.Default.Register<DispenserTypesViewVM>();
-            SimpleIoc.Default.Register<LiquidTypesViewVM>();
-            SimpleIoc.Default.Register<CartridgeTypesViewVM>();
-            SimpleIoc.Default.Register<MidTankTypesViewVM>();
+            TangoIOC.Default.Register<IdsPacksViewVM>();
+            TangoIOC.Default.Register<IdsPackFormulasViewVM>();
+            TangoIOC.Default.Register<DispenserTypesViewVM>();
+            TangoIOC.Default.Register<LiquidTypesViewVM>();
+            TangoIOC.Default.Register<CartridgeTypesViewVM>();
+            TangoIOC.Default.Register<MidTankTypesViewVM>();
 
-            SimpleIoc.Default.Register<EventTypesViewVM>();
-            SimpleIoc.Default.Register<ActionTypesViewVM>();
+            TangoIOC.Default.Register<EventTypesViewVM>();
+            TangoIOC.Default.Register<ActionTypesViewVM>();
 
-            SimpleIoc.Default.Register<ContactsViewVM>();
+            TangoIOC.Default.Register<ContactsViewVM>();
 
-            SimpleIoc.Default.Register<MediaMaterialsViewVM>();
-            SimpleIoc.Default.Register<MediaColorsViewVM>();
-            SimpleIoc.Default.Register<MediaPurposesViewVM>();
-            SimpleIoc.Default.Register<MediaConditionsViewVM>();
-            SimpleIoc.Default.Register<LinearMassDensityUnitsViewVM>();
-            SimpleIoc.Default.Register<FiberShapesViewVM>();
-            SimpleIoc.Default.Register<FiberSynthsViewVM>();
-            SimpleIoc.Default.Register<RmlsViewVM>();
-            SimpleIoc.Default.Register<LiquidTypesRmlsViewVM>();
+            TangoIOC.Default.Register<MediaMaterialsViewVM>();
+            TangoIOC.Default.Register<MediaColorsViewVM>();
+            TangoIOC.Default.Register<MediaPurposesViewVM>();
+            TangoIOC.Default.Register<MediaConditionsViewVM>();
+            TangoIOC.Default.Register<LinearMassDensityUnitsViewVM>();
+            TangoIOC.Default.Register<FiberShapesViewVM>();
+            TangoIOC.Default.Register<FiberSynthsViewVM>();
+            TangoIOC.Default.Register<RmlsViewVM>();
+            TangoIOC.Default.Register<LiquidTypesRmlsViewVM>();
 
-            SimpleIoc.Default.Register<CctsViewVM>();
-            SimpleIoc.Default.Register<CatsViewVM>();
+            TangoIOC.Default.Register<CctsViewVM>();
+            TangoIOC.Default.Register<CatsViewVM>();
 
-            SimpleIoc.Default.Register<ProcessParametersTablesViewVM>();
-            SimpleIoc.Default.Register<ProcessParametersTablesGroupsViewVM>();
+            TangoIOC.Default.Register<ProcessParametersTablesViewVM>();
+            TangoIOC.Default.Register<ProcessParametersTablesGroupsViewVM>();
 
-            SimpleIoc.Default.Register<HardwareMotorTypesViewVM>();
-            SimpleIoc.Default.Register<HardwareDancerTypesViewVM>();
-            SimpleIoc.Default.Register<HardwarePidControlTypesViewVM>();
+            TangoIOC.Default.Register<HardwareMotorTypesViewVM>();
+            TangoIOC.Default.Register<HardwareDancerTypesViewVM>();
+            TangoIOC.Default.Register<HardwarePidControlTypesViewVM>();
 
-            SimpleIoc.Default.Register<EventTypesGroupsViewVM>();
+            TangoIOC.Default.Register<EventTypesGroupsViewVM>();
         }
 
         public static MainViewVM MainViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MainViewVM>();
+                return TangoIOC.Default.GetInstance<MainViewVM>();
             }
         }
 
@@ -82,7 +79,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MachinesViewVM>();
+                return TangoIOC.Default.GetInstance<MachinesViewVM>();
             }
         }
 
@@ -90,7 +87,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<OrganizationsViewVM>();
+                return TangoIOC.Default.GetInstance<OrganizationsViewVM>();
             }
         }
 
@@ -98,7 +95,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<AddressesViewVM>();
+                return TangoIOC.Default.GetInstance<AddressesViewVM>();
             }
         }
 
@@ -106,7 +103,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<UsersViewVM>();
+                return TangoIOC.Default.GetInstance<UsersViewVM>();
             }
         }
 
@@ -114,7 +111,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<RolesViewVM>();
+                return TangoIOC.Default.GetInstance<RolesViewVM>();
             }
         }
 
@@ -122,7 +119,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<PermissionsViewVM>();
+                return TangoIOC.Default.GetInstance<PermissionsViewVM>();
             }
         }
 
@@ -130,7 +127,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MachineVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<MachineVersionsViewVM>();
             }
         }
 
@@ -138,7 +135,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ConfigurationsViewVM>();
+                return TangoIOC.Default.GetInstance<ConfigurationsViewVM>();
             }
         }
 
@@ -146,7 +143,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ApplicationDisplayPanelVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<ApplicationDisplayPanelVersionsViewVM>();
             }
         }
 
@@ -154,7 +151,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ApplicationFirmwareVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<ApplicationFirmwareVersionsViewVM>();
             }
         }
 
@@ -162,7 +159,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ApplicationOsVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<ApplicationOsVersionsViewVM>();
             }
         }
 
@@ -170,7 +167,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ApplicationVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<ApplicationVersionsViewVM>();
             }
         }
 
@@ -178,7 +175,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<EmbeddedFirmwareVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<EmbeddedFirmwareVersionsViewVM>();
             }
         }
 
@@ -186,7 +183,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<EmbeddedSoftwareVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<EmbeddedSoftwareVersionsViewVM>();
             }
         }
 
@@ -194,7 +191,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwareVersionsViewVM>();
+                return TangoIOC.Default.GetInstance<HardwareVersionsViewVM>();
             }
         }
 
@@ -202,7 +199,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<IdsPacksViewVM>();
+                return TangoIOC.Default.GetInstance<IdsPacksViewVM>();
             }
         }
 
@@ -210,7 +207,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<DispenserTypesViewVM>();
+                return TangoIOC.Default.GetInstance<DispenserTypesViewVM>();
             }
         }
 
@@ -218,7 +215,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LiquidTypesViewVM>();
+                return TangoIOC.Default.GetInstance<LiquidTypesViewVM>();
             }
         }
 
@@ -226,7 +223,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<CartridgeTypesViewVM>();
+                return TangoIOC.Default.GetInstance<CartridgeTypesViewVM>();
             }
         }
 
@@ -234,7 +231,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<EventTypesViewVM>();
+                return TangoIOC.Default.GetInstance<EventTypesViewVM>();
             }
         }
 
@@ -242,7 +239,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ActionTypesViewVM>();
+                return TangoIOC.Default.GetInstance<ActionTypesViewVM>();
             }
         }
 
@@ -250,7 +247,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ContactsViewVM>();
+                return TangoIOC.Default.GetInstance<ContactsViewVM>();
             }
         }
 
@@ -258,7 +255,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MediaMaterialsViewVM>();
+                return TangoIOC.Default.GetInstance<MediaMaterialsViewVM>();
             }
         }
 
@@ -266,7 +263,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MediaColorsViewVM>();
+                return TangoIOC.Default.GetInstance<MediaColorsViewVM>();
             }
         }
 
@@ -274,7 +271,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MediaPurposesViewVM>();
+                return TangoIOC.Default.GetInstance<MediaPurposesViewVM>();
             }
         }
 
@@ -282,7 +279,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MediaConditionsViewVM>();
+                return TangoIOC.Default.GetInstance<MediaConditionsViewVM>();
             }
         }
 
@@ -290,7 +287,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LinearMassDensityUnitsViewVM>();
+                return TangoIOC.Default.GetInstance<LinearMassDensityUnitsViewVM>();
             }
         }
 
@@ -298,7 +295,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<FiberShapesViewVM>();
+                return TangoIOC.Default.GetInstance<FiberShapesViewVM>();
             }
         }
 
@@ -306,7 +303,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<FiberSynthsViewVM>();
+                return TangoIOC.Default.GetInstance<FiberSynthsViewVM>();
             }
         }
 
@@ -314,7 +311,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<RmlsViewVM>();
+                return TangoIOC.Default.GetInstance<RmlsViewVM>();
             }
         }
 
@@ -322,7 +319,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<CctsViewVM>();
+                return TangoIOC.Default.GetInstance<CctsViewVM>();
             }
         }
 
@@ -330,7 +327,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<CatsViewVM>();
+                return TangoIOC.Default.GetInstance<CatsViewVM>();
             }
         }
 
@@ -338,7 +335,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<MidTankTypesViewVM>();
+                return TangoIOC.Default.GetInstance<MidTankTypesViewVM>();
             }
         }
 
@@ -346,7 +343,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<LiquidTypesRmlsViewVM>();
+                return TangoIOC.Default.GetInstance<LiquidTypesRmlsViewVM>();
             }
         }
 
@@ -354,7 +351,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ProcessParametersTablesViewVM>();
+                return TangoIOC.Default.GetInstance<ProcessParametersTablesViewVM>();
             }
         }
 
@@ -362,7 +359,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<ProcessParametersTablesGroupsViewVM>();
+                return TangoIOC.Default.GetInstance<ProcessParametersTablesGroupsViewVM>();
             }
         }
 
@@ -370,7 +367,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<IdsPackFormulasViewVM>();
+                return TangoIOC.Default.GetInstance<IdsPackFormulasViewVM>();
             }
         }
 
@@ -378,7 +375,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwareMotorTypesViewVM>();
+                return TangoIOC.Default.GetInstance<HardwareMotorTypesViewVM>();
             }
         }
 
@@ -386,7 +383,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwareDancerTypesViewVM>();
+                return TangoIOC.Default.GetInstance<HardwareDancerTypesViewVM>();
             }
         }
 
@@ -394,7 +391,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwarePidControlTypesViewVM>();
+                return TangoIOC.Default.GetInstance<HardwarePidControlTypesViewVM>();
             }
         }
 
@@ -402,7 +399,7 @@ namespace Tango.MachineStudio.DB
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<EventTypesGroupsViewVM>();
+                return TangoIOC.Default.GetInstance<EventTypesGroupsViewVM>();
             }
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
index de6772bf8..f4a0c6b0b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
@@ -9,7 +9,6 @@ using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.DB.Managers;
 using Tango.SharedUI;
 using System.Data.Entity.Infrastructure;
-using GalaSoft.MvvmLight.Messaging;
 using Tango.MachineStudio.DB.Messages;
 using System.Collections.ObjectModel;
 using System.Reflection;
@@ -17,6 +16,7 @@ using Tango.MachineStudio.Common.StudioApplication;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations.Schema;
 using Tango.BL;
+using Tango.Core.DI;
 
 namespace Tango.MachineStudio.DB.ViewModels
 {
@@ -180,7 +180,7 @@ namespace Tango.MachineStudio.DB.ViewModels
             ValidationErrors.Clear();
             DialogOpenMode = DialogOpenMode.Editing;
             EditEntity = GetEditableEntity(DialogOpenMode);
-            Messenger.Default.Send(new OpenEntityEditViewMessage(DialogOpenMode, this, typeof(T)));
+            TangoMessenger.Default.Send(new OpenEntityEditViewMessage(DialogOpenMode, this, typeof(T)));
             IsDialogOpen = true;
         }
 
@@ -204,7 +204,7 @@ namespace Tango.MachineStudio.DB.ViewModels
                 }
             }
 
-            Messenger.Default.Send(new OpenEntityEditViewMessage(DialogOpenMode, this, typeof(T)));
+            TangoMessenger.Default.Send(new OpenEntityEditViewMessage(DialogOpenMode, this, typeof(T)));
             IsDialogOpen = true;
         }
 
@@ -231,7 +231,7 @@ namespace Tango.MachineStudio.DB.ViewModels
                 }
             }
 
-            Messenger.Default.Send(new CloseEntityEditViewMessage());
+            TangoMessenger.Default.Send(new CloseEntityEditViewMessage());
 
             if (mode == DialogOpenMode.Editing)
             {
@@ -288,7 +288,7 @@ namespace Tango.MachineStudio.DB.ViewModels
         /// <param name="mode">The mode.</param>
         protected virtual void OnDialogCancelPressed(DialogOpenMode mode, T entity)
         {
-            Messenger.Default.Send(new CloseEntityEditViewMessage());
+            TangoMessenger.Default.Send(new CloseEntityEditViewMessage());
             IsDialogOpen = false;
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
index abda33804..727436306 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
@@ -1,5 +1,4 @@
-using Microsoft.Practices.ServiceLocation;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -8,37 +7,40 @@ using System.Threading.Tasks;
 using System.Windows;
 using Tango.BL;
 using Tango.BL.Entities;
+using Tango.Core.DI;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.DB.ViewModels
 {
-    public class MainViewVM : ViewModel, IModuleRequestListener
+    public class MainViewVM : StudioViewModel<DBModule>
     {
         public MainViewVM() : base()
         {
 
         }
 
-        public void OnRequestModule(IStudioModule module, object args)
+        public override void OnModuleRequest(params object[] args)
         {
-            if (module is DBModule && args != null && args is IObservableEntity)
+            if (args != null && args.Length > 0 && args[0] is IObservableEntity)
             {
-                String vmName = args.GetType().Name + "sViewVM";
-                
+                var arg = args[0];
+
+                String vmName = arg.GetType().Name + "sViewVM";
+
                 Type vmType = Assembly.GetAssembly(typeof(MainViewVM)).GetTypes().SingleOrDefault(x => x.Name == vmName);
 
                 if (vmType == null)
                 {
-                    vmName = args.GetType().BaseType.Name + "sViewVM";
+                    vmName = arg.GetType().BaseType.Name + "sViewVM";
                     vmType = Assembly.GetAssembly(typeof(MainViewVM)).GetTypes().SingleOrDefault(x => x.Name == vmName);
                 }
 
                 if (vmType != null)
                 {
-                    var vm = ServiceLocator.Current.GetInstance(vmType);
-                    vmType.GetProperty("SelectedEntity").SetValue(vm, args);
+                    var vm = TangoIOC.Default.GetInstance(vmType);
+                    vmType.GetProperty("SelectedEntity").SetValue(vm, arg);
                     vmType.GetMethod("OnEdit", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(vm, new object[] { });
                 }
             }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml.cs
index b769b9bfd..73f73844c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml.cs
@@ -1,5 +1,4 @@
-using GalaSoft.MvvmLight.Messaging;
-using MaterialDesignThemes.Wpf;
+using MaterialDesignThemes.Wpf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,6 +13,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.Core.DI;
 using Tango.MachineStudio.DB.Messages;
 using Tango.MachineStudio.DB.ViewModels;
 using Tango.MachineStudio.DB.Views.DBViews;
@@ -31,8 +31,8 @@ namespace Tango.MachineStudio.DB.Views
         {
             InitializeComponent();
 
-            Messenger.Default.Register<OpenEntityEditViewMessage>(this, HandleOpenEntityViewMessage);
-            Messenger.Default.Register<CloseEntityEditViewMessage>(this, HandleCloseEntityViewMessage);
+            TangoMessenger.Default.Register<OpenEntityEditViewMessage>(HandleOpenEntityViewMessage);
+            TangoMessenger.Default.Register<CloseEntityEditViewMessage>(HandleCloseEntityViewMessage);
         }
 
         public bool IsEditViewOpen
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/packages.config
index 138a48ec7..08a360572 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/packages.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/packages.config
@@ -3,11 +3,10 @@
   <package id="CommonServiceLocator" version="1.3" targetFramework="net46" />
   <package id="Dragablz" version="0.0.3.197" targetFramework="net46" />
   <package id="EntityFramework" version="6.0.0" targetFramework="net46" />
+  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net46" />
   <package id="MahApps.Metro" version="1.5.0" targetFramework="net46" />
   <package id="MaterialDesignColors" version="1.1.2" targetFramework="net46" />
   <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net46" />
-  <package id="MvvmLight" version="5.3.0.0" targetFramework="net46" />
-  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net46" />
   <package id="SimpleValidator" version="0.6.1.0" targetFramework="net46" />
   <package id="WriteableBitmapEx" version="1.5.0.0" targetFramework="net46" />
 </packages>
\ No newline at end of file