Merge branch 'stable', upgrade to VS 2015 with Resharper 9.x

Author: michaelklishin

RabbitMQDotNetClient.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{068D7DC3-8E6E-4951-B9E3-272C641BF0DE}"
 EndProject
@@ -25,6 +25,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.WinRT", "projects\client\RabbitMQ.Client.WinRT\RabbitMQ.Client.WinRT.csproj", "{61D29F90-5B1C-4748-89FC-9FD2937F09C6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E8B8DC5-3837-46E9-90D7-8391CC62AB45} = {9E8B8DC5-3837-46E9-90D7-8391CC62AB45}
+		{71713FDD-D5EC-40B2-A924-76F80AD57E12} = {71713FDD-D5EC-40B2-A924-76F80AD57E12}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Unit.WinRT", "projects\client\Unit.WinRT\RabbitMQ.Client.Unit.WinRT.csproj", "{897505A9-8373-4F41-8DE8-221BF06D877D}"

RabbitMQDotNetClient.sln.DotSettings

@@ -121,7 +121,10 @@
       <And>
         <Kind Is="Class" />
         <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="true" />
+<<<<<<< HEAD
         &lt;HasAttribute Name="NUnit.Framework.TestCaseFixtureAttribute" Inherited="true" /&gt;&#xD;
+=======
+>>>>>>> stable
       &lt;/And&gt;&#xD;
     &lt;/TypePattern.Match&gt;&#xD;
 &#xD;

projects/client/Apigen/RabbitMQ.Client.Apigen.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp40</s:String></wpf:ResourceDictionary>

projects/client/ApigenBootstrap/RabbitMQ.Client.ApigenBootstrap.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp40</s:String></wpf:ResourceDictionary>

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

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp40</s:String></wpf:ResourceDictionary>

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

@@ -1025,40 +1025,47 @@ public void StartMainLoop(bool useBackgroundThread)
         public void HeartbeatReadTimerCallback(object state)
         {
             bool shouldTerminate = false;
-            if (!m_closed)
+            try
             {
-                if (!m_heartbeatRead.WaitOne(0))
+                if (!m_closed)
                 {
-                    m_missedHeartbeats++;
+                    if (!m_heartbeatRead.WaitOne(0))
+                    {
+                        m_missedHeartbeats++;
+                    }
+                    else
+                    {
+                        m_missedHeartbeats = 0;
+                    }
+
+                    // We check against 8 = 2 * 4 because we need to wait for at
+                    // least two complete heartbeat setting intervals before
+                    // complaining, and we've set the socket timeout to a quarter
+                    // of the heartbeat setting in setHeartbeat above.
+                    if (m_missedHeartbeats > 2 * 4)
+                    {
+                        String description = String.Format("Heartbeat missing with heartbeat == {0} seconds", m_heartbeat);
+                        var eose = new EndOfStreamException(description);
+                        m_shutdownReport.Add(new ShutdownReportEntry(description, eose));
+                        HandleMainLoopException(
+                            new ShutdownEventArgs(ShutdownInitiator.Library, 0, "End of stream", eose));
+                        shouldTerminate = true;
+                    }
                 }
-                else
+
+                if (shouldTerminate)
                 {
-                    m_missedHeartbeats = 0;
+                    TerminateMainloop();
+                    FinishClose();
                 }
-
-                // We check against 8 = 2 * 4 because we need to wait for at
-                // least two complete heartbeat setting intervals before
-                // complaining, and we've set the socket timeout to a quarter
-                // of the heartbeat setting in setHeartbeat above.
-                if (m_missedHeartbeats > 2 * 4)
+                else
                 {
-                    String description = String.Format("Heartbeat missing with heartbeat == {0} seconds", m_heartbeat);
-                    var eose = new EndOfStreamException(description);
-                    m_shutdownReport.Add(new ShutdownReportEntry(description, eose));
-                    HandleMainLoopException(
-                        new ShutdownEventArgs(ShutdownInitiator.Library, 0, "End of stream", eose));
-                    shouldTerminate = true;
+                    _heartbeatReadTimer.Change(Heartbeat * 1000, Timeout.Infinite);
                 }
-             }
-
-            if (shouldTerminate)
-            {
-                TerminateMainloop();
-                FinishClose();
-            }
-            else
+            } catch (ObjectDisposedException ignored)
             {
-                _heartbeatReadTimer.Change(Heartbeat * 1000, Timeout.Infinite);
+                // timer is already disposed,
+                // e.g. due to shutdown
             }
         }
 
@@ -1067,26 +1074,33 @@ public void HeartbeatWriteTimerCallback(object state)
             bool shouldTerminate = false;
             try
             {
-                if (!m_closed)
+                try
                 {
-                    WriteFrame(m_heartbeatFrame);
-                    m_frameHandler.Flush();
+                    if (!m_closed)
+                    {
+                        WriteFrame(m_heartbeatFrame);
+                        m_frameHandler.Flush();
+                    }
+                }
+                catch (Exception e)
+                {
+                    HandleMainLoopException(new ShutdownEventArgs(
+                        ShutdownInitiator.Library,
+                        0,
+                        "End of stream",
+                        e));
+                    shouldTerminate = true;
                 }
-            }
-            catch (Exception e)
-            {
-                HandleMainLoopException(new ShutdownEventArgs(
-                    ShutdownInitiator.Library,
-                    0,
-                    "End of stream",
-                    e));
-                shouldTerminate = true;
-            }
 
-            if (m_closed || shouldTerminate)
+                if (m_closed || shouldTerminate)
+                {
+                    TerminateMainloop();
+                    FinishClose();
+                }
+            } catch (ObjectDisposedException ignored)
             {
-                TerminateMainloop();
-                FinishClose();
+                // timer is already disposed,
+                // e.g. due to shutdown
             }
         }
 

projects/client/Unit/RabbitMQ.Client.Unit.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp40</s:String></wpf:ResourceDictionary>