Merge pull request #466 from scratch-net/RabbitMQ_3_5_4_Json_Net_7_0_1

Updated RabbitMQ to 3.5.4 and JSON.NET to 7.0.1
EasyNetQ · Aug 1, 2015 · 922e22e · 922e22e
2 parents 9473abd + 44d8692
commit 922e22e
Show file tree

Hide file tree

Showing 24 changed files with 49 additions and 60 deletions.
diff --git a/Package/EasyNetQ.DI.Autofac/EasyNetQ.DI.Autofac.nuspec b/Package/EasyNetQ.DI.Autofac/EasyNetQ.DI.Autofac.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>EasyNetQ.DI.Autofac</id>
     <!-- Version gets updated from EasyNetQ.dll version number during the build's packaging process -->
-    <version>0.35.1.0</version>
+    <version>0.50.1.0</version>
     <title>EasyNetQ.DI.Autofac</title>
     <authors>Wiebe Tijsma, Mike Hadlow</authors>
     <owners>Mike Hadlow</owners>
@@ -17,7 +17,7 @@
     <copyright>Copyright Mike Hadlow 2015</copyright>
     <tags>RabbitMQ Messaging AMQP REST API Ninject</tags>
     <dependencies>
-      <dependency id="EasyNetQ" version="0.35.1.0" />
+      <dependency id="EasyNetQ" version="0.50.1.0" />
       <dependency id="Autofac" version="3.3.0.0" />
     </dependencies>
   </metadata>

diff --git a/Package/EasyNetQ.DI.Autofac/lib/net40/EasyNetQ.DI.Autofac.dll b/Package/EasyNetQ.DI.Autofac/lib/net40/EasyNetQ.DI.Autofac.dll
diff --git a/Package/EasyNetQ.DI.Ninject/EasyNetQ.DI.Ninject.nuspec b/Package/EasyNetQ.DI.Ninject/EasyNetQ.DI.Ninject.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>EasyNetQ.DI.Ninject</id>
     <!-- Version gets updated from EasyNetQ.dll version number during the build's packaging process -->
-    <version>0.35.1.0</version>
+    <version>0.50.1.0</version>
     <title>EasyNetQ.DI.Ninject</title>
     <authors>Jeff Doolittle, Mike Hadlow</authors>
     <owners>Mike Hadlow</owners>
@@ -17,7 +17,7 @@
     <copyright>Copyright Mike Hadlow 2015</copyright>
     <tags>RabbitMQ Messaging AMQP REST API Ninject</tags>
     <dependencies>
-      <dependency id="EasyNetQ" version="0.35.1.0" />
+      <dependency id="EasyNetQ" version="0.50.1.0" />
       <dependency id="Ninject" version="3.0.1.10" />
     </dependencies>
   </metadata>

diff --git a/Package/EasyNetQ.DI.Ninject/lib/net40/EasyNetQ.DI.Ninject.dll b/Package/EasyNetQ.DI.Ninject/lib/net40/EasyNetQ.DI.Ninject.dll
diff --git a/Package/EasyNetQ.DI.StructureMap/EasyNetQ.DI.StructureMap.nuspec b/Package/EasyNetQ.DI.StructureMap/EasyNetQ.DI.StructureMap.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>EasyNetQ.DI.StructureMap</id>
     <!-- Version gets updated from EasyNetQ.dll version number during the build's packaging process -->
-    <version>0.35.1.0</version>
+    <version>0.50.1.0</version>
     <title>EasyNetQ.DI.StructureMap</title>
     <authors>Jeff Doolittle, Mike Hadlow</authors>
     <owners>Mike Hadlow</owners>
@@ -17,7 +17,7 @@
     <copyright>Copyright Mike Hadlow 2013</copyright>
     <tags>RabbitMQ Messaging AMQP REST API StructureMap</tags>
     <dependencies>
-      <dependency id="EasyNetQ" version="0.35.1.0" />
+      <dependency id="EasyNetQ" version="0.50.1.0" />
       <dependency id="structuremap" version="2.6.4.1" />
     </dependencies>
   </metadata>

diff --git a/Package/EasyNetQ.DI.StructureMap/lib/net40/EasyNetQ.DI.StructureMap.dll b/Package/EasyNetQ.DI.StructureMap/lib/net40/EasyNetQ.DI.StructureMap.dll
diff --git a/Package/EasyNetQ.DI.Windsor/EasyNetQ.DI.Windsor.nuspec b/Package/EasyNetQ.DI.Windsor/EasyNetQ.DI.Windsor.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>EasyNetQ.DI.Windsor</id>
     <!-- Version gets updated from EasyNetQ.dll version number during the build's packaging process -->
-    <version>0.35.1.0</version>
+    <version>0.50.1.0</version>
     <title>EasyNetQ.DI.Windsor</title>
     <authors>Jeff Doolittle, Mike Hadlow</authors>
     <owners>Mike Hadlow</owners>
@@ -17,7 +17,7 @@
     <copyright>Copyright Mike Hadlow 2015</copyright>
     <tags>RabbitMQ Messaging AMQP REST API Windsor</tags>
     <dependencies>
