Merge branch 'hotfix-1.1.4'

Particular · Aug 21, 2014 · c0ab6c7 · c0ab6c7
2 parents 33b8d0f + 9fbaf46
commit c0ab6c7
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 25 deletions.
diff --git a/buildsupport/GitVersionTask/Build/GitVersionTask.targets b/buildsupport/GitVersionTask/Build/GitVersionTask.targets
@@ -3,46 +3,73 @@
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
   </PropertyGroup>
+  <PropertyGroup>
+    <GitVersionAppendRevision Condition="$(GitVersionAppendRevision) == '' Or $(GitVersionAppendRevision) == '*Undefined*'">false</GitVersionAppendRevision>
+  </PropertyGroup>
 
   <UsingTask
       TaskName="GitVersionTask.UpdateAssemblyInfo"
       AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
+  <UsingTask 
+    TaskName="GitVersionTask.GetVersion" 
+    AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll"  />
   <UsingTask
       TaskName="GitVersionTask.WriteVersionInfoToBuildLog"
       AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
 
-    <Target Name="UpdateAssemblyInfo"
-            BeforeTargets="CoreCompile">
-      <WriteVersionInfoToBuildLog
-        SolutionDirectory="$(SolutionDir)"
+  <Target Name="UpdateAssemblyInfo"
+          BeforeTargets="CoreCompile">
+    <WriteVersionInfoToBuildLog
+      SolutionDirectory="$(SolutionDir)"
         />
-        <UpdateAssemblyInfo 
-          SolutionDirectory="$(SolutionDir)"
-          AssemblyName="$(AssemblyName)" 
-          ProjectFile="$(ProjectPath)" 
-          SignAssembly="$(SignAssembly)"
-          CompileFiles ="@(Compile)">
-          <Output 
-            TaskParameter="AssemblyInfoTempFilePath" 
-            PropertyName="AssemblyInfoTempFilePath" />
-        </UpdateAssemblyInfo>
-
-        <ItemGroup>
-            <Compile Include="$(AssemblyInfoTempFilePath)" />
-        </ItemGroup>
-    </Target>
+    <UpdateAssemblyInfo
+      SolutionDirectory="$(SolutionDir)"
+      ProjectFile="$(ProjectPath)"
+      AppendRevision="$(GitVersionAppendRevision)"
+      CompileFiles ="@(Compile)">
+      <Output
+        TaskParameter="AssemblyInfoTempFilePath"
+        PropertyName="AssemblyInfoTempFilePath" />
+    </UpdateAssemblyInfo>
+
+    <ItemGroup>
+      <Compile Include="$(AssemblyInfoTempFilePath)" />
+    </ItemGroup>
+
+
+    <GetVersion SolutionDirectory="$(SolutionDir)">
+      <Output TaskParameter="Major" PropertyName="GfvMajor" />
+      <Output TaskParameter="Minor" PropertyName="GfvMinor" />
+      <Output TaskParameter="Patch" PropertyName="GfvPatch" />
+      <Output TaskParameter="BuildMetaData" PropertyName="GfvBuildMetaData" />
+      <Output TaskParameter="FullBuildMetaData" PropertyName="GfvFullBuildMetaData" />
+      <Output TaskParameter="BranchName" PropertyName="GfvBranchName" />
+      <Output TaskParameter="Sha" PropertyName="GfvSha" />
+      <Output TaskParameter="MajorMinorPatch" PropertyName="GfvMajorMinorPatch" />
+      <Output TaskParameter="SemVer" PropertyName="GfvSemVer" />
+      <Output TaskParameter="LegacySemVer" PropertyName="GfvLegacySemVer" />
+      <Output TaskParameter="LegacySemVerPadded" PropertyName="GfvLegacySemVerPadded" />
+      <Output TaskParameter="FullSemVer" PropertyName="GfvFullSemVer" />
+      <Output TaskParameter="AssemblySemVer" PropertyName="GfvAssemblySemVer" />
+      <Output TaskParameter="ClassicVersion" PropertyName="GfvClassicVersion" />
+      <Output TaskParameter="ClassicVersionWithTag" PropertyName="GfvClassicVersionWithTag" />
+      <Output TaskParameter="PreReleaseTag" PropertyName="GfvPreReleaseTag" />
+      <Output TaskParameter="PreReleaseTagWithDash" PropertyName="GfvPreReleaseTagWithDash" />
+      <Output TaskParameter="InformationalVersion" PropertyName="GfvInformationalVersion" />
+      <Output TaskParameter="AssemblyVersion" PropertyName="GfvAssemblyVersion" />
+      <Output TaskParameter="AssemblyFileVersion" PropertyName="GfvAssemblyFileVersion" />
+      <Output TaskParameter="OriginalRelease" PropertyName="GfvOriginalRelease" />
+    </GetVersion>
+
+  </Target>
 
   <!--Support for ncrunch-->
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
     <None Include="$(MSBuildThisFileDirectory)..\GitVersionTask.pdb" />
-    <None Include="$(MSBuildThisFileDirectory)..\GitVersion.exe" />
-    <None Include="$(MSBuildThisFileDirectory)..\GitVersion.pdb" />
-    <None Include="$(MSBuildThisFileDirectory)..\LibGit2Sharp.dll" />
     <None Include="$(MSBuildThisFileDirectory)..\NativeBinaries\**\*" />
   </ItemGroup>
 
-
 </Project>
 
 
diff --git a/buildsupport/GitVersionTask/GitVersion.exe b/buildsupport/GitVersionTask/GitVersion.exe
diff --git a/buildsupport/GitVersionTask/GitVersionTask.dll b/buildsupport/GitVersionTask/GitVersionTask.dll
diff --git a/buildsupport/GitVersionTask/LibGit2Sharp.dll b/buildsupport/GitVersionTask/LibGit2Sharp.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-65e9dc6.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-65e9dc6.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-65e9dc6.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-65e9dc6.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll
diff --git a/packaging/nuget/NServiceBus.RabbitMQ.nuspec b/packaging/nuget/NServiceBus.RabbitMQ.nuspec
@@ -3,7 +3,7 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>NServiceBus.RabbitMQ</id>
     <title>NServiceBus RabbitMQ</title>
-    <version>4.0.0-alpha0</version>
+    <version>$version$</version>
     <authors>NServiceBus Ltd</authors>
     <owners>Udi Dahan, Andreas Ohlund, John Simons</owners>
     <licenseUrl>http://particular.net/LicenseAgreement</licenseUrl>
@@ -16,6 +16,9 @@
     <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies>
+      <dependency id="NServiceBus" version="[4.4.2.0, 5.0.0.0)" />
+      <dependency id="NServiceBus.Interfaces" version="[4.4.2.0, 5.0.0.0)" />
+      <dependency id="RabbitMQ.Client" version="[3.2.1.0, 4.0.0.0)" />
     </dependencies>
   </metadata>
   <files>

diff --git a/ripple.config b/ripple.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ripple xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ripple xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>NServiceBus.RabbitMQ</Name>
   <NugetSpecFolder>packaging/nuget</NugetSpecFolder>
   <SourceFolder>src</SourceFolder>

diff --git a/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj b/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>NServiceBus.RabbitMQ.AcceptanceTests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj b/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RestorePackages>true</RestorePackages>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git 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;
+        }
     }
 }
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
@@ -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
@@ -14,6 +14,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <FodyPath>..\packages\Fody</FodyPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git 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;
         }