Upgraded to RabbitMQ.Client 3.1.5

someapp · Oct 21, 2013 · 1a22c9c · 1a22c9c
1 parent c133a99
commit 1a22c9c
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 31 deletions.
diff --git a/Package/EasyNetQ/EasyNetQ.nuspec b/Package/EasyNetQ/EasyNetQ.nuspec
@@ -17,7 +17,7 @@
     <copyright>Copyright Mike Hadlow 2012</copyright>
     <tags>RabbitMQ Messaging AMQP</tags>
     <dependencies>
-      <dependency id="RabbitMQ.Client" version="[3.1.1.0]" />
+      <dependency id="RabbitMQ.Client" version="[3.1.5.0]" />
       <dependency id="Newtonsoft.Json" version="4.5" />
     </dependencies>
   </metadata>

diff --git a/Source/EasyNetQ.Hosepipe.Tests/EasyNetQ.Hosepipe.Tests.csproj b/Source/EasyNetQ.Hosepipe.Tests/EasyNetQ.Hosepipe.Tests.csproj
@@ -37,9 +37,8 @@
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.1.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.1.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Source/EasyNetQ.Hosepipe.Tests/packages.config b/Source/EasyNetQ.Hosepipe.Tests/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
-  <package id="RabbitMQ.Client" version="3.1.1" targetFramework="net40" />
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net40" />
 </packages>
diff --git a/Source/EasyNetQ.Hosepipe/EasyNetQ.Hosepipe.csproj b/Source/EasyNetQ.Hosepipe/EasyNetQ.Hosepipe.csproj
@@ -37,9 +37,8 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.1.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.1.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Source/EasyNetQ.Hosepipe/packages.config b/Source/EasyNetQ.Hosepipe/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40-Client" />
-  <package id="RabbitMQ.Client" version="3.1.1" targetFramework="net40-Client" />
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net40-Client" />
 </packages>
diff --git a/Source/EasyNetQ.LogReader/EasyNetQ.LogReader.csproj b/Source/EasyNetQ.LogReader/EasyNetQ.LogReader.csproj
@@ -41,7 +41,7 @@
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="RabbitMQ.Client">
-      <HintPath>..\packages\RabbitMQ.Client.3.1.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Source/EasyNetQ.LogReader/packages.config b/Source/EasyNetQ.LogReader/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40-Client" />
-  <package id="RabbitMQ.Client" version="3.1.1" targetFramework="net40-Client" />
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net40-Client" />
 </packages>
diff --git a/Source/EasyNetQ.Monitor.Tests/EasyNetQ.Monitor.Tests.csproj b/Source/EasyNetQ.Monitor.Tests/EasyNetQ.Monitor.Tests.csproj
@@ -43,9 +43,8 @@
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.1.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.1.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="Rhino.Mocks">
       <HintPath>..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>

diff --git a/Source/EasyNetQ.Monitor.Tests/packages.config b/Source/EasyNetQ.Monitor.Tests/packages.config
@@ -4,6 +4,6 @@
   <package id="Castle.Windsor" version="3.1.0" targetFramework="net40" />
   <package id="log4net" version="2.0.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
-  <package id="RabbitMQ.Client" version="3.1.1" targetFramework="net40" />
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
 </packages>
diff --git a/Source/EasyNetQ.Tests.Performance.Consumer/EasyNetQ.Tests.Performance.Consumer.csproj b/Source/EasyNetQ.Tests.Performance.Consumer/EasyNetQ.Tests.Performance.Consumer.csproj
@@ -34,6 +34,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
@@ -52,6 +55,9 @@
       <Name>EasyNetQ</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Source/EasyNetQ.Tests.Performance.Consumer/packages.config b/Source/EasyNetQ.Tests.Performance.Consumer/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net40-Client" />
+</packages>
diff --git a/Source/EasyNetQ.Tests/EasyNetQ.Tests.csproj b/Source/EasyNetQ.Tests/EasyNetQ.Tests.csproj
@@ -60,9 +60,8 @@
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.1.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.1.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="Rhino.Mocks">
       <HintPath>..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>

diff --git a/Source/EasyNetQ.Tests/packages.config b/Source/EasyNetQ.Tests/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
-  <package id="RabbitMQ.Client" version="3.1.1" targetFramework="net40" />
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" />
 </packages>
diff --git a/Source/EasyNetQ.Trace/EasyNetQ.Trace.csproj b/Source/EasyNetQ.Trace/EasyNetQ.Trace.csproj
@@ -36,7 +36,7 @@
       <HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="RabbitMQ.Client">
-      <HintPath>..\packages\RabbitMQ.Client.3.1.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Source/EasyNetQ.Trace/packages.config b/Source/EasyNetQ.Trace/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
-  <package id="RabbitMQ.Client" version="3.1.1" targetFramework="net45" />
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net45" />
 </packages>
diff --git a/Source/EasyNetQ/EasyNetQ.csproj b/Source/EasyNetQ/EasyNetQ.csproj
@@ -35,9 +35,8 @@
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.1.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.1.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

