#1479 Rework conditional packages in v6 branch including adding net 6 (#1482)

thompson-tomo · lukebakken · web-flow · commit 08e1837c4369 · 2024-03-15T15:20:32.000-07:00
* Have added net 6 as a TFM and implement conditional packages

Revert NetworkOrderDeserializer

Have ported some changes from V7 + Reviewed conditional compiles

* Bump Erlang and RabbitMQ versions for CI

---------

Co-authored-by: Luke Bakken &lt;luke@bakken.io&gt;
diff --git a/.ci/versions.json b/.ci/versions.json
@@ -1,4 +1,4 @@
 {
-  "erlang": "26.0.2",
-  "rabbitmq": "3.12.4"
+  "erlang": "26.2.3",
+  "rabbitmq": "3.13.0"
 }
diff --git a/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj b/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyTitle>RabbitMQ OAuth2 Client Library for .NET</AssemblyTitle>
@@ -59,6 +59,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework) == 'net462' OR $(TargetFramework) == 'netstandard2.0'">
     <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
     <PackageReference Include="System.Text.Json" Version="7.0.2" />
   </ItemGroup>
diff --git a/projects/RabbitMQ.Client/RabbitMQ.Client.csproj b/projects/RabbitMQ.Client/RabbitMQ.Client.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -60,10 +60,10 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
-    <PackageReference Include="System.Threading.Channels" Version="7.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+  <ItemGroup Condition="$(TargetFramework) == 'net462' OR $(TargetFramework) == 'netstandard2.0'">
+    <PackageReference Include="System.Threading.Channels" Version="7.0.0" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 
diff --git a/projects/RabbitMQ.Client/client/exceptions/AlreadyClosedException.cs b/projects/RabbitMQ.Client/client/exceptions/AlreadyClosedException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
     /// <summary>Thrown when the application tries to make use of a
     /// session or connection that has already been shut
     /// down.</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class AlreadyClosedException : OperationInterruptedException
     {
         ///<summary>Construct an instance containing the given
diff --git a/projects/RabbitMQ.Client/client/exceptions/AuthenticationFailureException.cs b/projects/RabbitMQ.Client/client/exceptions/AuthenticationFailureException.cs
@@ -35,9 +35,7 @@ namespace RabbitMQ.Client.Exceptions
 {
     /// <summary> Thrown when the cause is  an
     /// authentication failure. </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class AuthenticationFailureException : PossibleAuthenticationFailureException
     {
         public AuthenticationFailureException(string msg) : base(msg)
diff --git a/projects/RabbitMQ.Client/client/exceptions/BrokerUnreachableException.cs b/projects/RabbitMQ.Client/client/exceptions/BrokerUnreachableException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
 {
     ///<summary>Thrown when no connection could be opened during a
     ///ConnectionFactory.CreateConnection attempt.</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class BrokerUnreachableException : IOException
     {
         ///<summary>Construct a BrokerUnreachableException. The inner exception is
diff --git a/projects/RabbitMQ.Client/client/exceptions/ChannelAllocationException.cs b/projects/RabbitMQ.Client/client/exceptions/ChannelAllocationException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
     /// <summary> Thrown when a SessionManager cannot allocate a new
     /// channel number, or the requested channel number is already in
     /// use. </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class ChannelAllocationException : ProtocolViolationException
     {
         /// <summary>
diff --git a/projects/RabbitMQ.Client/client/exceptions/ConnectFailureException.cs b/projects/RabbitMQ.Client/client/exceptions/ConnectFailureException.cs
@@ -34,9 +34,7 @@
 namespace RabbitMQ.Client.Exceptions
 {
     /// <summary>Thrown when a connection to the broker fails</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class ConnectFailureException : ProtocolViolationException
     {
         public ConnectFailureException(string msg, Exception inner)
diff --git a/projects/RabbitMQ.Client/client/exceptions/OperationInterruptedException.cs b/projects/RabbitMQ.Client/client/exceptions/OperationInterruptedException.cs
@@ -40,9 +40,7 @@ namespace RabbitMQ.Client.Exceptions
     /// operation, an OperationInterruptedException will be thrown to
     /// the caller of IModel.QueueDeclare.
     /// </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class OperationInterruptedException
         // TODO: inherit from OperationCanceledException
         : RabbitMQClientException
diff --git a/projects/RabbitMQ.Client/client/exceptions/PacketNotRecognizedException.cs b/projects/RabbitMQ.Client/client/exceptions/PacketNotRecognizedException.cs
@@ -41,9 +41,7 @@ namespace RabbitMQ.Client.Exceptions
     ///The peer's {'A','M','Q','P',txHi,txLo,major,minor} packet is
     ///decoded into instances of this class.
     ///</remarks>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class PacketNotRecognizedException : RabbitMQClientException
     {
         ///<summary>Fills the new instance's properties with the values passed in.</summary>
diff --git a/projects/RabbitMQ.Client/client/exceptions/PossibleAuthenticationFailureException.cs b/projects/RabbitMQ.Client/client/exceptions/PossibleAuthenticationFailureException.cs
@@ -35,9 +35,7 @@ namespace RabbitMQ.Client.Exceptions
 {
     /// <summary> Thrown when the likely cause is  an
     /// authentication failure. </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class PossibleAuthenticationFailureException : RabbitMQClientException
     {
         public PossibleAuthenticationFailureException(string msg, Exception inner) : base(msg, inner)
diff --git a/projects/RabbitMQ.Client/client/exceptions/ProtocolVersionMismatchException.cs b/projects/RabbitMQ.Client/client/exceptions/ProtocolVersionMismatchException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
     ///<summary>Thrown to indicate that the peer does not support the
     ///wire protocol version we requested immediately after opening
     ///the TCP socket.</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class ProtocolVersionMismatchException : ProtocolViolationException
     {
         ///<summary>Fills the new instance's properties with the values passed in.</summary>
diff --git a/projects/RabbitMQ.Client/client/exceptions/ProtocolViolationException.cs b/projects/RabbitMQ.Client/client/exceptions/ProtocolViolationException.cs
@@ -33,9 +33,7 @@
 
 namespace RabbitMQ.Client.Exceptions
 {
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class ProtocolViolationException : RabbitMQClientException
     {
         public ProtocolViolationException(string message) : base(message)
diff --git a/projects/RabbitMQ.Client/client/exceptions/RabbitMQClientException.cs b/projects/RabbitMQ.Client/client/exceptions/RabbitMQClientException.cs
@@ -33,9 +33,7 @@
 
 namespace RabbitMQ.Client.Exceptions
 {
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public abstract class RabbitMQClientException : Exception
     {
         /// <summary>Initializes a new instance of the <see cref="RabbitMQClientException" /> class.</summary>
diff --git a/projects/RabbitMQ.Client/client/exceptions/UnexpectedMethodException.cs b/projects/RabbitMQ.Client/client/exceptions/UnexpectedMethodException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
     /// <summary>
     /// Thrown when the model receives an RPC reply that it wasn't expecting.
     /// </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class UnexpectedMethodException : ProtocolViolationException
     {
         public UnexpectedMethodException(IMethod method)
diff --git a/projects/RabbitMQ.Client/client/exceptions/UnsupportedMethodException.cs b/projects/RabbitMQ.Client/client/exceptions/UnsupportedMethodException.cs
@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions
     /// <summary>
     /// Thrown when the model receives an RPC request it cannot satisfy.
     /// </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class UnsupportedMethodException : NotSupportedException
     {
         public UnsupportedMethodException(string methodName)
diff --git a/projects/RabbitMQ.Client/client/exceptions/UnsupportedMethodFieldException.cs b/projects/RabbitMQ.Client/client/exceptions/UnsupportedMethodFieldException.cs
@@ -37,9 +37,7 @@ namespace RabbitMQ.Client.Exceptions
     /// because the version of the protocol the model is implementing
     /// does not contain a definition for the field in
     /// question.</summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class UnsupportedMethodFieldException : NotSupportedException
     {
         public UnsupportedMethodFieldException(string methodName, string fieldName)
diff --git a/projects/RabbitMQ.Client/client/exceptions/WireFormattingException.cs b/projects/RabbitMQ.Client/client/exceptions/WireFormattingException.cs
@@ -35,9 +35,7 @@ namespace RabbitMQ.Client.Exceptions
 {
     /// <summary> Thrown when the wire-formatting code cannot encode a
     /// particular .NET value to AMQP protocol format.  </summary>
-#if !NETSTANDARD1_5
     [Serializable]
-#endif
     public class WireFormattingException : ProtocolViolationException
     {
         ///<summary>Construct a WireFormattingException with no
diff --git a/projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.cs b/projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.cs
@@ -38,6 +38,7 @@ namespace RabbitMQ.Client.Logging
     [EventSource(Name = "rabbitmq-dotnet-client")]
     public sealed class RabbitMqClientEventSource : EventSource
     {
+        public static readonly RabbitMqClientEventSource Log = new RabbitMqClientEventSource();
         public class Keywords
         {
             public const EventKeywords Log = (EventKeywords)1;
@@ -47,8 +48,6 @@ public RabbitMqClientEventSource() : base(EventSourceSettings.EtwSelfDescribingE
         {
         }
 
-        public static RabbitMqClientEventSource Log = new RabbitMqClientEventSource();
-
         [Event(1, Message = "INFO", Keywords = Keywords.Log, Level = EventLevel.Informational)]
         public void Info(string message)
         {
@@ -67,20 +66,25 @@ public void Warn(string message)
         public void Error(string message, RabbitMqExceptionDetail ex)
         {
             if (IsEnabled())
+#if NET6_0_OR_GREATER
                 WriteExceptionEvent(message, ex);
+#else
+                WriteEvent(3, message, ex);
+#endif
         }
 
         [NonEvent]
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The properties are preserved with the DynamicallyAccessedMembers attribute.")]
-        private void WriteExceptionEvent<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T>(string message, T ex)
+        public void Error(string message, Exception ex)
         {
-            WriteEvent(3, message, ex);
+            Error(message, new RabbitMqExceptionDetail(ex));
         }
 
-        [NonEvent]
-        public void Error(string message, Exception ex)
+#if NET6_0_OR_GREATER
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The properties are preserved with the DynamicallyAccessedMembers attribute.")]
+        private void WriteExceptionEvent<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T>(string message, T ex)
         {
-            Error(message, new RabbitMqExceptionDetail(ex));
+            WriteEvent(3, message, ex);
         }
+#endif
     }
 }
diff --git a/projects/RabbitMQ.Client/util/NetworkOrderDeserializer.cs b/projects/RabbitMQ.Client/util/NetworkOrderDeserializer.cs
@@ -15,7 +15,7 @@ internal static double ReadDouble(ReadOnlySpan<byte> span)
                 throw new ArgumentOutOfRangeException(nameof(span), "Insufficient length to decode Double from memory.");
             }
             ulong val = ReadUInt64(span);
-#elif NETSTANDARD
+#else
             ulong val = BinaryPrimitives.ReadUInt64BigEndian(span);
 #endif
             return Unsafe.As<ulong, double>(ref val);
@@ -31,7 +31,7 @@ internal static short ReadInt16(ReadOnlySpan<byte> span)
             }
 
             return (short)ReadUInt16(span);
-#elif NETSTANDARD
+#else
             return BinaryPrimitives.ReadInt16BigEndian(span);
 #endif
         }
@@ -46,7 +46,7 @@ internal static int ReadInt32(ReadOnlySpan<byte> span)
             }
 
             return (int)ReadUInt32(span);
-#elif NETSTANDARD
+#else
             return BinaryPrimitives.ReadInt32BigEndian(span);
 #endif
         }
@@ -61,7 +61,7 @@ internal static long ReadInt64(ReadOnlySpan<byte> span)
             }
 
             return (long)ReadUInt64(span);
-#elif NETSTANDARD
+#else
             return BinaryPrimitives.ReadInt64BigEndian(span);
 #endif
         }
@@ -76,7 +76,7 @@ internal static float ReadSingle(ReadOnlySpan<byte> span)
             }
 
             uint num = ReadUInt32(span);
-#elif NETSTANDARD
+#else
             uint num = BinaryPrimitives.ReadUInt32BigEndian(span);
 #endif
             return Unsafe.As<uint, float>(ref num);
@@ -92,7 +92,7 @@ internal static ushort ReadUInt16(ReadOnlySpan<byte> span)
             }
 
             return (ushort)((span[0] << 8) | span[1]);
-#elif NETSTANDARD
+#else
             return BinaryPrimitives.ReadUInt16BigEndian(span);
 #endif
         }
@@ -107,7 +107,7 @@ internal static uint ReadUInt32(ReadOnlySpan<byte> span)
             }
 
             return (uint)((span[0] << 24) | (span[1] << 16) | (span[2] << 8) | span[3]);
-#elif NETSTANDARD
+#else
             return BinaryPrimitives.ReadUInt32BigEndian(span);
 #endif
         }
@@ -124,7 +124,7 @@ internal static ulong ReadUInt64(ReadOnlySpan<byte> span)
             uint num1 = (uint)((span[0] << 24) | (span[1] << 16) | (span[2] << 8) | span[3]);
             uint num2 = (uint)((span[4] << 24) | (span[5] << 16) | (span[6] << 8) | span[7]);
             return ((ulong)num1 << 32) | num2;
-#elif NETSTANDARD
+#else
             return BinaryPrimitives.ReadUInt64BigEndian(span);
 #endif
         }
diff --git a/projects/RabbitMQ.Client/util/NetworkOrderSerializer.cs b/projects/RabbitMQ.Client/util/NetworkOrderSerializer.cs
@@ -25,7 +25,7 @@ internal static void WriteDouble(Span<byte> span, double val)
             span[5] = (byte)((tempVal >> 16) & 0xFF);
             span[6] = (byte)((tempVal >> 8) & 0xFF);
             span[7] = (byte)(tempVal & 0xFF);
-#elif NETSTANDARD
+#else
             long tempVal = BitConverter.DoubleToInt64Bits(val);
             BinaryPrimitives.WriteInt64BigEndian(span, tempVal);
 #endif
@@ -42,7 +42,7 @@ internal static void WriteInt16(Span<byte> span, short val)
 
             span[0] = (byte)((val >> 8) & 0xFF);
             span[1] = (byte)(val & 0xFF);
-#elif NETSTANDARD
+#else
             BinaryPrimitives.WriteInt16BigEndian(span, val);
 #endif
         }
@@ -60,7 +60,7 @@ internal static void WriteInt32(Span<byte> span, int val)
             span[1] = (byte)((val >> 16) & 0xFF);
             span[2] = (byte)((val >> 8) & 0xFF);
             span[3] = (byte)(val & 0xFF);
-#elif NETSTANDARD
+#else
             BinaryPrimitives.WriteInt32BigEndian(span, val);
 #endif
         }
@@ -82,7 +82,7 @@ internal static void WriteInt64(Span<byte> span, long val)
             span[5] = (byte)((val >> 16) & 0xFF);
             span[6] = (byte)((val >> 8) & 0xFF);
             span[7] = (byte)(val & 0xFF);
-#elif NETSTANDARD
+#else
             BinaryPrimitives.WriteInt64BigEndian(span, val);
 #endif
         }
@@ -101,7 +101,7 @@ internal static void WriteSingle(Span<byte> span, float val)
             span[1] = (byte)((tempVal >> 16) & 0xFF);
             span[2] = (byte)((tempVal >> 8) & 0xFF);
             span[3] = (byte)(tempVal & 0xFF);
-#elif NETSTANDARD
+#else
             int tempVal = Unsafe.As<float, int>(ref val);
             BinaryPrimitives.WriteInt32BigEndian(span, tempVal);
 #endif
@@ -118,7 +118,7 @@ internal static void WriteUInt16(Span<byte> span, ushort val)
 
             span[0] = (byte)((val >> 8) & 0xFF);
             span[1] = (byte)(val & 0xFF);
-#elif NETSTANDARD
+#else
             BinaryPrimitives.WriteUInt16BigEndian(span, val);
 #endif
         }
@@ -136,7 +136,7 @@ internal static void WriteUInt32(Span<byte> span, uint val)
             span[1] = (byte)((val >> 16) & 0xFF);
             span[2] = (byte)((val >> 8) & 0xFF);
             span[3] = (byte)(val & 0xFF);
-#elif NETSTANDARD
+#else
             BinaryPrimitives.WriteUInt32BigEndian(span, val);
 #endif
         }
@@ -159,7 +159,7 @@ internal static void WriteUInt64(Span<byte> span, ulong val)
             span[5] = (byte)((val >> 16) & 0xFF);
             span[6] = (byte)((val >> 8) & 0xFF);
             span[7] = (byte)(val & 0xFF);
-#elif NETSTANDARD
+#else
             BinaryPrimitives.WriteUInt64BigEndian(span, val);
 #endif
         }
diff --git a/projects/Unit/APIApproval.Approve.DotNet.verified.txt b/projects/Unit/APIApproval.Approve.DotNet.verified.txt
diff --git a/projects/Unit/APIApproval.Approve.Net.verified.txt b/projects/Unit/APIApproval.Approve.Net.verified.txt
diff --git a/projects/Unit/APIApproval.cs b/projects/Unit/APIApproval.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "erlang": "26.0.2",`
`3`		`- "rabbitmq": "3.12.4"`
	`2`	`+ "erlang": "26.2.3",`
	`3`	`+ "rabbitmq": "3.13.0"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ namespace RabbitMQ.Client.Exceptions`
`35`	`35`	`{`
`36`	`36`	`/// <summary> Thrown when the cause is an`
`37`	`37`	`/// authentication failure. </summary>`
`38`		`-#if !NETSTANDARD1_5`
`39`	`38`	`[Serializable]`
`40`		`-#endif`
`41`	`39`	`public class AuthenticationFailureException : PossibleAuthenticationFailureException`
`42`	`40`	`{`
`43`	`41`	`public AuthenticationFailureException(string msg) : base(msg)`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,7 @@ namespace RabbitMQ.Client.Exceptions`
`36`	`36`	`{`
`37`	`37`	`///<summary>Thrown when no connection could be opened during a`
`38`	`38`	`///ConnectionFactory.CreateConnection attempt.</summary>`
`39`		`-#if !NETSTANDARD1_5`
`40`	`39`	`[Serializable]`
`41`		`-#endif`
`42`	`40`	`public class BrokerUnreachableException : IOException`
`43`	`41`	`{`
`44`	`42`	`///<summary>Construct a BrokerUnreachableException. The inner exception is`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,7 @@`
`34`	`34`	`namespace RabbitMQ.Client.Exceptions`
`35`	`35`	`{`
`36`	`36`	`/// <summary>Thrown when a connection to the broker fails</summary>`
`37`		`-#if !NETSTANDARD1_5`
`38`	`37`	`[Serializable]`
`39`		`-#endif`
`40`	`38`	`public class ConnectFailureException : ProtocolViolationException`
`41`	`39`	`{`
`42`	`40`	`public ConnectFailureException(string msg, Exception inner)`