Get WinRT project compiling again

Author: bording

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

@@ -38,6 +38,7 @@
 //  Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+#if NETFX_CORE
 using RabbitMQ.Client.Exceptions;
 using RabbitMQ.Util;
 using System;
@@ -268,3 +269,4 @@ private void Connect(StreamSocket socket, AmqpTcpEndpoint endpoint, int timeout)
         }
     }
 }
+#endif

projects/client/RabbitMQ.Client.WinRT/src/client/impl/SocketFrameHandler.cs renamed to projects/client/RabbitMQ.Client.WinRT/src/client/impl/SocketFrameHandlerWinRT.cs

@@ -50,6 +50,7 @@
         "System.Net.Security": "4.0.0",
         "System.Net.Sockets": "4.1.0",
         "System.Reflection.Extensions": "4.0.1",
+        "System.Reflection.TypeExtensions": "4.1.0",
         "System.Runtime.Extensions": "4.1.0",
         "System.Text.RegularExpressions": "4.1.0",
         "System.Threading": "4.0.11",

projects/client/RabbitMQ.Client.WinRT/src/client/properties/AssemblyInfo.cs

@@ -1,12 +1,13 @@
-using System;
+#if !NETFX_CORE
+using System;
 using System.Threading.Tasks;
 
 using System.Net.Sockets;
 
 namespace RabbitMQ.Client
 {
     /// <summary>
-    /// Wrapper interface for standard TCP-client. Provides socket for socket frame handler class. 
+    /// Wrapper interface for standard TCP-client. Provides socket for socket frame handler class.
     /// </summary>
     /// <remarks>Contains all methods that are currenty in use in rabbitmq client.</remarks>
     public interface ITcpClient
@@ -24,3 +25,4 @@ public interface ITcpClient
         void Close();
     }
 }
+#endif

projects/client/RabbitMQ.Client/project.json

@@ -960,12 +960,14 @@ public void MaybeStartHeartbeatTimers()
         {
             if (Heartbeat != 0)
             {
-                _heartbeatWriteTimer = new Timer(HeartbeatWriteTimerCallback, null, 200, m_heartbeatTimeSpan.Milliseconds);
-                _heartbeatReadTimer = new Timer(HeartbeatReadTimerCallback, null, 200, m_heartbeatTimeSpan.Milliseconds);
 #if NETFX_CORE
+                _heartbeatWriteTimer = new Timer(HeartbeatWriteTimerCallback);
+                _heartbeatReadTimer = new Timer(HeartbeatReadTimerCallback);
                 _heartbeatWriteTimer.Change(200, (int)m_heartbeatTimeSpan.TotalMilliseconds);
                 _heartbeatReadTimer.Change(200, (int)m_heartbeatTimeSpan.TotalMilliseconds);
 #else
+                _heartbeatWriteTimer = new Timer(HeartbeatWriteTimerCallback, null, 200, m_heartbeatTimeSpan.Milliseconds);
+                _heartbeatReadTimer = new Timer(HeartbeatReadTimerCallback, null, 200, m_heartbeatTimeSpan.Milliseconds);
                 _heartbeatWriteTimer.Change(TimeSpan.FromMilliseconds(200), m_heartbeatTimeSpan);
                 _heartbeatReadTimer.Change(TimeSpan.FromMilliseconds(200), m_heartbeatTimeSpan);
 #endif

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

@@ -38,6 +38,7 @@
 //  Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+#if !NETFX_CORE
 using RabbitMQ.Client.Exceptions;
 using RabbitMQ.Util;
 using System;
@@ -50,7 +51,7 @@
 
 namespace RabbitMQ.Client.Impl
 {
-    static class TaskExtensions 
+    static class TaskExtensions
     {
         public static async Task TimeoutAfter(this Task task, int millisecondsTimeout)
         {
@@ -157,7 +158,7 @@ public int ReadTimeout
                 try
                 {
                     if (m_socket.Connected)
-                    {                        
+                    {
                         m_socket.ReceiveTimeout = value;
                     }
                 }
@@ -189,7 +190,7 @@ public void Close()
                     {
                         try
                         {
-                            
+
                         } catch (ArgumentException)
                         {
                             // ignore, we are closing anyway
@@ -287,15 +288,16 @@ private void Connect(ITcpClient socket, AmqpTcpEndpoint endpoint, int timeout)
             catch (SocketException e)
             {
                 throw new ConnectFailureException("Connection failed", e);
-            } 
+            }
             catch (NotSupportedException e)
             {
                 throw new ConnectFailureException("Connection failed", e);
-            } 
+            }
             catch (TimeoutException e)
             {
                 throw new ConnectFailureException("Connection failed", e);
             }
         }
     }
 }
+#endif

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

@@ -1,4 +1,5 @@
-using System;
+#if !NETFX_CORE
+using System;
 using System.Linq;
 using System.Net.Sockets;
 using System.Net;
@@ -72,4 +73,5 @@ public virtual int ReceiveTimeout
             }
         }
     }
-}
+}
+#endif

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

@@ -150,7 +150,7 @@ public static void DumpProperties(object value, TextWriter writer, int indent)
             {
                 Type t = value.GetType();
                 writer.WriteLine(t.FullName);
-#if !(CORECLR)
+#if !(NETFX_CORE)
                 foreach (PropertyInfo pi in t.GetProperties(BindingFlags.Instance
                                                             | BindingFlags.Public
                                                             | BindingFlags.DeclaredOnly))

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

@@ -38,6 +38,7 @@
 //  Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+#if !NETFX_CORE
 using System;
 using System.Net.Sockets;
 using System.Threading;
@@ -61,4 +62,5 @@ public void ConnectAsyncThrowsArgumentExceptionWhenNoAddressForAddressFamilyCanB
             });
         }
     }
-}
+}
+#endif