diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-15 16:21:13 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-15 16:21:13 +0200 |
| commit | dcdee2479e0dc709835e97853bb9db0349210336 (patch) | |
| tree | ceafc1d3679931f0798236434e284d9a7ed644de /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels | |
| parent | b0909a133eaba5223ca397c8186ba6b96fdaa647 (diff) | |
| download | Tango-dcdee2479e0dc709835e97853bb9db0349210336.tar.gz Tango-dcdee2479e0dc709835e97853bb9db0349210336.zip | |
Machine Studio v3.5.70 Stable.
Added stable/beta release modes.
Handle corrupted log file names.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | 1 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs | 5 |
2 files changed, 6 insertions, 0 deletions
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 31e297cd1..58dfc17c2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -367,6 +367,7 @@ namespace Tango.MachineStudio.UI.ViewModels Email = _authenticationProvider.CurrentUser.Email, Password = _authenticationProvider.CurrentUser.Password, Version = _applicationManager.Version.ToString(), + AcceptBetaRelease = _settings.AcceptBetaRelease, }); IsUpdateAvailable = response.IsUpdateAvailable; 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 55f585626..a9624da2d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs @@ -22,6 +22,8 @@ using Tango.MachineStudio.Common.StudioApplication; using Tango.MachineStudio.Common.Update; using Tango.SharedUI; using Tango.MachineStudio.UI.Messages; +using Tango.Settings; +using Tango.MachineStudio.Common; namespace Tango.MachineStudio.UI.ViewModels { @@ -181,6 +183,8 @@ namespace Tango.MachineStudio.UI.ViewModels { Status = UpdateStatus.CheckingForUpdate; + var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>(); + ChannelFactory<IMachineStudioUpdateService> service = null; Task.Factory.StartNew(() => @@ -197,6 +201,7 @@ namespace Tango.MachineStudio.UI.ViewModels Email = _authentication.CurrentUser.Email, Password = _authentication.CurrentUser.Password, Version = _application.Version.ToString(), + AcceptBetaRelease = settings.AcceptBetaRelease, }); if (response.IsUpdateAvailable) |