Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

5 files changed, 15 insertions, 10 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config
index 0395c36bb..6f1fcffc2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config
@@ -115,6 +115,10 @@
         <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>
+      <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>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
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 13c3d6779..0def3c943 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
@@ -32,8 +32,8 @@ namespace Tango.MachineStudio.UI.Modules
         public DefaultStudioModuleLoader(IAuthenticationProvider authenticationProvider)
         {
             _authenticationProvider = authenticationProvider;
-            AllModules = new ObservableCollection<IStudioModule>();
-            UserModules = new ObservableCollection<IStudioModule>();
+            AllModules = new SynchronizedObservableCollection<IStudioModule>();
+            UserModules = new SynchronizedObservableCollection<IStudioModule>();
             _authenticationProvider.CurrentUserChanged += _authenticationProvider_CurrentUserChanged;
         }
 
@@ -47,21 +47,21 @@ namespace Tango.MachineStudio.UI.Modules
             LoadModules();
         }
 
-        private ObservableCollection<IStudioModule> _allModules;
+        private SynchronizedObservableCollection<IStudioModule> _allModules;
         /// <summary>
         /// Gets all loaded modules.
         /// </summary>
-        public ObservableCollection<IStudioModule> AllModules
+        public SynchronizedObservableCollection<IStudioModule> AllModules
         {
             get { return _allModules; }
             private set { _allModules = value; RaisePropertyChangedAuto(); }
         }
 
-        private ObservableCollection<IStudioModule> _userModules;
+        private SynchronizedObservableCollection<IStudioModule> _userModules;
         /// <summary>
         /// Gets all the user permitted modules.
         /// </summary>
-        public ObservableCollection<IStudioModule> UserModules
+        public SynchronizedObservableCollection<IStudioModule> UserModules
         {
             get { return _userModules; }
             private set { _userModules = value; RaisePropertyChangedAuto(); }
@@ -121,13 +121,13 @@ namespace Tango.MachineStudio.UI.Modules
                 _loaded = true;
             }
 
-            AllModules = AllModules.OrderBy(x => x.GetType().GetCustomAttribute<StudioModuleAttribute>().Index).ToObservableCollection();
+            AllModules = AllModules.OrderBy(x => x.GetType().GetCustomAttribute<StudioModuleAttribute>().Index).ToSynchronizedObservableCollection();
 
             UserModules.Clear();
 
             if (_authenticationProvider.CurrentUser != null)
             {
-                UserModules = AllModules.Where(x => _authenticationProvider.CurrentUser.HasPermission(x.Permission)).ToObservableCollection();
+                UserModules = AllModules.Where(x => _authenticationProvider.CurrentUser.HasPermission(x.Permission)).ToSynchronizedObservableCollection();
             }
 
             ModulesLoaded?.Invoke(this, new EventArgs());
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index d2e87309d..4524e0622 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("3.4.43.18238")]
+[assembly: AssemblyVersion("3.5.45.18238")]
 [assembly: ComVisible(false)]
\ No newline at end of file
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 fce0e717f..003a7f194 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
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Tango.MachineStudio.UI</RootNamespace>
     <AssemblyName>Tango.MachineStudio.UI</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index cbd58134d..b3d896d53 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -412,6 +412,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         private void SignOut()
         {
             _authenticationProvider.Logout();
+            Home();
             _navigation.NavigateTo(NavigationView.LoginView);
             CurrentModule = null;
             IsMenuOpened = false;