From f37808ee5295fe00fcea03d72aafdcafa4e54b50 Mon Sep 17 00:00:00 2001
From: Demis Bellot <demis.bellot@gmail.com>
Date: Mon, 17 Mar 2014 22:30:51 -0400
Subject: [PATCH] Upgrade references to RabbitMQ.Client 3.2.4

---
 .../servicestack.rabbitmq.nuspec                      |  2 +-
 .../ServiceStack.RabbitMq.csproj                      | 11 ++++++-----
 src/ServiceStack.RabbitMq/packages.config             |  2 +-
 src/ServiceStack.sln                                  |  1 +
 .../ServiceStack.Common.Tests.csproj                  |  2 +-
 tests/ServiceStack.Common.Tests/packages.config       |  2 +-
 .../ServiceStack.Server.Tests.csproj                  |  5 ++---
 tests/ServiceStack.Server.Tests/packages.config       |  1 +
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/NuGet/ServiceStack.RabbitMq/servicestack.rabbitmq.nuspec b/NuGet/ServiceStack.RabbitMq/servicestack.rabbitmq.nuspec
index 38ae3facfa5..b2a380d79bb 100644
--- a/NuGet/ServiceStack.RabbitMq/servicestack.rabbitmq.nuspec
+++ b/NuGet/ServiceStack.RabbitMq/servicestack.rabbitmq.nuspec
@@ -19,7 +19,7 @@
     <language>en-US</language>
     <copyright>Copyright 2014 Service Stack</copyright>
     <dependencies>
-      <dependency id="RabbitMQ.Client" />
+      <dependency id="RabbitMQ.Client" version="3.2.4" />
       <dependency id="ServiceStack" version="4.0" />
     </dependencies>
   </metadata>
diff --git a/src/ServiceStack.RabbitMq/ServiceStack.RabbitMq.csproj b/src/ServiceStack.RabbitMq/ServiceStack.RabbitMq.csproj
index d6b764d34e2..e84e3769cf6 100644
--- a/src/ServiceStack.RabbitMq/ServiceStack.RabbitMq.csproj
+++ b/src/ServiceStack.RabbitMq/ServiceStack.RabbitMq.csproj
@@ -32,8 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RabbitMQ.Client">
-      <HintPath>..\packages\RabbitMQ.Client.3.2.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=3.2.4.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\RabbitMQ.Client.3.2.4\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Interfaces">
       <HintPath>..\..\lib\ServiceStack.Interfaces.dll</HintPath>
@@ -59,9 +60,6 @@
     <Compile Include="RabbitMqQueueClient.cs" />
     <Compile Include="RabbitMqWorker.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.Client\ServiceStack.Client.csproj">
       <Project>{c43f583f-abde-4dd4-bbe3-66322817a6ad}</Project>
@@ -76,6 +74,9 @@
       <Name>ServiceStack</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/ServiceStack.RabbitMq/packages.config b/src/ServiceStack.RabbitMq/packages.config
index 24d5671c661..be61d6ea42f 100644
--- a/src/ServiceStack.RabbitMq/packages.config
+++ b/src/ServiceStack.RabbitMq/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RabbitMQ.Client" version="3.2.1" targetFramework="net40" />
+  <package id="RabbitMQ.Client" version="3.2.4" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/ServiceStack.sln b/src/ServiceStack.sln
index c99912a6790..9516207261c 100644
--- a/src/ServiceStack.sln
+++ b/src/ServiceStack.sln
@@ -54,6 +54,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{EB65E771
 		..\NuGet\ServiceStack.Mvc\servicestack.mvc.nuspec = ..\NuGet\ServiceStack.Mvc\servicestack.mvc.nuspec
 		..\NuGet\ServiceStack\servicestack.nuspec = ..\NuGet\ServiceStack\servicestack.nuspec
 		..\NuGet\ServiceStack.ProtoBuf\servicestack.protobuf.nuspec = ..\NuGet\ServiceStack.ProtoBuf\servicestack.protobuf.nuspec
+		..\NuGet\ServiceStack.RabbitMq\servicestack.rabbitmq.nuspec = ..\NuGet\ServiceStack.RabbitMq\servicestack.rabbitmq.nuspec
 		..\NuGet\ServiceStack.Razor\servicestack.razor.nuspec = ..\NuGet\ServiceStack.Razor\servicestack.razor.nuspec
 		..\NuGet\ServiceStack.Server\servicestack.server.nuspec = ..\NuGet\ServiceStack.Server\servicestack.server.nuspec
 	EndProjectSection
diff --git a/tests/ServiceStack.Common.Tests/ServiceStack.Common.Tests.csproj b/tests/ServiceStack.Common.Tests/ServiceStack.Common.Tests.csproj
index a3abd3141ec..84ab829efe4 100644
--- a/tests/ServiceStack.Common.Tests/ServiceStack.Common.Tests.csproj
+++ b/tests/ServiceStack.Common.Tests/ServiceStack.Common.Tests.csproj
@@ -102,7 +102,7 @@
       <HintPath>..\..\src\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="RabbitMQ.Client">
-      <HintPath>..\..\src\packages\RabbitMQ.Client.3.2.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+      <HintPath>..\..\src\packages\RabbitMQ.Client.3.2.4\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Interfaces">
       <HintPath>..\..\lib\ServiceStack.Interfaces.dll</HintPath>
diff --git a/tests/ServiceStack.Common.Tests/packages.config b/tests/ServiceStack.Common.Tests/packages.config
index 5fded7c321e..a2bd85ed95d 100644
--- a/tests/ServiceStack.Common.Tests/packages.config
+++ b/tests/ServiceStack.Common.Tests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="RabbitMQ.Client" version="3.2.1" targetFramework="net40" />
+  <package id="RabbitMQ.Client" version="3.2.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/tests/ServiceStack.Server.Tests/ServiceStack.Server.Tests.csproj b/tests/ServiceStack.Server.Tests/ServiceStack.Server.Tests.csproj
index b2bdf74036d..8f33c89dc9e 100644
--- a/tests/ServiceStack.Server.Tests/ServiceStack.Server.Tests.csproj
+++ b/tests/ServiceStack.Server.Tests/ServiceStack.Server.Tests.csproj
@@ -46,9 +46,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.2.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\src\packages\RabbitMQ.Client.3.2.1\lib\net30\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\..\src\packages\RabbitMQ.Client.3.2.4\lib\net30\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Interfaces">
       <HintPath>..\..\lib\ServiceStack.Interfaces.dll</HintPath>
diff --git a/tests/ServiceStack.Server.Tests/packages.config b/tests/ServiceStack.Server.Tests/packages.config
index 967502dc812..0e3f4f2816b 100644
--- a/tests/ServiceStack.Server.Tests/packages.config
+++ b/tests/ServiceStack.Server.Tests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
+  <package id="RabbitMQ.Client" version="3.2.4" targetFramework="net40" />
 </packages>
\ No newline at end of file