Merge pull request #131 from Particular/release-3.1.0

bording · bording · commit e8a251e44040 · 2016-03-17T16:14:02.000-04:00
Release 3.1.0
diff --git a/packaging/nuget/NServiceBus.RabbitMQ.nuspec b/packaging/nuget/NServiceBus.RabbitMQ.nuspec
@@ -16,7 +16,7 @@
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies>
       <dependency id="NServiceBus" version="[5.0.0, 6.0.0)" />
-      <dependency id="RabbitMQ.Client" version="[3.5.0, 3.6.0)" />
+      <dependency id="RabbitMQ.Client" version="[3.6.0, 3.7.0)" />
     </dependencies>
   </metadata>
   <files>
diff --git a/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj b/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj
@@ -44,9 +44,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.5.0\lib\net40\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=3.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.3.6.1\lib\net45\RabbitMQ.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
diff --git a/src/NServiceBus.RabbitMQ.AcceptanceTests/When_using_a_custom_message_id_strategy.cs b/src/NServiceBus.RabbitMQ.AcceptanceTests/When_using_a_custom_message_id_strategy.cs
@@ -36,7 +36,7 @@ public void Should_be_able_to_receive_messages_with_no_id()
                                //for now until we can patch the serializer to infer the type based on the root node
                                properties.Headers = new Dictionary<string, object> { { Headers.EnclosedMessageTypes, typeof(MyRequest).FullName } };
 
-                               channel.BasicPublish(string.Empty, unicastBus.Configure.LocalAddress.Queue, true, false, properties, stream.ToArray());
+                               channel.BasicPublish(string.Empty, unicastBus.Configure.LocalAddress.Queue, true, properties, stream.ToArray());
                            }
 
                        }
diff --git a/src/NServiceBus.RabbitMQ.AcceptanceTests/packages.config b/src/NServiceBus.RabbitMQ.AcceptanceTests/packages.config
@@ -4,7 +4,7 @@
   <package id="NServiceBus.AcceptanceTesting" version="5.2.0" targetFramework="net45" />
   <package id="NServiceBus.AcceptanceTests.Sources" version="5.2.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="RabbitMQ.Client" version="3.5.0" targetFramework="net45" />
+  <package id="RabbitMQ.Client" version="3.6.1" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
diff --git a/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj b/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj
@@ -67,9 +67,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.5.0\lib\net40\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=3.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.3.6.1\lib\net45\RabbitMQ.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/NServiceBus.RabbitMQ.Tests/When_consuming_messages.cs b/src/NServiceBus.RabbitMQ.Tests/When_consuming_messages.cs
@@ -22,7 +22,7 @@ public void Should_block_until_a_message_is_available()
 
             var message = new TransportMessage();
 
-            sender.Send(message,new SendOptions(address));
+            sender.Send(message, new SendOptions(address));
 
 
             var received = WaitForMessage();
@@ -46,7 +46,7 @@ public void Should_be_able_to_receive_messages_without_headers()
 
                 properties.MessageId = message.Id;
 
-                channel.BasicPublish(string.Empty, address.Queue, true, false, properties, message.Body);
+                channel.BasicPublish(string.Empty, address.Queue, true, properties, message.Body);
             }
 
             var received = WaitForMessage();
@@ -69,13 +69,13 @@ public void Should_be_able_to_receive_a_blank_message()
 
                 properties.MessageId = message.Id;
 
-                channel.BasicPublish(string.Empty, address.Queue, true, false, properties, message.Body);
+                channel.BasicPublish(string.Empty, address.Queue, true, properties, message.Body);
             }
 
             var received = WaitForMessage();
 
 
-            Assert.NotNull(received.Id,"The message id should be defaulted to a new guid if not set");
+            Assert.NotNull(received.Id, "The message id should be defaulted to a new guid if not set");
         }
 
 
@@ -92,10 +92,10 @@ public void Should_up_convert_the_native_type_to_the_enclosed_message_types_head
             {
                 var properties = channel.CreateBasicProperties();
 
-                properties.MessageId = message.Id; 
+                properties.MessageId = message.Id;
                 properties.Type = typeName;
 
-                channel.BasicPublish(string.Empty, address.Queue, true, false, properties, message.Body);
+                channel.BasicPublish(string.Empty, address.Queue, true, properties, message.Body);
             }
 
             var received = WaitForMessage();
@@ -117,7 +117,7 @@ public void Should_listen_to_the_callback_queue_as_well()
 
                 properties.MessageId = message.Id;
 
