diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-03-17 14:24:25 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-03-17 14:24:25 +0200 |
| commit | 38feb2cdb472f67d86a217074d9f7568c708dbb4 (patch) | |
| tree | 2f0d11043978a9dafea40232cab138ee6474d60f /Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate | |
| parent | aa9853ff33557531d89d8ce4f2eb196f45b0a591 (diff) | |
| parent | c8629b193fd4fa38f72905f1c33abe737f81a340 (diff) | |
| download | Tango-38feb2cdb472f67d86a217074d9f7568c708dbb4.tar.gz Tango-38feb2cdb472f67d86a217074d9f7568c708dbb4.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs index 3fffc2045..b64b624fe 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs @@ -75,13 +75,10 @@ namespace Tango.PPC.Common.MachineUpdate private Task Login(String serialNumber) { - return Task.Factory.StartNew(() => + return _client.Login(new LoginRequest() { - return _client.Login(new LoginRequest() - { - Mode = LoginMode.Machine, - SerialNumber = serialNumber, - }).Result; + Mode = LoginMode.Machine, + SerialNumber = serialNumber, }); } @@ -310,7 +307,7 @@ namespace Tango.PPC.Common.MachineUpdate LogManager.Log($"Connecting to machine service on {machineServiceAddress}..."); - Login(serialNumber).Wait(); + Login(serialNumber).GetAwaiter().GetResult(); LogManager.Log($"Checking if updates available..."); |