Merge branch 'stable'

Author: michaelklishin

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

@@ -64,6 +64,8 @@ public class AutorecoveringConnection : IConnection, IRecoverable
         public readonly object m_recordedEntitiesLock = new object();
         protected readonly TaskFactory recoveryTaskFactory = new TaskFactory();
         protected readonly object recoveryLockTarget = new object();
+        // used to block connection recovery attempts after Close() is unvoked
+        protected bool manuallyClosed = false;
         protected bool performingRecovery = false;
 
         protected List<AutorecoveringModel> m_models = new List<AutorecoveringModel>();
@@ -332,18 +334,21 @@ public void BeginAutomaticRecovery()
 
                     recoveryTaskFactory.StartNew(() =>
                     {
-                        try
+                        if(!self.manuallyClosed)
                         {
+                            try
+                            {
 #if NETFX_CORE
                             System.Threading.Tasks.Task.Delay(m_factory.NetworkRecoveryInterval).Wait();
 #else
                             Thread.Sleep(m_factory.NetworkRecoveryInterval);
 #endif
-                            self.PerformAutomaticRecovery();
-                        }
-                        finally
-                        {
-                            performingRecovery = false;
+                                self.PerformAutomaticRecovery();
+                            }
+                            finally
+                            {
+                                performingRecovery = false;
+                            }
                         }
                     });
                 }
@@ -608,48 +613,56 @@ protected void Init(string hostname)
         ///<summary>API-side invocation of connection abort.</summary>
         public void Abort()
         {
+            this.manuallyClosed = true;
             m_delegate.Abort();
         }
 
         ///<summary>API-side invocation of connection abort.</summary>
         public void Abort(ushort reasonCode, string reasonText)
         {
+            this.manuallyClosed = true;
             m_delegate.Abort(reasonCode, reasonText);
         }
 
         ///<summary>API-side invocation of connection abort with timeout.</summary>
         public void Abort(int timeout)
         {
+            this.manuallyClosed = true;
             m_delegate.Abort(timeout);
         }
 
         ///<summary>API-side invocation of connection abort with timeout.</summary>
         public void Abort(ushort reasonCode, string reasonText, int timeout)
         {
+            this.manuallyClosed = true;
             m_delegate.Abort(reasonCode, reasonText, timeout);
         }
 
         ///<summary>API-side invocation of connection.close.</summary>
         public void Close()
         {
+            this.manuallyClosed = true;
             m_delegate.Close();
         }
 
         ///<summary>API-side invocation of connection.close.</summary>
         public void Close(ushort reasonCode, string reasonText)
         {
+            this.manuallyClosed = true;
             m_delegate.Close(reasonCode, reasonText);
         }
 
         ///<summary>API-side invocation of connection.close with timeout.</summary>
         public void Close(int timeout)
         {
+            this.manuallyClosed = true;
             m_delegate.Close(timeout);
         }
 
         ///<summary>API-side invocation of connection.close with timeout.</summary>
         public void Close(ushort reasonCode, string reasonText, int timeout)
         {
+            this.manuallyClosed = true;
             m_delegate.Close(reasonCode, reasonText, timeout);
         }
 

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

@@ -47,7 +47,8 @@
   </PropertyGroup>
   <Target Name="ImportSSL" Condition="$(SSLAvail)">
     <!-- import cacert into certmgr -->
-    <Exec Command="certmgr -add -c Trust $(SSLCertsDir)/testca/cacert.cer" />
+    <!-- <Exec Command="certmgr -c -add -s $(SSLCertsDir)\testca\cacert.cer -r localMachine Root" /> -->
+    <Exec Command="certutil -addstore Root $(SSLCertsDir)\testca\cacert.cer" />
   </Target>
   <!-- Decide whether we need to set TEMP under mono -->
   <PropertyGroup>