Narrow scope of NETSTANDARD1_3 block.

bgrainger · bgrainger · commit ff7323cc44c4 · 2017-12-04T21:16:41.000-08:00
diff --git a/src/MySqlConnector/Core/ServerSession.cs b/src/MySqlConnector/Core/ServerSession.cs
@@ -625,19 +625,19 @@ private async Task<bool> OpenTcpSocketAsync(ConnectionSettings cs, ILoadBalancer
 				IPAddress[] ipAddresses;
 				try
 				{
-#if NETSTANDARD1_3
-// Dns.GetHostAddresses isn't available until netstandard 2.0: https://github.com/dotnet/corefx/pull/11950
-					ipAddresses = await Dns.GetHostAddressesAsync(hostName).ConfigureAwait(false);
-#else
 					if (ioBehavior == IOBehavior.Asynchronous)
 					{
 						ipAddresses = await Dns.GetHostAddressesAsync(hostName).ConfigureAwait(false);
 					}
 					else
 					{
+#if NETSTANDARD1_3
+						// Dns.GetHostAddresses isn't available until netstandard 2.0: https://github.com/dotnet/corefx/pull/11950
+						ipAddresses = await Dns.GetHostAddressesAsync(hostName).ConfigureAwait(false);
+#else
 						ipAddresses = Dns.GetHostAddresses(hostName);
-					}
 #endif
+					}
 				}
 				catch (SocketException)
 				{

Original file line number	Diff line number	Diff line change
`@@ -625,19 +625,19 @@ private async Task<bool> OpenTcpSocketAsync(ConnectionSettings cs, ILoadBalancer`
`625`	`625`	`IPAddress[] ipAddresses;`
`626`	`626`	`try`
`627`	`627`	`{`
`628`		`-#if NETSTANDARD1_3`
`629`		`-// Dns.GetHostAddresses isn't available until netstandard 2.0: https://github.com/dotnet/corefx/pull/11950`
`630`		`- ipAddresses = await Dns.GetHostAddressesAsync(hostName).ConfigureAwait(false);`
`631`		`-#else`
`632`	`628`	`if (ioBehavior == IOBehavior.Asynchronous)`
`633`	`629`	`{`
`634`	`630`	`ipAddresses = await Dns.GetHostAddressesAsync(hostName).ConfigureAwait(false);`
`635`	`631`	`}`
`636`	`632`	`else`
`637`	`633`	`{`
	`634`	`+#if NETSTANDARD1_3`
	`635`	`+ // Dns.GetHostAddresses isn't available until netstandard 2.0: https://github.com/dotnet/corefx/pull/11950`
	`636`	`+ ipAddresses = await Dns.GetHostAddressesAsync(hostName).ConfigureAwait(false);`
	`637`	`+#else`
`638`	`638`	`ipAddresses = Dns.GetHostAddresses(hostName);`
`639`		`- }`
`640`	`639`	`#endif`
	`640`	`+ }`
`641`	`641`	`}`
`642`	`642`	`catch (SocketException)`
`643`	`643`	`{`