Skip to content

Commit 25bb64f

Browse files
committed
Avoid using Result and Wait() on Task<T>.
1 parent 95f0f22 commit 25bb64f

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/Renci.SshNet/Abstractions/DnsAbstraction.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
using System.Net;
33
using System.Net.Sockets;
44

5-
#if FEATURE_DEVICEINFORMATION_APM
5+
#if FEATURE_DNS_SYNC
6+
#elif FEATURE_DNS_APM
7+
using Renci.SshNet.Common;
8+
#elif FEATURE_DNS_TAP
9+
#elif FEATURE_DEVICEINFORMATION_APM
610
using System.Collections.Generic;
711
using System.Linq;
812
using System.Threading;
913
using Microsoft.Phone.Net.NetworkInformation;
10-
#endif // FEATURE_DEVICEINFORMATION_APM
11-
12-
#if FEATURE_DATAGRAMSOCKET
14+
#elif FEATURE_DATAGRAMSOCKET
1315
using System.Collections.Generic;
1416
using Windows.Networking;
1517
using Windows.Networking.Sockets;
16-
#endif // FEATURE_DATAGRAMSOCKET
18+
#endif
1719

1820
namespace Renci.SshNet.Abstractions
1921
{
@@ -41,7 +43,7 @@ public static IPAddress[] GetHostAddresses(string hostNameOrAddress)
4143
throw new SshOperationTimeoutException("Timeout resolving host name.");
4244
return Dns.EndGetHostAddresses(asyncResult);
4345
#elif FEATURE_DNS_TAP
44-
return Dns.GetHostAddressesAsync(hostNameOrAddress).Result;
46+
return Dns.GetHostAddressesAsync(hostNameOrAddress).GetAwaiter().GetResult();
4547
#else
4648
IPAddress address;
4749
if (IPAddress.TryParse(hostNameOrAddress, out address))

src/Renci.SshNet/Abstractions/ThreadAbstraction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static void Sleep(int millisecondsTimeout)
1313
#if FEATURE_THREAD_SLEEP
1414
System.Threading.Thread.Sleep(millisecondsTimeout);
1515
#elif FEATURE_THREAD_TAP
16-
System.Threading.Tasks.Task.Delay(millisecondsTimeout).Wait();
16+
System.Threading.Tasks.Task.Delay(millisecondsTimeout).GetAwaiter().GetResult();
1717
#else
1818
#error Suspend of the current thread is not implemented.
1919
#endif

src/Renci.SshNet/Shell.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void Start()
135135

136136
if (WaitHandle.WaitAny(new[] {readWaitHandle, _channelClosedWaitHandle}) == 0)
137137
{
138-
var read = readTask.Result;
138+
var read = readTask.GetAwaiter().GetResult();
139139
_channel.SendData(buffer, 0, read);
140140
continue;
141141
}

0 commit comments

Comments
 (0)