Merge branch 'master' into pipelines

# Conflicts:
#	StackExchange.Redis.StrongName/StackExchange.Redis.StrongName.csproj
#	StackExchange.Redis/StackExchange.Redis.csproj
#	StackExchange.Redis/StackExchange/Redis/SocketManager.cs

StackExchange.Redis.Tests/Failover.cs

@@ -142,8 +142,8 @@ public async Task DeslaveGoesToPrimary()
                 Writer.WriteLine("Connecting to secondary validation connection.");
                 using (var conn2 = ConnectionMultiplexer.Connect(config))
                 {
-                    var primary2 = conn.GetServer(TestConfig.Current.FailoverMasterServerAndPort);
-                    var secondary2 = conn.GetServer(TestConfig.Current.FailoverSlaveServerAndPort);
+                    var primary2 = conn2.GetServer(TestConfig.Current.FailoverMasterServerAndPort);
+                    var secondary2 = conn2.GetServer(TestConfig.Current.FailoverSlaveServerAndPort);
 
                     Writer.WriteLine($"Check: {primary2.EndPoint}: {primary2.ServerType}, Mode: {(primary2.IsSlave ? "Slave" : "Master")}");
                     Writer.WriteLine($"Check: {secondary2.EndPoint}: {secondary2.ServerType}, Mode: {(secondary2.IsSlave ? "Slave" : "Master")}");
@@ -151,7 +151,7 @@ public async Task DeslaveGoesToPrimary()
                     Assert.False(primary2.IsSlave, $"{primary2.EndPoint} should be a master (verification connection).");
                     Assert.True(secondary2.IsSlave, $"{secondary2.EndPoint} should be a slave (verification connection).");
 
-                    var db2 = conn.GetDatabase();
+                    var db2 = conn2.GetDatabase();
 
                     Assert.Equal(primary2.EndPoint, db2.IdentifyEndpoint(key, CommandFlags.PreferMaster));
                     Assert.Equal(primary2.EndPoint, db2.IdentifyEndpoint(key, CommandFlags.DemandMaster));

StackExchange.Redis/StackExchange/Redis/SocketManager.cs

@@ -183,9 +183,9 @@ void proxyCallback(IAsyncResult ar)
 
 
             var addressFamily = endpoint.AddressFamily == AddressFamily.Unspecified ? AddressFamily.InterNetwork : endpoint.AddressFamily;
-            var socket = new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp);
-
-            if (addressFamily != AddressFamily.Unix) SocketConnection.SetRecommendedClientOptions(socket);
+            var protocolType = addressFamily == AddressFamily.Unix ? ProtocolType.Unspecified : ProtocolType.Tcp;
+            var socket = new Socket(addressFamily, SocketType.Stream, protocolType);
+            SocketConnection.SetRecommendedClientOptions(socket);
 
             try
             {

TestConsole/TestConsole.csproj

@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\Pipelines.Sockets.Unofficial\src\Pipelines.Sockets.Unofficial\Pipelines.Sockets.Unofficial.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(Computername)'!='OCHO'">
-    <PackageReference Include="Pipelines.Sockets.Unofficial" Version="0.2.1-alpha.45" />
+    <PackageReference Include="Pipelines.Sockets.Unofficial" Version="0.2.1-alpha.48" />
   </ItemGroup>
 
 </Project>