Upgrade to RabbitMq.Client 4.0.0-rc1

pardahlman · Aug 21, 2016 · 015cd27 · 015cd27
1 parent a13d065
commit 015cd27
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 8 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -4,5 +4,6 @@
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
+    <add key="pivotal" value="https://ci.appveyor.com/nuget/rabbitmq-dotnet-client-ci" />
   </packageSources>
 </configuration>
diff --git a/sample/RawRabbit.Messages.Sample/Properties/AssemblyInfo.cs b/sample/RawRabbit.Messages.Sample/Properties/AssemblyInfo.cs
@@ -16,4 +16,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("368be2b7-456d-474f-a460-7c19e633c7db")]
+//[assembly: Guid("368be2b7-456d-474f-a460-7c19e633c7db")]
diff --git a/src/RawRabbit.Attributes/Properties/AssemblyInfo.cs b/src/RawRabbit.Attributes/Properties/AssemblyInfo.cs
@@ -19,4 +19,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f17abdf4-e121-4641-9b9a-546f5c842ec0")]
+//[assembly: Guid("f17abdf4-e121-4641-9b9a-546f5c842ec0")]
diff --git a/src/RawRabbit.DependencyInjection.Autofac/Properties/AssemblyInfo.cs b/src/RawRabbit.DependencyInjection.Autofac/Properties/AssemblyInfo.cs
@@ -20,4 +20,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("23381b29-382a-4cf7-b10f-9661c2ea4f75")]
+//[assembly: Guid("23381b29-382a-4cf7-b10f-9661c2ea4f75")]
diff --git a/src/RawRabbit.Extensions/TopologyUpdater/Core/ExchangeUpdater.cs b/src/RawRabbit.Extensions/TopologyUpdater/Core/ExchangeUpdater.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using RabbitMQ.Client;
 using RawRabbit.Channel.Abstraction;
 using RawRabbit.Extensions.TopologyUpdater.Core.Abstraction;
 using RawRabbit.Extensions.TopologyUpdater.Model;

diff --git a/src/RawRabbit.Logging.Serilog/Properties/AssemblyInfo.cs b/src/RawRabbit.Logging.Serilog/Properties/AssemblyInfo.cs
@@ -19,4 +19,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("78c75f6f-e8cf-45fd-9f84-590a05a168d3")]
+//[assembly: Guid("78c75f6f-e8cf-45fd-9f84-590a05a168d3")]
diff --git a/src/RawRabbit/ErrorHandling/DefaultStrategy.cs b/src/RawRabbit/ErrorHandling/DefaultStrategy.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using RawRabbit.Channel.Abstraction;
 using RawRabbit.Common;

diff --git a/src/RawRabbit/Operations/Publisher.cs b/src/RawRabbit/Operations/Publisher.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using RabbitMQ.Client;
 using RawRabbit.Channel.Abstraction;
 using RawRabbit.Common;
 using RawRabbit.Configuration;

diff --git a/src/RawRabbit/Operations/Responder.cs b/src/RawRabbit/Operations/Responder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using RabbitMQ.Client;
 using RawRabbit.Channel.Abstraction;
 using RawRabbit.Common;
 using RawRabbit.Configuration;

diff --git a/src/RawRabbit/Operations/Subscriber.cs b/src/RawRabbit/Operations/Subscriber.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using RabbitMQ.Client;
 using RawRabbit.Channel.Abstraction;
 using RawRabbit.Common;
 using RawRabbit.Configuration;

diff --git a/src/RawRabbit/Properties/AssemblyInfo.cs b/src/RawRabbit/Properties/AssemblyInfo.cs
@@ -16,4 +16,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5bec0b38-6746-47de-b931-b9a7b8e0e732")]
+//[assembly: Guid("5bec0b38-6746-47de-b931-b9a7b8e0e732")]
diff --git a/src/RawRabbit/project.json b/src/RawRabbit/project.json
@@ -1,6 +1,6 @@
 {
 	"title": "RawRabbit",
-	"version": "1.9.4-dotnetcore",
+	"version": "1.9.4.1-dotnetcore",
 	"authors": [ "pardahlman", "enrique-avalon" ],
 	"description": "A modern framework for communication over RabbitMq.",
 	"packOptions": {
@@ -11,8 +11,8 @@
 	},
 
 	"dependencies": {
-			"RabbitMQ.Client": "4.0.0-ci-201607111224",
-			"Newtonsoft.Json": "9.0.1"
+			"RabbitMQ.Client": "4.0.0-rc-1",
+		"Newtonsoft.Json": "9.0.1"
 	},
 
 	"frameworks": {

diff --git a/test/RawRabbit.IntegrationTests/Extensions/MessageSequenceTests.cs b/test/RawRabbit.IntegrationTests/Extensions/MessageSequenceTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using RabbitMQ.Client;
 using RawRabbit.Configuration;
 using RawRabbit.Context;
 using RawRabbit.Extensions.CleanEverything;

diff --git a/test/RawRabbit.IntegrationTests/Extensions/TopologyUpdaterTests.cs b/test/RawRabbit.IntegrationTests/Extensions/TopologyUpdaterTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using RabbitMQ.Client;
 using RabbitMQ.Client.Exceptions;
 using RawRabbit.Configuration;
 using RawRabbit.Configuration.Exchange;
@@ -9,6 +10,7 @@
 using RawRabbit.Extensions.TopologyUpdater;
 using RawRabbit.IntegrationTests.TestMessages;
 using Xunit;
+using ExchangeType = RawRabbit.Configuration.Exchange.ExchangeType;
 
 namespace RawRabbit.IntegrationTests.Extensions
 {

diff --git a/test/RawRabbit.IntegrationTests/Features/NackingTests.cs b/test/RawRabbit.IntegrationTests/Features/NackingTests.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using RabbitMQ.Client;
 using RawRabbit.Common;
 using RawRabbit.Configuration;
 using RawRabbit.Context;

diff --git a/test/RawRabbit.IntegrationTests/RabbitMqTutorial/HelloWorldTest.cs b/test/RawRabbit.IntegrationTests/RabbitMqTutorial/HelloWorldTest.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using RabbitMQ.Client;
 using RawRabbit.Common;
 using RawRabbit.Configuration.Exchange;
 using RawRabbit.IntegrationTests.TestMessages;

diff --git a/test/RawRabbit.IntegrationTests/SimpleUse/SubscribeToDifferentMessageTypes.cs b/test/RawRabbit.IntegrationTests/SimpleUse/SubscribeToDifferentMessageTypes.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using RabbitMQ.Client;
 using RawRabbit.Common;
 using RawRabbit.IntegrationTests.TestMessages;
 using RawRabbit.vNext;

diff --git a/test/RawRabbit.IntegrationTests/SimpleUse/TopicExchangeTests.cs b/test/RawRabbit.IntegrationTests/SimpleUse/TopicExchangeTests.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using RabbitMQ.Client;
 using RawRabbit.Common;
 using RawRabbit.Configuration.Exchange;
 using RawRabbit.IntegrationTests.TestMessages;