Merge pull request #930 from rabbitmq/lrb-update-dependencies-6.x

Backport #929
rabbitmq · Aug 20, 2020 · c113381 · c113381
2 parents f5b8b22 + 939ef11
commit c113381
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: "6.1.1.{build}"
+version: "6.2.0.{build}"
 
 platform: Any CPU
 configuration: Release

diff --git a/projects/RabbitMQ.Client/RabbitMQ.Client.csproj b/projects/RabbitMQ.Client/RabbitMQ.Client.csproj
@@ -56,7 +56,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="2.3.0" PrivateAssets="All" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="System.Threading.Channels" Version="4.7.1" />
   </ItemGroup>

diff --git a/projects/Unit/APIApproval.Approve.verified.txt b/projects/Unit/APIApproval.Approve.verified.txt
@@ -688,18 +688,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() { }
@@ -712,6 +716,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) { }
@@ -725,6 +730,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() { }
@@ -734,6 +740,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) { }
@@ -742,6 +749,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) { }
@@ -753,6 +761,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) { }
@@ -761,12 +770,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() { }
@@ -791,6 +802,7 @@ namespace RabbitMQ.Client.Exceptions
     {
         public override ushort ReplyCode { get; }
     }
+    [System.Serializable]
     public class UnexpectedMethodException : RabbitMQ.Client.Exceptions.ProtocolViolationException
     {
         public UnexpectedMethodException(RabbitMQ.Client.IMethod method) { }
@@ -804,17 +816,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) { }

diff --git 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
@@ -11,12 +11,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageReference Include="PublicApiGenerator" Version="10.0.2" />
-    <PackageReference Include="Verify.NUnit" Version="1.32.4" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="PublicApiGenerator" Version="10.2.0" />
+    <PackageReference Include="Verify.NUnit" Version="6.9.0" />
   </ItemGroup>
 
 </Project>