diff --git a/buildsupport/GitVersionTask/Build/GitVersionTask.targets b/buildsupport/GitVersionTask/Build/GitVersionTask.targets index d88232f59..9fc759ae1 100644 --- a/buildsupport/GitVersionTask/Build/GitVersionTask.targets +++ b/buildsupport/GitVersionTask/Build/GitVersionTask.targets @@ -3,46 +3,73 @@ $(MSBuildProjectDirectory)..\ + + false + + - - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/buildsupport/GitVersionTask/GitVersion.exe b/buildsupport/GitVersionTask/GitVersion.exe deleted file mode 100644 index 8145ba7ed..000000000 Binary files a/buildsupport/GitVersionTask/GitVersion.exe and /dev/null differ diff --git a/buildsupport/GitVersionTask/GitVersionTask.dll b/buildsupport/GitVersionTask/GitVersionTask.dll index 035d8acd5..01396d37d 100644 Binary files a/buildsupport/GitVersionTask/GitVersionTask.dll and b/buildsupport/GitVersionTask/GitVersionTask.dll differ diff --git a/buildsupport/GitVersionTask/LibGit2Sharp.dll b/buildsupport/GitVersionTask/LibGit2Sharp.dll deleted file mode 100644 index a8e940c4b..000000000 Binary files a/buildsupport/GitVersionTask/LibGit2Sharp.dll and /dev/null differ diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-65e9dc6.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-65e9dc6.dll deleted file mode 100644 index d548c861e..000000000 Binary files a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-65e9dc6.dll and /dev/null differ diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll new file mode 100644 index 000000000..5af4cbce4 Binary files /dev/null and b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll differ diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-65e9dc6.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-65e9dc6.dll deleted file mode 100644 index 040f87c75..000000000 Binary files a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-65e9dc6.dll and /dev/null differ diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll new file mode 100644 index 000000000..086bfda98 Binary files /dev/null and b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll differ diff --git a/packaging/nuget/NServiceBus.RabbitMQ.nuspec b/packaging/nuget/NServiceBus.RabbitMQ.nuspec index eddbe62f8..bd043010d 100644 --- a/packaging/nuget/NServiceBus.RabbitMQ.nuspec +++ b/packaging/nuget/NServiceBus.RabbitMQ.nuspec @@ -3,7 +3,7 @@ NServiceBus.RabbitMQ NServiceBus RabbitMQ - 4.0.0-alpha0 + $version$ NServiceBus Ltd Udi Dahan, Andreas Ohlund, John Simons http://particular.net/LicenseAgreement @@ -16,6 +16,9 @@ Copyright 2010-2013 NServiceBus. All rights reserved nservicebus servicebus msmq cqrs publish subscribe + + + diff --git a/ripple.config b/ripple.config index b7d30668d..325b27a47 100644 --- a/ripple.config +++ b/ripple.config @@ -1,5 +1,5 @@ - + NServiceBus.RabbitMQ packaging/nuget src diff --git a/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj b/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj index 13ba93282..fb3ff2d19 100644 --- a/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj +++ b/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj @@ -11,6 +11,7 @@ NServiceBus.RabbitMQ.AcceptanceTests v4.5 512 + ..\ true diff --git a/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj b/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj index 389f4ce89..f6fab9ab7 100644 --- a/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj +++ b/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj @@ -12,6 +12,7 @@ v4.0 512 true + ..\ true diff --git a/src/NServiceBus.RabbitMQ.Tests/TransportMessageBuilder.cs b/src/NServiceBus.RabbitMQ.Tests/TransportMessageBuilder.cs index 89aeb2dd2..ca5764590 100644 --- a/src/NServiceBus.RabbitMQ.Tests/TransportMessageBuilder.cs +++ b/src/NServiceBus.RabbitMQ.Tests/TransportMessageBuilder.cs @@ -41,5 +41,11 @@ public TransportMessageBuilder CorrelationId(string correlationId) message.CorrelationId = correlationId; return this; } + + public TransportMessageBuilder NonDurable() + { + message.Recoverable = false; + return this; + } } } \ No newline at end of file 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 index a11ebb4a7..55d7051a3 100644 --- a/src/NServiceBus.RabbitMQ.Tests/When_sending_a_message_over_rabbitmq.cs +++ b/src/NServiceBus.RabbitMQ.Tests/When_sending_a_message_over_rabbitmq.cs @@ -88,6 +88,20 @@ public void Should_set_correlation_id_if_present() } + [Test] + public void Should_preserve_the_recoverable_setting_if_set_to_durable() + { + Verify(new TransportMessageBuilder(),result => Assert.True(result.Recoverable)); + } + + + [Test] + public void Should_preserve_the_recoverable_setting_if_set_to_non_durable() + { + Verify(new TransportMessageBuilder().NonDurable(), result => Assert.False(result.Recoverable)); + } + + [Test] public void Should_transmit_all_transportMessage_headers() { diff --git a/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj b/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj index 3045fe0a3..26261a69b 100644 --- a/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj +++ b/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj @@ -14,6 +14,7 @@ true ..\..\NServiceBus.snk ..\packages\Fody + ..\ true diff --git a/src/NServiceBus.RabbitMQ/RabbitMqTransportMessageExtensions.cs b/src/NServiceBus.RabbitMQ/RabbitMqTransportMessageExtensions.cs index 655d4509d..e4e7070f8 100644 --- a/src/NServiceBus.RabbitMQ/RabbitMqTransportMessageExtensions.cs +++ b/src/NServiceBus.RabbitMQ/RabbitMqTransportMessageExtensions.cs @@ -86,6 +86,12 @@ public static TransportMessage ToTransportMessage(BasicDeliverEventArgs message) result.Headers[Headers.EnclosedMessageTypes] = properties.Type; } + if (properties.IsDeliveryModePresent()) + { + result.Recoverable = properties.DeliveryMode == 2; + } + + return result; }