From 875b874bf1b4bf66e17662dbaac36945e83d494e Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Thu, 20 Aug 2020 10:47:51 -0700 Subject: [PATCH 1/2] Update dependencies to latest versions Hoping that the MinVer update will fix the CI process --- projects/RabbitMQ.Client/RabbitMQ.Client.csproj | 2 +- projects/Unit/APIApproval.cs | 2 +- projects/Unit/Unit.csproj | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/RabbitMQ.Client/RabbitMQ.Client.csproj b/projects/RabbitMQ.Client/RabbitMQ.Client.csproj index 2af20d6c4d..773051fcd1 100755 --- a/projects/RabbitMQ.Client/RabbitMQ.Client.csproj +++ b/projects/RabbitMQ.Client/RabbitMQ.Client.csproj @@ -55,7 +55,7 @@ - + diff --git a/projects/Unit/APIApproval.cs b/projects/Unit/APIApproval.cs index 6c0dafcc01..2def2ac034 100644 --- a/projects/Unit/APIApproval.cs +++ b/projects/Unit/APIApproval.cs @@ -32,8 +32,8 @@ using System.Threading.Tasks; using NUnit.Framework; using PublicApiGenerator; -using Verify; using VerifyNUnit; +using VerifyTests; namespace RabbitMQ.Client.Unit { diff --git a/projects/Unit/Unit.csproj b/projects/Unit/Unit.csproj index 41dfe832df..7bc6f0b2ec 100755 --- a/projects/Unit/Unit.csproj +++ b/projects/Unit/Unit.csproj @@ -11,12 +11,12 @@ - + - - - + + + From 6f20732f3edef42502d1cb82012bbc086e7d5a50 Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Thu, 20 Aug 2020 11:13:13 -0700 Subject: [PATCH 2/2] Fixup approval expectation --- .../Unit/APIApproval.Approve.verified.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/projects/Unit/APIApproval.Approve.verified.txt b/projects/Unit/APIApproval.Approve.verified.txt index 6a3a66ea35..5ccadb1bcf 100644 --- a/projects/Unit/APIApproval.Approve.verified.txt +++ b/projects/Unit/APIApproval.Approve.verified.txt @@ -31,8 +31,8 @@ namespace RabbitMQ.Client public override bool Equals(object obj) { } public override int GetHashCode() { } public override string ToString() { } - public static bool !=(RabbitMQ.Client.AmqpTimestamp left, RabbitMQ.Client.AmqpTimestamp right) { } - public static bool ==(RabbitMQ.Client.AmqpTimestamp left, RabbitMQ.Client.AmqpTimestamp right) { } + public static bool operator !=(RabbitMQ.Client.AmqpTimestamp left, RabbitMQ.Client.AmqpTimestamp right) { } + public static bool operator ==(RabbitMQ.Client.AmqpTimestamp left, RabbitMQ.Client.AmqpTimestamp right) { } } public class AsyncDefaultBasicConsumer : RabbitMQ.Client.IAsyncBasicConsumer, RabbitMQ.Client.IBasicConsumer { @@ -684,18 +684,22 @@ namespace RabbitMQ.Client.Events } namespace RabbitMQ.Client.Exceptions { + [System.Serializable] public class AlreadyClosedException : RabbitMQ.Client.Exceptions.OperationInterruptedException { public AlreadyClosedException(RabbitMQ.Client.ShutdownEventArgs reason) { } } + [System.Serializable] public class AuthenticationFailureException : RabbitMQ.Client.Exceptions.PossibleAuthenticationFailureException { public AuthenticationFailureException(string msg) { } } + [System.Serializable] public class BrokerUnreachableException : System.IO.IOException { public BrokerUnreachableException(System.Exception Inner) { } } + [System.Serializable] public class ChannelAllocationException : RabbitMQ.Client.Exceptions.ProtocolViolationException { public ChannelAllocationException() { } @@ -708,6 +712,7 @@ namespace RabbitMQ.Client.Exceptions public int Channel { get; } public override ushort ReplyCode { get; } } + [System.Serializable] public class ConnectFailureException : RabbitMQ.Client.Exceptions.ProtocolViolationException { public ConnectFailureException(string msg, System.Exception inner) { } @@ -721,6 +726,7 @@ namespace RabbitMQ.Client.Exceptions public MalformedFrameException(string message) { } public override ushort ReplyCode { get; } } + [System.Serializable] public class OperationInterruptedException : RabbitMQ.Client.Exceptions.RabbitMQClientException { protected OperationInterruptedException() { } @@ -730,6 +736,7 @@ namespace RabbitMQ.Client.Exceptions protected OperationInterruptedException(string message, System.Exception inner) { } public RabbitMQ.Client.ShutdownEventArgs ShutdownReason { get; set; } } + [System.Serializable] public class PacketNotRecognizedException : RabbitMQ.Client.Exceptions.RabbitMQClientException { public PacketNotRecognizedException(int transportHigh, int transportLow, int serverMajor, int serverMinor) { } @@ -738,6 +745,7 @@ namespace RabbitMQ.Client.Exceptions public int TransportHigh { get; } public int TransportLow { get; } } + [System.Serializable] public class PossibleAuthenticationFailureException : RabbitMQ.Client.Exceptions.RabbitMQClientException { public PossibleAuthenticationFailureException(string msg) { } @@ -749,6 +757,7 @@ namespace RabbitMQ.Client.Exceptions public abstract ushort ReplyCode { get; } public virtual RabbitMQ.Client.ShutdownEventArgs ShutdownReason { get; } } + [System.Serializable] public class ProtocolVersionMismatchException : RabbitMQ.Client.Exceptions.ProtocolViolationException { public ProtocolVersionMismatchException(int clientMajor, int clientMinor, int serverMajor, int serverMinor) { } @@ -757,12 +766,14 @@ namespace RabbitMQ.Client.Exceptions public int ServerMajor { get; } public int ServerMinor { get; } } + [System.Serializable] public class ProtocolViolationException : RabbitMQ.Client.Exceptions.RabbitMQClientException { public ProtocolViolationException() { } public ProtocolViolationException(string message) { } public ProtocolViolationException(string message, System.Exception inner) { } } + [System.Serializable] public abstract class RabbitMQClientException : System.Exception { protected RabbitMQClientException() { } @@ -787,6 +798,7 @@ namespace RabbitMQ.Client.Exceptions { public override ushort ReplyCode { get; } } + [System.Serializable] public class UnexpectedMethodException : RabbitMQ.Client.Exceptions.ProtocolViolationException { public UnexpectedMethodException(ushort classId, ushort methodId, string methodName) { } @@ -802,17 +814,20 @@ namespace RabbitMQ.Client.Exceptions public override ushort ReplyCode { get; } public override string ToString() { } } + [System.Serializable] public class UnsupportedMethodException : System.NotSupportedException { public UnsupportedMethodException(string methodName) { } public string MethodName { get; } } + [System.Serializable] public class UnsupportedMethodFieldException : System.NotSupportedException { public UnsupportedMethodFieldException(string methodName, string fieldName) { } public string FieldName { get; } public string MethodName { get; } } + [System.Serializable] public class WireFormattingException : RabbitMQ.Client.Exceptions.ProtocolViolationException { public WireFormattingException(string message) { }