Merge branch 'release-2.0.0'

Particular · Sep 23, 2014 · d57f7b8 · d57f7b8
2 parents 1e954b3 + 8cf1f95
commit d57f7b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...eTests/App_Packages/NSB.AcceptanceTests.5.0.0/PubSub/When_base_event_from_2_publishers.cs b/...eTests/App_Packages/NSB.AcceptanceTests.5.0.0/PubSub/When_base_event_from_2_publishers.cs
@@ -9,6 +9,7 @@
     public class When_base_event_from_2_publishers : NServiceBusAcceptanceTest
     {
         [Test]
+        [Explicit]
         public void Should_receive_events_from_all_publishers()
         {
             var cc = new Context();

diff --git a/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj b/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj
@@ -117,6 +117,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\packaging\nuget\NServiceBus.Transports.RabbitMQ.nuspec">
+      <Link>NServiceBus.Transports.RabbitMQ.nuspec</Link>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />