diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-06-25 13:53:15 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-06-25 13:53:15 +0300 |
| commit | c95a8fbe2746db2c1ef73a2c373004b322bdb5bf (patch) | |
| tree | 410bcca9da486af969d6d4afb142512e3b88c2fc /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common | |
| parent | c68262a29c29d0785337b5982e91ebf741e98b0f (diff) | |
| parent | a27ef72084d844ef703aaa9b1c6f4ec032ca182e (diff) | |
| download | Tango-c95a8fbe2746db2c1ef73a2c373004b322bdb5bf.tar.gz Tango-c95a8fbe2746db2c1ef73a2c373004b322bdb5bf.zip | |
merge
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
3 files changed, 8 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesResponse.cs index 440e162a3..4fa23e872 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesResponse.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesResponse.cs @@ -27,5 +27,8 @@ namespace Tango.MachineStudio.Common.Update [DataMember] public String Password { get; set; } + + [DataMember] + public bool ForcedUpdate { get; set; } } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UpdateServiceHelper.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UpdateServiceHelper.cs index 2194ec5cf..067e4470d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UpdateServiceHelper.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UpdateServiceHelper.cs @@ -13,8 +13,8 @@ namespace Tango.MachineStudio.Common.Update public static ChannelFactory<IMachineStudioUpdateService> GetUpdateServiceChannel() { BasicHttpBinding binding = new BasicHttpBinding(BasicHttpSecurityMode.None); - binding.ReceiveTimeout = TimeSpan.FromSeconds(20); - binding.SendTimeout = TimeSpan.FromSeconds(20); + binding.ReceiveTimeout = TimeSpan.FromSeconds(60); + binding.SendTimeout = TimeSpan.FromSeconds(60); binding.MaxBufferPoolSize = 6553600; binding.MaxBufferSize = 6553600; binding.MaxReceivedMessageSize = 6553600; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs index 71ce04f1f..18f29eda2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs @@ -21,5 +21,8 @@ namespace Tango.MachineStudio.Common.Update [DataMember] public String Comments { get; set; } + + [DataMember] + public bool ForcedUpdate { get; set; } } } |