From 733f0ce4feef6b7dc4151ffe0f896efb53640314 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 15 Aug 2019 10:44:19 +0300
Subject: Machine Studio 4.0.23.0 PPC 1.0.40.0

---
 .../MachineStudio/Tango.MachineStudio.UI/App.xaml.cs              | 2 +-
 .../Authentication/DefaultAuthenticationProvider.cs               | 8 ++++++++
 .../Tango.MachineStudio.UI/Properties/AssemblyInfo.cs             | 2 +-
 .../Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj          | 2 +-
 .../Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs              | 3 ++-
 5 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')

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 2e2b1a014..d6c3a321e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.UI
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App : Application
+    public partial class App : Application  
     {
         private WpfGlobalExceptionTrapper exceptionTrapper;
         private LogManager LogManager = LogManager.Default;
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 951a40870..2de61fd75 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -95,6 +95,14 @@ namespace Tango.MachineStudio.UI.Authentication
                 ObservablesContext.OverrideSettingsDataSource(response.DataSource);
             }
 
+            if (response.VersionChangeRequired)
+            {
+                return new AuthenticationLoginResult()
+                {
+                    Response = response
+                };
+            }
+
             try
             {
                 ObservablesStaticCollections.Instance.Initialize();
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 21072b073..fc465cbe4 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("4.0.22.0")]
+[assembly: AssemblyVersion("4.0.23.0")]
 [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 ba9bef3c6..cc5bd77e4 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
@@ -642,7 +642,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
index b9cd82979..15f21bce1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -17,6 +17,7 @@ using Tango.MachineStudio.Common.EventLogging;
 using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.Web;
+using Tango.MachineStudio.UI.Authentication;
 using Tango.MachineStudio.UI.Messages;
 using Tango.Settings;
 using Tango.SharedUI;
@@ -157,7 +158,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                     {
                         _settings.DeploymentSlot = DeploymentSlot;
 
-                        var result = _authenticationProvider.Login(Email, Password).Response;
+                        LoginResponse result = _authenticationProvider.Login(Email, Password).Response;
 
                         if (result.VersionChangeRequired && !_settings.ByPassEnvironmentVersionCheck)
                         {
-- 
cgit v1.3.1