Merge branch 'hotfix-1.11.1'

Particular · Mar 10, 2016 · a5af008 · a5af008
2 parents fde133e + e6f42b7
commit a5af008
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 6 deletions.
diff --git a/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj b/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
@@ -81,7 +81,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NServiceBus.Transports.SQLServer, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.SqlServer.2.2.1\lib\net45\NServiceBus.Transports.SQLServer.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.SqlServer.2.2.2\lib\net45\NServiceBus.Transports.SQLServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="RabbitMQ.Client, Version=3.5.4.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">

diff --git a/src/ServicControlInstaller.Packaging/packages.config b/src/ServicControlInstaller.Packaging/packages.config
@@ -10,7 +10,7 @@
   <package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="6.4.0" targetFramework="net45" />
   <package id="NServiceBus.Azure.Transports.WindowsAzureStorageQueues" version="6.2.1" targetFramework="net45" />
   <package id="NServiceBus.RabbitMQ" version="3.0.1" targetFramework="net45" />
-  <package id="NServiceBus.SqlServer" version="2.2.1" targetFramework="net45" />
+  <package id="NServiceBus.SqlServer" version="2.2.2" targetFramework="net45" />
   <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
   <package id="WindowsAzure.ServiceBus" version="2.6.0" targetFramework="net45" />

diff --git a/...trol.AcceptanceTests/CustomChecks/Custom_check_transition_should_trigger_signalr_event.cs b/...trol.AcceptanceTests/CustomChecks/Custom_check_transition_should_trigger_signalr_event.cs
@@ -86,6 +86,8 @@ public void Start()
                             {
                                 break;
                             }
+
+                            Thread.Sleep(TimeSpan.FromSeconds(1));
                         }
                     }
                 }

diff --git a/src/ServiceControl.AcceptanceTests/CustomChecks/When_a_periodic_custom_check_fails.cs b/src/ServiceControl.AcceptanceTests/CustomChecks/When_a_periodic_custom_check_fails.cs
@@ -3,6 +3,7 @@
     using System;
     using System.Linq;
     using System.Net;
+    using System.Threading;
     using Contexts;
     using Microsoft.AspNet.SignalR.Client;
     using NServiceBus;
@@ -88,12 +89,15 @@ public void Start()
                     {
                         try
                         {
+                            context.AddTrace("Connecting to signalr");
                             connection.Start().Wait();
-
+                            context.AddTrace("Connected to signalr");
                             break;
                         }
                         catch (AggregateException ex)
                         {
+                            context.AddTrace(string.Format("Signalr connection failed, exception={0}", ex));
+
                             var exception = ex.GetBaseException();
                             var webException = exception as WebException;
 
@@ -106,6 +110,8 @@ public void Start()
                             {
                                 break;
                             }
+
+                            Thread.Sleep(TimeSpan.FromSeconds(1));
                         }
                     }
                 }

diff --git a/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_message_has_failed.cs b/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_message_has_failed.cs
@@ -4,6 +4,7 @@
     using System.Linq;
     using System.Net;
     using System.Text.RegularExpressions;
+    using System.Threading;
     using Contexts;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
@@ -185,6 +186,8 @@ public void Start()
                             {
                                 break;
                             }
+
+                            Thread.Sleep(TimeSpan.FromSeconds(1));
                         }
                     }
 

diff --git a/...ol.AcceptanceTests/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs b/...ol.AcceptanceTests/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs
@@ -45,7 +45,9 @@ public void Should_show_up_as_resolved_when_doing_a_single_retry()
 
         bool GetFailedMessage(MyContext c, out FailedMessage failure, Predicate<FailedMessage> condition = null)
         {
-            if (!TryGet("/api/errors/" + c.UniqueMessageId, out failure, condition))
+            failure = null;
+
+            if (String.IsNullOrEmpty(c.UniqueMessageId) || !TryGet("/api/errors/" + c.UniqueMessageId, out failure, condition))
             {
                 return false;
             }

diff --git a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
@@ -105,7 +105,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NServiceBus.Transports.SQLServer, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.SqlServer.2.2.1\lib\net45\NServiceBus.Transports.SQLServer.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.SqlServer.2.2.2\lib\net45\NServiceBus.Transports.SQLServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

diff --git a/src/ServiceControl.AcceptanceTests/When_signalr_receives_a_message.cs b/src/ServiceControl.AcceptanceTests/When_signalr_receives_a_message.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Net;
+    using System.Threading;
     using Contexts;
     using Microsoft.AspNet.SignalR.Client;
     using NServiceBus;
@@ -54,6 +55,8 @@ public void Should_be_imported_and_accessible_via_the_rest_api()
                                 {
                                     break;
                                 }
+
+                                Thread.Sleep(TimeSpan.FromSeconds(1));
                             }
                         }
 

diff --git a/src/ServiceControl.AcceptanceTests/packages.config b/src/ServiceControl.AcceptanceTests/packages.config
@@ -15,7 +15,7 @@
   <package id="NServiceBus.Azure.Transports.WindowsAzureStorageQueues" version="6.2.1" targetFramework="net451" />
   <package id="NServiceBus.NLog" version="1.1.0" targetFramework="net451" />
   <package id="NServiceBus.RabbitMQ" version="3.0.1" targetFramework="net451" />
-  <package id="NServiceBus.SqlServer" version="2.2.1" targetFramework="net451" />
+  <package id="NServiceBus.SqlServer" version="2.2.2" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net451" />
   <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net451" />
   <package id="RavenDB.Client" version="2.5.2962" targetFramework="net451" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,6 +86,8 @@ public void Start() @@
                                 {
                                     break;
                                 }
+                                Thread.Sleep(TimeSpan.FromSeconds(1));
                             }
                         }
                     }
@@ Expand Down @@