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

lukebakken · web-flow · commit c1133811926f · 2020-08-20T12:24:30.000-07:00
Backport #929
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>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: "6.1.1.{build}"`
	`1`	`+version: "6.2.0.{build}"`
`2`	`2`
`3`	`3`	`platform: Any CPU`
`4`	`4`	`configuration: Release`
Original file line number	Diff line number	Diff line change
`@@ -688,18 +688,22 @@ namespace RabbitMQ.Client.Events`
`688`	`688`	`}`
`689`	`689`	`namespace RabbitMQ.Client.Exceptions`
`690`	`690`	`{`
	`691`	`+ [System.Serializable]`
`691`	`692`	`public class AlreadyClosedException : RabbitMQ.Client.Exceptions.OperationInterruptedException`
`692`	`693`	`{`
`693`	`694`	`public AlreadyClosedException(RabbitMQ.Client.ShutdownEventArgs reason) { }`
`694`	`695`	`}`
	`696`	`+ [System.Serializable]`
`695`	`697`	`public class AuthenticationFailureException : RabbitMQ.Client.Exceptions.PossibleAuthenticationFailureException`
`696`	`698`	`{`
`697`	`699`	`public AuthenticationFailureException(string msg) { }`
`698`	`700`	`}`
	`701`	`+ [System.Serializable]`
`699`	`702`	`public class BrokerUnreachableException : System.IO.IOException`
`700`	`703`	`{`
`701`	`704`	`public BrokerUnreachableException(System.Exception Inner) { }`
`702`	`705`	`}`
	`706`	`+ [System.Serializable]`
`703`	`707`	`public class ChannelAllocationException : RabbitMQ.Client.Exceptions.ProtocolViolationException`
`704`	`708`	`{`
`705`	`709`	`public ChannelAllocationException() { }`
`@@ -712,6 +716,7 @@ namespace RabbitMQ.Client.Exceptions`
`712`	`716`	`public int Channel { get; }`
`713`	`717`	`public override ushort ReplyCode { get; }`
`714`	`718`	`}`
	`719`	`+ [System.Serializable]`
`715`	`720`	`public class ConnectFailureException : RabbitMQ.Client.Exceptions.ProtocolViolationException`
`716`	`721`	`{`
`717`	`722`	`public ConnectFailureException(string msg, System.Exception inner) { }`
`@@ -725,6 +730,7 @@ namespace RabbitMQ.Client.Exceptions`
`725`	`730`	`public MalformedFrameException(string message) { }`
`726`	`731`	`public override ushort ReplyCode { get; }`
`727`	`732`	`}`
	`733`	`+ [System.Serializable]`
`728`	`734`	`public class OperationInterruptedException : RabbitMQ.Client.Exceptions.RabbitMQClientException`
`729`	`735`	`{`
`730`	`736`	`protected OperationInterruptedException() { }`
`@@ -734,6 +740,7 @@ namespace RabbitMQ.Client.Exceptions`
`734`	`740`	`protected OperationInterruptedException(string message, System.Exception inner) { }`
`735`	`741`	`public RabbitMQ.Client.ShutdownEventArgs ShutdownReason { get; set; }`
`736`	`742`	`}`
	`743`	`+ [System.Serializable]`
`737`	`744`	`public class PacketNotRecognizedException : RabbitMQ.Client.Exceptions.RabbitMQClientException`
`738`	`745`	`{`
`739`	`746`	`public PacketNotRecognizedException(int transportHigh, int transportLow, int serverMajor, int serverMinor) { }`
`@@ -742,6 +749,7 @@ namespace RabbitMQ.Client.Exceptions`
`742`	`749`	`public int TransportHigh { get; }`
`743`	`750`	`public int TransportLow { get; }`
`744`	`751`	`}`
	`752`	`+ [System.Serializable]`
`745`	`753`	`public class PossibleAuthenticationFailureException : RabbitMQ.Client.Exceptions.RabbitMQClientException`
`746`	`754`	`{`
`747`	`755`	`public PossibleAuthenticationFailureException(string msg) { }`
`@@ -753,6 +761,7 @@ namespace RabbitMQ.Client.Exceptions`
`753`	`761`	`public abstract ushort ReplyCode { get; }`
`754`	`762`	`public virtual RabbitMQ.Client.ShutdownEventArgs ShutdownReason { get; }`
`755`	`763`	`}`
	`764`	`+ [System.Serializable]`
`756`	`765`	`public class ProtocolVersionMismatchException : RabbitMQ.Client.Exceptions.ProtocolViolationException`
`757`	`766`	`{`
`758`	`767`	`public ProtocolVersionMismatchException(int clientMajor, int clientMinor, int serverMajor, int serverMinor) { }`
`@@ -761,12 +770,14 @@ namespace RabbitMQ.Client.Exceptions`
`761`	`770`	`public int ServerMajor { get; }`
`762`	`771`	`public int ServerMinor { get; }`
`763`	`772`	`}`
	`773`	`+ [System.Serializable]`
`764`	`774`	`public class ProtocolViolationException : RabbitMQ.Client.Exceptions.RabbitMQClientException`
`765`	`775`	`{`
`766`	`776`	`public ProtocolViolationException() { }`
`767`	`777`	`public ProtocolViolationException(string message) { }`
`768`	`778`	`public ProtocolViolationException(string message, System.Exception inner) { }`
`769`	`779`	`}`
	`780`	`+ [System.Serializable]`
`770`	`781`	`public abstract class RabbitMQClientException : System.Exception`
`771`	`782`	`{`
`772`	`783`	`protected RabbitMQClientException() { }`
`@@ -791,6 +802,7 @@ namespace RabbitMQ.Client.Exceptions`
`791`	`802`	`{`
`792`	`803`	`public override ushort ReplyCode { get; }`
`793`	`804`	`}`
	`805`	`+ [System.Serializable]`
`794`	`806`	`public class UnexpectedMethodException : RabbitMQ.Client.Exceptions.ProtocolViolationException`
`795`	`807`	`{`
`796`	`808`	`public UnexpectedMethodException(RabbitMQ.Client.IMethod method) { }`
`@@ -804,17 +816,20 @@ namespace RabbitMQ.Client.Exceptions`
`804`	`816`	`public override ushort ReplyCode { get; }`
`805`	`817`	`public override string ToString() { }`
`806`	`818`	`}`
	`819`	`+ [System.Serializable]`
`807`	`820`	`public class UnsupportedMethodException : System.NotSupportedException`
`808`	`821`	`{`
`809`	`822`	`public UnsupportedMethodException(string methodName) { }`
`810`	`823`	`public string MethodName { get; }`
`811`	`824`	`}`
	`825`	`+ [System.Serializable]`
`812`	`826`	`public class UnsupportedMethodFieldException : System.NotSupportedException`
`813`	`827`	`{`
`814`	`828`	`public UnsupportedMethodFieldException(string methodName, string fieldName) { }`
`815`	`829`	`public string FieldName { get; }`
`816`	`830`	`public string MethodName { get; }`
`817`	`831`	`}`
	`832`	`+ [System.Serializable]`
`818`	`833`	`public class WireFormattingException : RabbitMQ.Client.Exceptions.ProtocolViolationException`
`819`	`834`	`{`
`820`	`835`	`public WireFormattingException(string message) { }`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@`
`32`	`32`	`using System.Threading.Tasks;`
`33`	`33`	`using NUnit.Framework;`
`34`	`34`	`using PublicApiGenerator;`
`35`		`-using Verify;`
`36`	`35`	`using VerifyNUnit;`
	`36`	`+using VerifyTests;`
`37`	`37`
`38`	`38`	`namespace RabbitMQ.Client.Unit`
`39`	`39`	`{`