From 7b22fc549089ea11a90486bcef0afbaba4efe3fa Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 26 Sep 2019 19:29:21 +0300 Subject: Fixed issue with BypassVersionCheck not loading modules. Added ForceVersionUpdate setting. --- .../MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs | 2 +- .../MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels') 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 c181d7b9d..cf34764d9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs @@ -158,7 +158,7 @@ namespace Tango.MachineStudio.UI.ViewModels { _settings.DeploymentSlot = DeploymentSlot; - LoginResponse result = _authenticationProvider.Login(Email, Password).Response; + LoginResponse result = _authenticationProvider.Login(Email, Password, _settings.ByPassEnvironmentVersionCheck).Response; if (result.VersionChangeRequired && !_settings.ByPassEnvironmentVersionCheck) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs index c40f91005..4a94322fb 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs @@ -218,7 +218,7 @@ namespace Tango.MachineStudio.UI.ViewModels CheckForUpdatesResponse response = _machineStudioWebClient.CheckForUpdates(new CheckForUpdatesRequest() { - Version = _application.Version.ToString(), + Version = settings.ForceVersionUpdate ? "1.0.0.0" : _application.Version.ToString(), }).Result; if (response.IsUpdateAvailable) -- cgit v1.3.1