dotnet core tests runner

 - reimplement connection timeouts

 - make it build against mono/.NET again

Author: kjnilsson

projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj

@@ -182,7 +182,6 @@
     <Compile Include="src\client\impl\StreamProperties.cs" />
     <Compile Include="src\client\impl\SyntaxError.cs" />
     <Compile Include="src\client\impl\TcpClientAdapter.cs" />
-    <Compile Include="src\client\impl\TunneledTcpClient.cs" />
     <Compile Include="src\client\impl\UnexpectedFrameException.cs" />
     <Compile Include="src\client\impl\UnknownClassOrMethodException.cs" />
     <Compile Include="src\client\impl\WireFormatting.cs" />
@@ -207,4 +206,4 @@
   <Target Name="BeforeBuild" DependsOnTargets="" />
   <!-- Custom BeforeClean -->
   <Target Name="BeforeClean" DependsOnTargets="" />
-</Project>
+</Project>

projects/client/RabbitMQ.Client/project.json

@@ -1,17 +1,28 @@
 {
   "version": "1.0.0-*",
   "buildOptions": {
-    "emitEntryPoint": true
+    "emitEntryPoint": true,
+    "compile": {
+      "exclude": [
+        "build",
+        "src/util/XmlUtil.cs"
+      ],
+      "include": [
+        "../../../gensrc/RabbitMQ.Client/autogenerated-api-0-9-1.cs"
+      ]
+    }
   },
   "dependencies": {
     "Microsoft.NETCore.App": {
       "type": "platform",
       "version": "1.0.0-rc2-3002702"
     }
   },
-  "code": ["**/*.cs"],
   "frameworks": {
     "netcoreapp1.0": {
+      "buildOptions": {
+        "define": [ "CORECLR" ]
+      },
       "imports": "dnxcore50",
       "dependencies": {
        "System.Runtime": "4.1.0-rc2-24027",

projects/client/RabbitMQ.Client/src/autogenerated-api-0-9-1.cs

@@ -79,7 +79,7 @@ public static ITcpClient DefaultSocketFactory(AddressFamily addressFamily)
                 NoDelay = true
             };
             return new TcpClientAdapter(socket);
-        }
+                }
 #endif
     }
 }

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactoryBase.cs

@@ -17,7 +17,7 @@ public interface ITcpClient
 
         Socket Client { get; }
 
-        void Connect(string host, int port);
+        Task ConnectAsync(string host, int port);
 
         NetworkStream GetStream();
 

projects/client/RabbitMQ.Client/src/client/api/ITcpClient.cs

@@ -57,8 +57,8 @@ public void ExecuteThunk()
 #if NETFX_CORE
                 // To end a task, return
                 return;
-#else
-                //Thread.CurrentThread..Interrupt(); //TODO: what to do?
+#else   
+                //Thread.CurrentThread.Interrupt(); //TODO: what to do?
 #endif
             }
         }

projects/client/RabbitMQ.Client/src/client/impl/ConsumerWorkService.cs

@@ -46,9 +46,21 @@
 using System.Collections.Generic;
 using System.Net.Sockets;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace RabbitMQ.Client.Impl
 {
+    static class TaskExtensions 
+    {
+        public static async Task TimeoutAfter(this Task task, int millisecondsTimeout)
+        {
+            if (task == await Task.WhenAny(task, Task.Delay(millisecondsTimeout))) 
+                await task;
+            else
+                throw new TimeoutException();
+        }
+    }
+
     public class SocketFrameHandler : IFrameHandler
     {
         // Timeout in seconds to wait for a clean socket close.
@@ -262,7 +274,11 @@ private void Connect(ITcpClient socket, AmqpTcpEndpoint endpoint, int timeout)
         {
             try
             {
-                socket.Connect(endpoint.HostName, endpoint.Port);
+                socket.ConnectAsync(endpoint.HostName, endpoint.Port)
+                            .TimeoutAfter(timeout)
+                            .ConfigureAwait(false)
+                            .GetAwaiter()//this ensures exceptions aren't wrapped in an AggregateException
+                            .GetResult();
             }
             catch (ArgumentException e)
             {
@@ -271,6 +287,11 @@ private void Connect(ITcpClient socket, AmqpTcpEndpoint endpoint, int timeout)
             catch (SocketException e)
             {
                 throw new ConnectFailureException("Connection failed", e);
+            } 
+            catch (TimeoutException)
+            {
+                socket.Close();
+                throw new TimeoutException("Connection to " + endpoint + " timed out");;
             }
         }
     }

projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler.cs

@@ -24,12 +24,14 @@ public TcpClientAdapter(Socket socket)
             this.sock = socket;
         }
 
-        public virtual void Connect(string host, int port)
+        public virtual Task ConnectAsync(string host, int port)
         {
-            var _host = IPAddress.Parse("127.0.0.1");
-            var ep =new IPEndPoint(_host, port);
-    
-            sock.Connect(ep);
+            #if CORECLR
+            return sock.ConnectAsync(host, port);
+            #else
+            sock.Connect(host, port);
+            return System.Threading.Tasks.Task.FromResult (false);
+            #endif
         }
 
         public virtual void Close()