aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2019-03-14 13:37:03 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2019-03-14 13:37:03 +0200
commitc4e05851c9d3ab73ebf0a81e9aef5ca7f8cec83a (patch)
tree4d09a81d13575be6dcdc0f1abe1253e8fb2ef03c /Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
parentf3321a419c0566ddf05cdc2966a2c28f1bdb1ebd (diff)
parent13c98855c9340386e29df539790d88446b1190aa (diff)
downloadTango-c4e05851c9d3ab73ebf0a81e9aef5ca7f8cec83a.tar.gz
Tango-c4e05851c9d3ab73ebf0a81e9aef5ca7f8cec83a.zip
MERGE
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs11
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...");