-                channel.BasicPublish(string.Empty, address.Queue+"."+RuntimeEnvironment.MachineName, true, false, properties, message.Body);
+                channel.BasicPublish(string.Empty, address.Queue + "." + RuntimeEnvironment.MachineName, true, properties, message.Body);
             }
 
 
diff --git a/src/NServiceBus.RabbitMQ.Tests/When_sending_a_message_over_rabbitmq.cs b/src/NServiceBus.RabbitMQ.Tests/When_sending_a_message_over_rabbitmq.cs
@@ -24,7 +24,7 @@ public void Should_populate_the_body()
         [Test]
         public void Should_set_the_content_type()
         {
-            VerifyRabbit(new TransportMessageBuilder().WithHeader(Headers.ContentType, "application/json"),
+            VerifyRabbit(new TransportMessageBuilder().WithHeader(NServiceBus.Headers.ContentType, "application/json"),
                 received => Assert.AreEqual("application/json", received.BasicProperties.ContentType));
 
         }
@@ -45,7 +45,7 @@ public void Should_set_the_message_type_based_on_the_encoded_message_types_heade
         {
             var messageType = typeof (MyMessage);
 
-            VerifyRabbit(new TransportMessageBuilder().WithHeader(Headers.EnclosedMessageTypes, messageType.AssemblyQualifiedName),
+            VerifyRabbit(new TransportMessageBuilder().WithHeader(NServiceBus.Headers.EnclosedMessageTypes, messageType.AssemblyQualifiedName),
                 received => Assert.AreEqual(messageType.FullName, received.BasicProperties.Type));
 
         }
diff --git a/src/NServiceBus.RabbitMQ.Tests/packages.config b/src/NServiceBus.RabbitMQ.Tests/packages.config
@@ -4,5 +4,5 @@
   <package id="NLog" version="3.2.0.0" targetFramework="net45" />
   <package id="NServiceBus" version="5.2.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="RabbitMQ.Client" version="3.5.0" targetFramework="net45" />
+  <package id="RabbitMQ.Client" version="3.6.1" targetFramework="net45" />
 </packages>
diff --git a/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj b/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj
@@ -16,7 +16,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <NuGetPackageImportStamp>76bed58f</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -47,22 +48,22 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Janitor">
-      <HintPath>..\packages\Janitor.Fody.1.1.0.0\Lib\portable-net4+sl5+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\Janitor.dll</HintPath>
+    <Reference Include="Janitor, Version=1.1.6.0, Culture=neutral, PublicKeyToken=d34c7d3bba3746e6, processorArchitecture=MSIL">
+      <HintPath>..\packages\Janitor.Fody.1.1.6.0\Lib\dotnet\Janitor.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NServiceBus.5.2.0\lib\net45\NServiceBus.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Obsolete">
-      <HintPath>..\packages\Obsolete.Fody.3.1.0.0\Lib\NET35\Obsolete.dll</HintPath>
+    <Reference Include="Obsolete, Version=4.0.4.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
+      <HintPath>..\packages\Obsolete.Fody.4.0.4\Lib\dotnet\Obsolete.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.5.0\lib\net40\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=3.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.3.6.1\lib\net45\RabbitMQ.Client.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -119,11 +120,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
     <Error Condition="!Exists('..\packages\NuGetPackager.0.5.5\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.5.5\build\NuGetPackager.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
   </Target>
-  <Import Project="..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.4\build\Fody.targets')" />
   <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
   <Import Project="..\packages\NuGetPackager.0.5.5\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.5.5\build\NuGetPackager.targets')" />
+  <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
 </Project>
diff --git a/src/NServiceBus.RabbitMQ/PersistentConnection.cs b/src/NServiceBus.RabbitMQ/PersistentConnection.cs
@@ -2,7 +2,6 @@ namespace NServiceBus.Transports.RabbitMQ
 {
     using System;
     using System.Collections.Generic;
-    using System.Net;
     using System.Threading;
     using global::RabbitMQ.Client;
     using global::RabbitMQ.Client.Events;
@@ -291,8 +290,6 @@ public void Dispose()
         readonly string purpose;
 
         static readonly ILog Logger = LogManager.GetLogger(typeof (RabbitMqConnectionManager));
-        public EndPoint LocalEndPoint { get { return connection.LocalEndPoint; }}
-        public EndPoint RemoteEndPoint { get { return connection.RemoteEndPoint; } }
         public int LocalPort { get { return connection.LocalPort; } }
         public int RemotePort { get { return connection.RemotePort; } }
     }
diff --git a/src/NServiceBus.RabbitMQ/RabbitMqDequeueStrategy.cs b/src/NServiceBus.RabbitMQ/RabbitMqDequeueStrategy.cs
@@ -12,7 +12,7 @@
 
 
     class RabbitMqDequeueStrategy : IDequeueMessages, IDisposable
-    {   
+    {
         public RabbitMqDequeueStrategy(IManageRabbitMqConnections connectionManager, RepeatedFailuresOverTimeCircuitBreaker circuitBreaker, ReceiveOptions receiveOptions)
         {
             this.connectionManager = connectionManager;
@@ -26,7 +26,7 @@ public void Init(Address address, TransactionSettings transactionSettings, Func<
             this.endProcessMessage = endProcessMessage;
             workQueue = address.Queue;
 
-            noAck = !transactionSettings.IsTransactional;
+            shouldAckBeforeProcessingMessage = !transactionSettings.IsTransactional;
 
             if (receiveOptions.PurgeOnStartup)
             {
@@ -46,7 +46,7 @@ public void Start(int maximumConcurrencyLevel)
             {
                 actualPrefetchCount = Convert.ToUInt16(maximumConcurrencyLevel);
 
-                Logger.InfoFormat("No prefetch count configured, defaulting to {0} (the configured concurrency level)", actualPrefetchCount);                
+                Logger.InfoFormat("No prefetch count configured, defaulting to {0} (the configured concurrency level)", actualPrefetchCount);
             }
 
 
@@ -71,7 +71,7 @@ public void Start(int maximumConcurrencyLevel)
                     StartConsumer(secondaryReceiveSettings.ReceiveQueue);
                 }
 
-                Logger.InfoFormat("Secondary receiver for queue '{0}' initiated with concurrency '{1}'", secondaryReceiveSettings.ReceiveQueue, secondaryReceiveSettings.MaximumConcurrencyLevel);                
+                Logger.InfoFormat("Secondary receiver for queue '{0}' initiated with concurrency '{1}'", secondaryReceiveSettings.ReceiveQueue, secondaryReceiveSettings.MaximumConcurrencyLevel);
             }
         }
 
@@ -85,7 +85,7 @@ public void Stop()
             {
                 return;
             }
-            
+
             isStopping = true;
 
             if (tokenSource == null)
@@ -126,7 +126,7 @@ void StartConsumer(string queue)
                 {
                     t.Exception.Handle(ex =>
                     {
-                        Logger.Error("Failed to receive messages from " + queue,t.Exception);
+                        Logger.Error("Failed to receive messages from " + queue, t.Exception);
                         circuitBreaker.Failure(ex);
                         return true;
                     });
@@ -156,7 +156,7 @@ void ConsumeMessages(object state)
 
                     var consumer = new QueueingBasicConsumer(channel);
 
-                    channel.BasicConsume(parameters.Queue, noAck,receiveOptions.ConsumerTag, consumer);
+                    channel.BasicConsume(parameters.Queue, false, receiveOptions.ConsumerTag, consumer);
 
                     circuitBreaker.Success();
 
@@ -170,6 +170,11 @@ void ConsumeMessages(object state)
                             continue;
                         }
 
+                        if (shouldAckBeforeProcessingMessage)
+                        {
+                            channel.BasicAck(message.DeliveryTag, false);
+                        }
+
                         TransportMessage transportMessage = null;
 
                         try
@@ -193,7 +198,7 @@ void ConsumeMessages(object state)
                                 messageProcessedOk = tryProcessMessage(transportMessage);
                             }
 
-                            if (!noAck)
+                            if (!shouldAckBeforeProcessingMessage)
                             {
                                 if (messageProcessedOk)
                                 {
@@ -209,7 +214,7 @@ void ConsumeMessages(object state)
                         {
                             exception = ex;
 
-                            if (!noAck)
+                            if (!shouldAckBeforeProcessingMessage)
                             {
                                 channel.BasicReject(message.DeliveryTag, true);
                             }
@@ -277,7 +282,7 @@ void Purge()
 
         RepeatedFailuresOverTimeCircuitBreaker circuitBreaker;
 
-        bool noAck;
+        bool shouldAckBeforeProcessingMessage;
         SemaphoreSlim tracksRunningThreads;
         Action<TransportMessage, Exception> endProcessMessage;
         CancellationTokenSource tokenSource;
diff --git a/src/NServiceBus.RabbitMQ/RabbitMqTransportMessageExtensions.cs b/src/NServiceBus.RabbitMQ/RabbitMqTransportMessageExtensions.cs
@@ -21,21 +21,21 @@ public static void FillRabbitMqProperties(TransportMessage message, DeliveryOpti
                 properties.Expiration = message.TimeToBeReceived.TotalMilliseconds.ToString();
             }
 
-            properties.SetPersistent(message.Recoverable);
+            properties.Persistent = message.Recoverable;
 
             properties.Headers = message.Headers.ToDictionary(p => p.Key, p => (object)p.Value);
 
-            if (message.Headers.ContainsKey(Headers.EnclosedMessageTypes))
+            if (message.Headers.ContainsKey(NServiceBus.Headers.EnclosedMessageTypes))
             {
-                properties.Type = message.Headers[Headers.EnclosedMessageTypes].Split(new[]
+                properties.Type = message.Headers[NServiceBus.Headers.EnclosedMessageTypes].Split(new[]
                 {
                     ','
                 }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
             }
 
-            if (message.Headers.ContainsKey(Headers.ContentType))
+            if (message.Headers.ContainsKey(NServiceBus.Headers.ContentType))
             {
-                properties.ContentType = message.Headers[Headers.ContentType];
+                properties.ContentType = message.Headers[NServiceBus.Headers.ContentType];
             }
             else
             {
diff --git a/src/NServiceBus.RabbitMQ/Routing/ConventionalRoutingTopology.cs b/src/NServiceBus.RabbitMQ/Routing/ConventionalRoutingTopology.cs
@@ -58,13 +58,13 @@ public void TeardownSubscription(IModel channel, Type type, string subscriberNam
         public void Publish(IModel channel, Type type, TransportMessage message, IBasicProperties properties)
         {
             SetupTypeSubscriptions(channel, type);
-            channel.BasicPublish(ExchangeName(type), String.Empty, true, false, properties, message.Body);
+            channel.BasicPublish(ExchangeName(type), String.Empty, true, properties, message.Body);
         }
 
         public void Send(IModel channel, Address address, TransportMessage message, IBasicProperties properties)
         {
             var subscriberName = address.Queue;
-            channel.BasicPublish(subscriberName, String.Empty, true, false, properties, message.Body);
+            channel.BasicPublish(subscriberName, String.Empty, true, properties, message.Body);
         }
 
         public void Initialize(IModel channel, string mainQueue)
diff --git a/src/NServiceBus.RabbitMQ/Routing/DirectRoutingTopology.cs b/src/NServiceBus.RabbitMQ/Routing/DirectRoutingTopology.cs
@@ -6,7 +6,7 @@
     /// <summary>
     /// Route using a static routing convention for routing messages from publishers to subscribers using routing keys
     /// </summary>
-    class DirectRoutingTopology:IRoutingTopology
+    class DirectRoutingTopology : IRoutingTopology
     {
         public DirectRoutingTopology(Conventions conventions, bool useDurableExchanges)
         {
@@ -27,12 +27,12 @@ public void TeardownSubscription(IModel channel, Type type, string subscriberNam
 
         public void Publish(IModel channel, Type type, TransportMessage message, IBasicProperties properties)
         {
-            channel.BasicPublish(ExchangeName(), GetRoutingKeyForPublish(type), true, false, properties, message.Body);
+            channel.BasicPublish(ExchangeName(), GetRoutingKeyForPublish(type), true, properties, message.Body);
         }
 
         public void Send(IModel channel, Address address, TransportMessage message, IBasicProperties properties)
         {
-            channel.BasicPublish(string.Empty, address.Queue, true, false, properties, message.Body);
+            channel.BasicPublish(string.Empty, address.Queue, true, properties, message.Body);
         }
 
         public void Initialize(IModel channel, string main)
@@ -88,9 +88,9 @@ public Conventions(Func<Address, Type, string> exchangeName, Func<Type, string>
                 RoutingKey = routingKey;
             }
 
-            public Func<Address, Type, string> ExchangeName { get; private set; }
+            public Func<Address, Type, string> ExchangeName { get; }
 
-            public Func<Type, string> RoutingKey { get; private set; }
+            public Func<Type, string> RoutingKey { get; }
         }
     }
 }
diff --git a/src/NServiceBus.RabbitMQ/packages.config b/src/NServiceBus.RabbitMQ/packages.config

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void Should_be_able_to_receive_messages_with_no_id()`
`36`	`36`	`//for now until we can patch the serializer to infer the type based on the root node`
`37`	`37`	`properties.Headers = new Dictionary<string, object> { { Headers.EnclosedMessageTypes, typeof(MyRequest).FullName } };`
`38`	`38`
`39`		`- channel.BasicPublish(string.Empty, unicastBus.Configure.LocalAddress.Queue, true, false, properties, stream.ToArray());`
	`39`	`+ channel.BasicPublish(string.Empty, unicastBus.Configure.LocalAddress.Queue, true, properties, stream.ToArray());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void Should_block_until_a_message_is_available()`
`22`	`22`
`23`	`23`	`var message = new TransportMessage();`
`24`	`24`
`25`		`- sender.Send(message,new SendOptions(address));`
	`25`	`+ sender.Send(message, new SendOptions(address));`
`26`	`26`
`27`	`27`
`28`	`28`	`var received = WaitForMessage();`
`@@ -46,7 +46,7 @@ public void Should_be_able_to_receive_messages_without_headers()`
`46`	`46`
`47`	`47`	`properties.MessageId = message.Id;`
`48`	`48`
`49`		`- channel.BasicPublish(string.Empty, address.Queue, true, false, properties, message.Body);`
	`49`	`+ channel.BasicPublish(string.Empty, address.Queue, true, properties, message.Body);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`var received = WaitForMessage();`
`@@ -69,13 +69,13 @@ public void Should_be_able_to_receive_a_blank_message()`
`69`	`69`
`70`	`70`	`properties.MessageId = message.Id;`
`71`	`71`
`72`		`- channel.BasicPublish(string.Empty, address.Queue, true, false, properties, message.Body);`
	`72`	`+ channel.BasicPublish(string.Empty, address.Queue, true, properties, message.Body);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`var received = WaitForMessage();`
`76`	`76`
`77`	`77`
`78`		`- Assert.NotNull(received.Id,"The message id should be defaulted to a new guid if not set");`
	`78`	`+ Assert.NotNull(received.Id, "The message id should be defaulted to a new guid if not set");`
`79`	`79`	`}`
`80`	`80`
`81`	`81`
`@@ -92,10 +92,10 @@ public void Should_up_convert_the_native_type_to_the_enclosed_message_types_head`
`92`	`92`	`{`
`93`	`93`	`var properties = channel.CreateBasicProperties();`
`94`	`94`
`95`		`- properties.MessageId = message.Id;`
	`95`	`+ properties.MessageId = message.Id;`
`96`	`96`	`properties.Type = typeName;`
`97`	`97`
`98`		`- channel.BasicPublish(string.Empty, address.Queue, true, false, properties, message.Body);`
	`98`	`+ channel.BasicPublish(string.Empty, address.Queue, true, properties, message.Body);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`var received = WaitForMessage();`
`@@ -117,7 +117,7 @@ public void Should_listen_to_the_callback_queue_as_well()`
`117`	`117`
`118`	`118`	`properties.MessageId = message.Id;`
`119`	`119`
`120`		`- channel.BasicPublish(string.Empty, address.Queue+"."+RuntimeEnvironment.MachineName, true, false, properties, message.Body);`
	`120`	`+ channel.BasicPublish(string.Empty, address.Queue + "." + RuntimeEnvironment.MachineName, true, properties, message.Body);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void Should_populate_the_body()`
`24`	`24`	`[Test]`
`25`	`25`	`public void Should_set_the_content_type()`
`26`	`26`	`{`
`27`		`- VerifyRabbit(new TransportMessageBuilder().WithHeader(Headers.ContentType, "application/json"),`
	`27`	`+ VerifyRabbit(new TransportMessageBuilder().WithHeader(NServiceBus.Headers.ContentType, "application/json"),`
`28`	`28`	`received => Assert.AreEqual("application/json", received.BasicProperties.ContentType));`
`29`	`29`
`30`	`30`	`}`
`@@ -45,7 +45,7 @@ public void Should_set_the_message_type_based_on_the_encoded_message_types_heade`
`45`	`45`	`{`
`46`	`46`	`var messageType = typeof (MyMessage);`
`47`	`47`
`48`		`- VerifyRabbit(new TransportMessageBuilder().WithHeader(Headers.EnclosedMessageTypes, messageType.AssemblyQualifiedName),`
	`48`	`+ VerifyRabbit(new TransportMessageBuilder().WithHeader(NServiceBus.Headers.EnclosedMessageTypes, messageType.AssemblyQualifiedName),`
`49`	`49`	`received => Assert.AreEqual(messageType.FullName, received.BasicProperties.Type));`
`50`	`50`
`51`	`51`	`}`