Moved Observables to Integration !!

Implemented basic sketch for IDS Pack Formulation.

5 files changed, 5 insertions, 8 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index ca553de1e..50e57aab1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -5,7 +5,7 @@ using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 
 namespace Tango.MachineStudio.UI
 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
index 80e5e9762..82aba268d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -5,7 +5,7 @@ using System.Security.Authentication;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Authentication;
 
 namespace Tango.MachineStudio.UI.Authentication
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
index 0e1bd829b..e08ee9b08 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
@@ -7,6 +7,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Modules;
@@ -44,7 +45,7 @@ namespace Tango.MachineStudio.UI.Modules
         /// </summary>
         /// <param name="sender">The sender.</param>
         /// <param name="e">The e.</param>
-        private void _authenticationProvider_CurrentUserChanged(object sender, DAL.Observables.User e)
+        private void _authenticationProvider_CurrentUserChanged(object sender, User e)
         {
             LoadModules();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index fb8c023be..5490c2c2b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -256,10 +256,6 @@
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.DAL.Observables\Tango.DAL.Observables.csproj">
-      <Project>{0ecd6da8-7aa6-48d9-8b65-279d176ad9af}</Project>
-      <Name>Tango.DAL.Observables</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.DAL.Remote\Tango.DAL.Remote.csproj">
       <Project>{38197109-8610-4d3f-92b9-16d48df94d7c}</Project>
       <Name>Tango.DAL.Remote</Name>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index 54e2f9196..55a54e8aa 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Tango.Core.Helpers;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;