-      <dependency id="EasyNetQ" version="0.35.1.0" />
+      <dependency id="EasyNetQ" version="0.50.1.0" />
       <dependency id="Castle.Windsor" version="3.2.1" />
       <dependency id="Castle.Core" version="3.2.2" />
     </dependencies>

diff --git a/Package/EasyNetQ.DI.Windsor/lib/net40/EasyNetQ.DI.Windsor.dll b/Package/EasyNetQ.DI.Windsor/lib/net40/EasyNetQ.DI.Windsor.dll
diff --git a/Package/EasyNetQ/EasyNetQ.nuspec b/Package/EasyNetQ/EasyNetQ.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>EasyNetQ</id>
     <!-- Version gets updated from EasyNetQ.dll version number during the build's packaging process -->
-    <version>0.36.4.0</version>
+    <version>0.50.1.0</version>
     <title>EasyNetQ</title>
     <authors>Mike Hadlow, Contributors (see GitHub repo)</authors>
     <owners>Mike Hadlow</owners>
@@ -17,7 +17,7 @@
     <copyright>Copyright Mike Hadlow 2015</copyright>
     <tags>RabbitMQ Messaging AMQP</tags>
     <dependencies>
-      <dependency id="RabbitMQ.Client" version="[3.5.3,]" />
+      <dependency id="RabbitMQ.Client" version="[3.5.4,]" />
     </dependencies>
   </metadata>
-</package>
+</package>
diff --git a/Source/EasyNetQ.Hosepipe.Tests/EasyNetQ.Hosepipe.Tests.csproj b/Source/EasyNetQ.Hosepipe.Tests/EasyNetQ.Hosepipe.Tests.csproj
@@ -33,16 +33,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.5.3\lib\net40\RabbitMQ.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="RabbitMQ.Client" version="3.5.3" targetFramework="net40" />
+  <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net40" />
 </packages>
diff --git a/Source/EasyNetQ.Hosepipe/EasyNetQ.Hosepipe.csproj b/Source/EasyNetQ.Hosepipe/EasyNetQ.Hosepipe.csproj
@@ -35,13 +35,11 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.5.3\lib\net40\RabbitMQ.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\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="6.0.5" targetFramework="net40-Client" />
-  <package id="RabbitMQ.Client" version="3.5.3" targetFramework="net40-Client" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40-Client" />
+  <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net40-Client" />
 </packages>
diff --git a/Source/EasyNetQ.LogReader/EasyNetQ.LogReader.csproj b/Source/EasyNetQ.LogReader/EasyNetQ.LogReader.csproj
@@ -35,16 +35,14 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.5.3\lib\net40\RabbitMQ.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\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="6.0.5" targetFramework="net40-Client" />
-  <package id="RabbitMQ.Client" version="3.5.3" targetFramework="net40-Client" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40-Client" />
+  <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net40-Client" />
 </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
@@ -35,9 +35,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RabbitMQ.Client, Version=3.5.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.5.3\lib\net40\RabbitMQ.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Source/EasyNetQ.Tests.Performance.Consumer/packages.config b/Source/EasyNetQ.Tests.Performance.Consumer/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RabbitMQ.Client" version="3.5.3" targetFramework="net40-Client" />
+  <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net40-Client" />
 </packages>
diff --git a/Source/EasyNetQ.Tests/EasyNetQ.Tests.csproj b/Source/EasyNetQ.Tests/EasyNetQ.Tests.csproj
@@ -60,16 +60,14 @@
       <HintPath>..\packages\EasyNetQ.Management.Client.0.47.11.35\lib\net40\EasyNetQ.Management.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.5.3\lib\net40\RabbitMQ.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\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
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EasyNetQ.Management.Client" version="0.47.11.35" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="RabbitMQ.Client" version="3.5.3" targetFramework="net40" />
+  <package id="RabbitMQ.Client" version="3.5.4" 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
@@ -37,9 +37,8 @@
     <Reference Include="CommandLine">
       <HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.5.3\lib\net40\RabbitMQ.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\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.5.3" targetFramework="net45" />
+  <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net45" />
 </packages>
diff --git a/Source/EasyNetQ/EasyNetQ.csproj b/Source/EasyNetQ/EasyNetQ.csproj
@@ -35,13 +35,11 @@
     <DocumentationFile>bin\Release\EasyNetQ.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.5.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.5.3\lib\net40\RabbitMQ.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\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="6.0.5" targetFramework="net40-Client" />
-  <package id="RabbitMQ.Client" version="3.5.3" targetFramework="net40-Client" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40-Client" />
+  <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net40-Client" />
 </packages>
diff --git a/Source/Version.cs b/Source/Version.cs
@@ -2,10 +2,11 @@
 using System.Reflection;
 
 // EasyNetQ version number: <major>.<minor>.<non-breaking-feature>.<build>
-[assembly: AssemblyVersion("0.50.1.0")]
+[assembly: AssemblyVersion("0.50.2.0")]
 [assembly: CLSCompliant(true)]
 
 // Note: until version 1.0 expect breaking changes on 0.X versions.
+// 0.50.2.0 Updated RabbitMQ client to 3.5.4 and Json.NET to 7.0.1
 // 0.50.1.0 Fix type in Extensions
 // 0.50.0.0 Updated to RabbitMQ.Client 3.5.3
 // 0.49.3.0 Polymorphic publish now works with Scheduler.Mongo