Merge pull request #169 from Particular/hotfix-3.3.2

Release Hotfix 3.3.2

Author: adamralph

src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj

@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />

src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj

@@ -36,7 +36,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>

src/NServiceBus.RabbitMQ.Tests/RabbitMqTransportMessageExtensionsTests.cs

@@ -38,7 +38,7 @@ public void TestCanHandleByteArrayHeader()
         }
 
         [Test]
-        public void Should_set_replyto_header_if_present_in_native_message_and_not_already_set()
+        public void Should_set_replyto_header_if_native_replyto_is_present()
         {
             var basicDeliverEventArgs = new BasicDeliverEventArgs
             {
@@ -54,7 +54,7 @@ public void Should_set_replyto_header_if_present_in_native_message_and_not_alrea
         }
 
         [Test]
-        public void Should_not_override_replyto_header_if_native_replyto_is_present()
+        public void Should_override_replyto_header_if_native_replyto_is_present()
         {
             var basicDeliverEventArgs = new BasicDeliverEventArgs
             {
@@ -70,7 +70,7 @@ public void Should_not_override_replyto_header_if_native_replyto_is_present()
             };
             var transportMessage = converter.ToTransportMessage(basicDeliverEventArgs);
             Assert.NotNull(transportMessage);
-            Assert.AreEqual("nsb set address", transportMessage.Headers[Headers.ReplyToAddress]);
+            Assert.AreEqual("myaddress", transportMessage.Headers[Headers.ReplyToAddress]);
         }
 
 

src/NServiceBus.RabbitMQ.Tests/When_sending_a_message_over_rabbitmq.cs

@@ -29,7 +29,7 @@ public void Should_set_the_content_type()
 
         }
 
-        
+
         [Test]
         public void Should_default_the_content_type_to_octet_stream_when_no_content_type_is_specified()
         {
@@ -38,7 +38,7 @@ public void Should_default_the_content_type_to_octet_stream_when_no_content_type
 
         }
 
-        
+
 
         [Test]
         public void Should_set_the_message_type_based_on_the_encoded_message_types_header()
@@ -66,7 +66,7 @@ public void Should_set_the_reply_to_address()
         {
             var address = Address.Parse("myAddress");
 
-            Verify(new TransportMessageBuilder().ReplyToAddress(address), 
+            Verify(new TransportMessageBuilder().ReplyToAddress(address),
                 (t, r) =>
                 {
                     Assert.AreEqual(address, t.ReplyToAddress);
@@ -82,7 +82,7 @@ public void Should_not_populate_the_callback_header()
                 (t, r) => Assert.IsFalse(t.Headers.ContainsKey(RabbitMqMessageSender.CallbackHeaderKey)));
 
         }
-       
+
         [Test]
         public void Should_set_correlation_id_if_present()
         {
@@ -155,7 +155,7 @@ void SendMessage(TransportMessage message)
 
             if (message.MessageIntent == MessageIntentEnum.Reply)
             {
-                
+
             }
             sender.Send(message, options);
         }
@@ -169,7 +169,9 @@ BasicDeliverEventArgs Consume(string id, string queueToReceiveOn)
 
             using (var channel = connectionManager.GetConsumeConnection().CreateModel())
             {
+#pragma warning disable CS0618
                 var consumer = new QueueingBasicConsumer(channel);
+#pragma warning restore CS0618
 
                 channel.BasicConsume(queueToReceiveOn, false, consumer);
 
@@ -193,7 +195,7 @@ BasicDeliverEventArgs Consume(string id, string queueToReceiveOn)
 
         class MyMessage
         {
-            
+
         }
 
     }

src/NServiceBus.RabbitMQ.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.RabbitMQ", "NServiceBus.RabbitMQ\NServiceBus.RabbitMQ.csproj", "{BA731749-22C7-4025-8A4D-465AE8E02E61}"
 EndProject

src/NServiceBus.RabbitMQ/Config/RabbitMqTransportFeature.cs

@@ -36,6 +36,8 @@ protected override string GetLocalAddress(ReadOnlySettings settings)
 
         protected override void Configure(FeatureConfigurationContext context, string connectionString)
         {
+            Address.IgnoreMachineName();
+
             var useCallbackReceiver = context.Settings.Get<bool>(UseCallbackReceiverSettingKey);
             var maxConcurrencyForCallbackReceiver = context.Settings.Get<int>(MaxConcurrencyForCallbackReceiver);
             var queueName = GetLocalAddress(context.Settings);
@@ -175,7 +177,7 @@ static RepeatedFailuresOverTimeCircuitBreaker SetupCircuitBreaker(CriticalError
             }
 
             return new RepeatedFailuresOverTimeCircuitBreaker("RabbitMqConnectivity",
-                timeToWaitBeforeTriggering, 
+                timeToWaitBeforeTriggering,
                 ex => criticalError.Raise("Repeated failures when communicating with the broker",
                     ex), delayAfterFailure);
         }

src/NServiceBus.RabbitMQ/MessageConverter.cs

@@ -10,7 +10,7 @@
 
     class MessageConverter
     {
-      
+
         public MessageConverter()
         {
             messageIdStrategy = DefaultMessageIdStrategy;
@@ -38,21 +38,7 @@ public TransportMessage ToTransportMessage(BasicDeliverEventArgs message)
 
             if (properties.IsReplyToPresent())
             {
-                string replyToAddressNSBHeaders;
-                var nativeReplyToAddress = properties.ReplyTo;
-
-                if (headers.TryGetValue(Headers.ReplyToAddress, out replyToAddressNSBHeaders))
-                {
-                    if (replyToAddressNSBHeaders != nativeReplyToAddress)
-                    {
-                        Logger.WarnFormat("Missmatching replyto address properties found, the address specified by the NServiceBus headers '{1}' will override the native one '{0}'", nativeReplyToAddress, replyToAddressNSBHeaders);         
-                    }
-                }
-                else
-                {
-                    //promote the native address
-                    headers[Headers.ReplyToAddress] = nativeReplyToAddress;             
-                }
+                headers[Headers.ReplyToAddress] = properties.ReplyTo;
             }
 
             if (properties.IsCorrelationIdPresent())

src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj

@@ -46,6 +46,7 @@
     </NoWarn>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <Prefer32Bit>false</Prefer32Bit>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Janitor, Version=1.2.1.0, Culture=neutral, PublicKeyToken=d34c7d3bba3746e6, processorArchitecture=MSIL">

src/NServiceBus.RabbitMQ/RabbitMqDequeueStrategy.cs

@@ -154,7 +154,9 @@ void ConsumeMessages(object state)
                 {
                     channel.BasicQos(0, actualPrefetchCount, false);
 
+#pragma warning disable CS0618
                     var consumer = new QueueingBasicConsumer(channel);
+#pragma warning restore CS0618
 
                     channel.BasicConsume(parameters.Queue, false, receiveOptions.ConsumerTag, consumer);
 
@@ -253,6 +255,7 @@ void ConsumeMessages(object state)
             }
         }
 
+#pragma warning disable CS0618
         static BasicDeliverEventArgs DequeueMessage(QueueingBasicConsumer consumer, int dequeueTimeout)
         {
             BasicDeliverEventArgs rawMessage;
@@ -266,6 +269,7 @@ static BasicDeliverEventArgs DequeueMessage(QueueingBasicConsumer consumer, int
 
             return rawMessage;
         }
+#pragma warning disable CS0618
 
         void Purge()
         {