diff --git a/Source/EasyNetQ/packages.config b/Source/EasyNetQ/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40-Client" />
-  <package id="RabbitMQ.Client" version="3.1.1" targetFramework="net40-Client" />
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net40-Client" />
 </packages>
diff --git a/Source/Mike.AmqpSpike/Mike.AmqpSpike.csproj b/Source/Mike.AmqpSpike/Mike.AmqpSpike.csproj
@@ -36,7 +36,7 @@
       <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RabbitMQ.Client">
-      <HintPath>..\packages\RabbitMQ.Client.3.1.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+      <HintPath>..\packages\RabbitMQ.Client.3.1.5\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="Sprache">
       <HintPath>..\packages\Sprache.1.10.0.12\lib\net40\Sprache.dll</HintPath>

diff --git a/Source/Mike.AmqpSpike/packages.config b/Source/Mike.AmqpSpike/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40-Client" />
-  <package id="RabbitMQ.Client" version="3.1.1" targetFramework="net40-Client" />
+  <package id="RabbitMQ.Client" version="3.1.5" targetFramework="net40-Client" />
   <package id="Sprache" version="1.10.0.12" targetFramework="net40-Client" />
 </packages>
diff --git a/Source/Version.cs b/Source/Version.cs
@@ -5,6 +5,7 @@
 
 // Note: until version 1.0 expect breaking changes on 0.X versions.
 
+// 0.14.5.0 Upgrade to RabbitMQ.Client 3.1.5
 // 0.14.4.0 Consumer dispatcher queue cleared after connection lost.
 // 0.14.3.0 IConsumerErrorStrategy not being disposed fix
 // 0.14.2.0 MessageProperties serialization fix

diff --git a/...Client.3.1.1/RabbitMQ.Client.3.1.1.nuspec → ...Client.3.1.5/RabbitMQ.Client.3.1.5.nuspec b/...Client.3.1.1/RabbitMQ.Client.3.1.1.nuspec → ...Client.3.1.5/RabbitMQ.Client.3.1.5.nuspec
@@ -2,16 +2,16 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>RabbitMQ.Client</id>
-    <version>3.1.1</version>
+    <version>3.1.5</version>
     <title>RabbitMQ.Client</title>
-    <authors>SpringSource joefitzgerald</authors>
-    <owners>SpringSource joefitzgerald</owners>
+    <authors>SpringSource, GoPivotal, joefitzgerald</authors>
+    <owners>SpringSource, GoPivotal, joefitzgerald</owners>
     <licenseUrl>http://www.rabbitmq.com/dotnet.html</licenseUrl>
     <projectUrl>http://www.rabbitmq.com/dotnet.html</projectUrl>
     <iconUrl>http://springframework.net/images/SpringSource_Leaves100x100.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>The RabbitMQ .NET client is an implementation of an AMQP client library for C# (and, implicitly, other .NET languages), and a binding exposing AMQP services via Microsoft's Windows Communication Foundation (WCF).</description>
     <language>en-US</language>
-    <tags>RabbitMQ Client AMQP SpringSource vmware</tags>
+    <tags>RabbitMQ Client AMQP SpringSource GoPivotal</tags>
   </metadata>
 </package>
diff --git a/...lient.3.1.1/lib/net20/RabbitMQ.Client.dll → ...lient.3.1.5/lib/net20/RabbitMQ.Client.dll b/...lient.3.1.1/lib/net20/RabbitMQ.Client.dll → ...lient.3.1.5/lib/net20/RabbitMQ.Client.dll
diff --git a/...lient.3.1.1/lib/net20/RabbitMQ.Client.xml → ...lient.3.1.5/lib/net20/RabbitMQ.Client.xml b/...lient.3.1.1/lib/net20/RabbitMQ.Client.xml → ...lient.3.1.5/lib/net20/RabbitMQ.Client.xml
diff --git a/...lient.3.1.1/lib/net30/RabbitMQ.Client.dll → ...lient.3.1.5/lib/net30/RabbitMQ.Client.dll b/...lient.3.1.1/lib/net30/RabbitMQ.Client.dll → ...lient.3.1.5/lib/net30/RabbitMQ.Client.dll
diff --git a/...lient.3.1.1/lib/net30/RabbitMQ.Client.xml → ...lient.3.1.5/lib/net30/RabbitMQ.Client.xml b/...lient.3.1.1/lib/net30/RabbitMQ.Client.xml → ...lient.3.1.5/lib/net30/RabbitMQ.Client.xml
diff --git a/Source/packages/repositories.config b/Source/packages/repositories.config
@@ -10,6 +10,7 @@
   <repository path="..\EasyNetQ.SagaHost\packages.config" />
   <repository path="..\EasyNetQ.Scheduler.Tests\packages.config" />
   <repository path="..\EasyNetQ.Scheduler\packages.config" />
+  <repository path="..\EasyNetQ.Tests.Performance.Consumer\packages.config" />
   <repository path="..\EasyNetQ.Tests.SimpleSaga\packages.config" />
   <repository path="..\EasyNetQ.Tests\packages.config" />
   <repository path="..\EasyNetQ.Trace\packages.config" />