Merge branch 'main' into feat/add_activity_on_connection

aygalinc · web-flow · commit dc8927197d23 · 2024-12-09T19:12:56.000+01:00
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -20,9 +20,9 @@ jobs:
           path: |
             ~/.nuget/packages
             ~/AppData/Local/NuGet/v3-cache
-          key: ${{ runner.os }}-v1-nuget-${{ hashFiles('**/*.csproj') }}
+          key: ${{ runner.os }}-v2-nuget-${{ hashFiles('**/*.csproj','projects/Directory.Packages.props') }}
           restore-keys: |
-            ${{ runner.os }}-v1-nuget-
+            ${{ runner.os }}-v2-nuget-
       - name: Build (Debug)
         run: dotnet build ${{ github.workspace }}\Build.csproj
       - name: Verify
@@ -142,9 +142,9 @@ jobs:
           path: |
             ~/.nuget/packages
             ~/.local/share/NuGet/v3-cache
-          key: ${{ runner.os }}-v1-nuget-${{ hashFiles('**/*.csproj') }}
+          key: ${{ runner.os }}-v2-nuget-${{ hashFiles('**/*.csproj','projects/Directory.Packages.props') }}
           restore-keys: |
-            ${{ runner.os }}-v1-nuget-
+            ${{ runner.os }}-v2-nuget-
       - name: Build (Debug)
         run: dotnet build ${{ github.workspace }}/Build.csproj
       - name: Verify
diff --git a/projects/Directory.Packages.props b/projects/Directory.Packages.props
@@ -16,6 +16,8 @@
     -->
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="System.Threading.RateLimiting" Version="8.0.0" />
     <PackageVersion Include="WireMock.Net" Version="1.5.62" />
     <PackageVersion Include="xunit" Version="2.9.0" />
@@ -33,13 +35,9 @@
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
     <PackageVersion Include="System.Memory" Version="4.5.5" />
     <PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework)=='net472'">
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
   </ItemGroup>
diff --git a/projects/RabbitMQ.Client.OAuth2/CredentialsRefresherEventSource.cs b/projects/RabbitMQ.Client.OAuth2/CredentialsRefresherEventSource.cs
@@ -46,7 +46,7 @@ public class CredentialsRefresherEventSource : EventSource
         public void Stopped(string name) => WriteEvent(2, "Stopped", name);
 
         [Event(3)]
-#if NET6_0_OR_GREATER
+#if NET
         [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Parameters to this method are primitive and are trimmer safe")]
 #endif
         public void RefreshedCredentials(string name) => WriteEvent(3, "RefreshedCredentials", name);
diff --git a/projects/RabbitMQ.Client/DefaultEndpointResolver.cs b/projects/RabbitMQ.Client/DefaultEndpointResolver.cs
@@ -37,7 +37,7 @@ namespace RabbitMQ.Client
 {
     public class DefaultEndpointResolver : IEndpointResolver
     {
-#if !NET6_0_OR_GREATER
+#if !NET
         private readonly Random s_rnd = new Random();
 #endif
         private readonly List<AmqpTcpEndpoint> _endpoints;
@@ -49,7 +49,7 @@ public DefaultEndpointResolver(IEnumerable<AmqpTcpEndpoint> tcpEndpoints)
 
         public IEnumerable<AmqpTcpEndpoint> All()
         {
-#if NET6_0_OR_GREATER
+#if NET
             return _endpoints.OrderBy(item => Random.Shared.Next());
 #else
             return _endpoints.OrderBy(item => s_rnd.Next());
diff --git a/projects/RabbitMQ.Client/Impl/AsyncManualResetEvent.cs b/projects/RabbitMQ.Client/Impl/AsyncManualResetEvent.cs
@@ -64,7 +64,7 @@ public async ValueTask WaitAsync(CancellationToken cancellationToken)
             cancellationToken.ThrowIfCancellationRequested();
 
             CancellationTokenRegistration tokenRegistration =
-#if NET6_0_OR_GREATER
+#if NET
                 cancellationToken.UnsafeRegister(
                     static state =>
                     {
@@ -87,7 +87,7 @@ public async ValueTask WaitAsync(CancellationToken cancellationToken)
             }
             finally
             {
-#if NET6_0_OR_GREATER
+#if NET
                 await tokenRegistration.DisposeAsync()
                     .ConfigureAwait(false);
 #else
diff --git a/projects/RabbitMQ.Client/Impl/AsyncRpcContinuations.cs b/projects/RabbitMQ.Client/Impl/AsyncRpcContinuations.cs
@@ -60,7 +60,7 @@ public AsyncRpcContinuation(TimeSpan continuationTimeout, CancellationToken canc
              */
             _continuationTimeoutCancellationTokenSource = new CancellationTokenSource(continuationTimeout);
 
-#if NET6_0_OR_GREATER
+#if NET
             _continuationTimeoutCancellationTokenRegistration = _continuationTimeoutCancellationTokenSource.Token.UnsafeRegister((object? state) =>
             {
                 var tcs = (TaskCompletionSource<T>)state!;
diff --git a/projects/RabbitMQ.Client/Impl/Connection.Commands.cs b/projects/RabbitMQ.Client/Impl/Connection.Commands.cs
@@ -76,7 +76,7 @@ private async ValueTask StartAndTuneAsync(CancellationToken cancellationToken)
         {
             var connectionStartCell = new TaskCompletionSource<ConnectionStartDetails?>(TaskCreationOptions.RunContinuationsAsynchronously);
 
-#if NET6_0_OR_GREATER
+#if NET
             using CancellationTokenRegistration ctr = cancellationToken.UnsafeRegister((object? state) =>
             {
                 if (state != null)
@@ -197,7 +197,7 @@ private IAuthMechanismFactory GetAuthMechanismFactory(string supportedMechanismN
             // Our list is in order of preference, the server one is not.
             foreach (IAuthMechanismFactory factory in _config.AuthMechanisms)
             {
-#if NET6_0_OR_GREATER
+#if NET
                 if (supportedMechanismNames.Contains(factory.Name, StringComparison.OrdinalIgnoreCase))
 #else
                 if (supportedMechanismNames.IndexOf(factory.Name, StringComparison.OrdinalIgnoreCase) >= 0)
diff --git a/projects/RabbitMQ.Client/Impl/RecordedBinding.cs b/projects/RabbitMQ.Client/Impl/RecordedBinding.cs
@@ -106,7 +106,7 @@ public override bool Equals(object? obj)
 
         public override int GetHashCode()
         {
-#if NET6_0_OR_GREATER
+#if NET
             return HashCode.Combine(_isQueueBinding, _destination, _source, _routingKey, _arguments);
 #else
             unchecked
diff --git a/projects/RabbitMQ.Client/Impl/SocketFactory.cs b/projects/RabbitMQ.Client/Impl/SocketFactory.cs
@@ -45,7 +45,7 @@ public static async Task<ITcpClient> OpenAsync(AmqpTcpEndpoint amqpTcpEndpoint,
         {
             IPAddress[] ipAddresses = await Dns.GetHostAddressesAsync(
                 amqpTcpEndpoint.HostName
-#if NET6_0_OR_GREATER
+#if NET
                 , cancellationToken
 #endif
             ).ConfigureAwait(false);
diff --git a/projects/RabbitMQ.Client/Impl/SslHelper.cs b/projects/RabbitMQ.Client/Impl/SslHelper.cs
@@ -68,7 +68,7 @@ public static async Task<Stream> TcpUpgradeAsync(Stream tcpStream, SslOption opt
 
             Task TryAuthenticating(SslOption opts)
             {
-#if NET6_0_OR_GREATER
+#if NET
                 X509RevocationMode certificateRevocationCheckMode = X509RevocationMode.NoCheck;
                 if (opts.CheckCertificateRevocation)
                 {
diff --git a/projects/RabbitMQ.Client/Impl/WireFormatting.Read.cs b/projects/RabbitMQ.Client/Impl/WireFormatting.Read.cs
@@ -172,7 +172,7 @@ public static int ReadShortstr(ReadOnlySpan<byte> span, out string value)
             // equals span.Length >= byteCount + 1
             if (span.Length > byteCount)
             {
-#if NETCOREAPP
+#if NET
                 value = UTF8.GetString(span.Slice(1, byteCount));
 #else
                 unsafe
diff --git a/projects/RabbitMQ.Client/Impl/WireFormatting.Write.cs b/projects/RabbitMQ.Client/Impl/WireFormatting.Write.cs
@@ -86,7 +86,7 @@ public static int GetArrayByteCount(IList? val)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-#if NETCOREAPP
+#if NET
         public static int GetByteCount(ReadOnlySpan<char> val) => val.IsEmpty ? 0 : UTF8.GetByteCount(val);
 #else
         public static int GetByteCount(string val) => string.IsNullOrEmpty(val) ? 0 : UTF8.GetByteCount(val);
diff --git a/projects/RabbitMQ.Client/Logging/RabbitMqClientEventSource.cs b/projects/RabbitMQ.Client/Logging/RabbitMqClientEventSource.cs
@@ -40,7 +40,7 @@ internal sealed partial class RabbitMqClientEventSource : EventSource
     {
         public static readonly RabbitMqClientEventSource Log = new RabbitMqClientEventSource();
 
-#if NET6_0_OR_GREATER
+#if NET
         private readonly PollingCounter _connectionOpenedCounter;
         private readonly PollingCounter _openConnectionCounter;
         private readonly PollingCounter _channelOpenedCounter;
@@ -54,7 +54,7 @@ internal sealed partial class RabbitMqClientEventSource : EventSource
         public RabbitMqClientEventSource()
             : base("rabbitmq-client")
         {
-#if NET6_0_OR_GREATER
+#if NET
             _connectionOpenedCounter = new PollingCounter("total-connections-opened", this, () => s_connectionsOpened)
             {
                 DisplayName = "Total connections opened"
@@ -128,7 +128,7 @@ public void Warn(string message)
             }
         }
 
-#if NET6_0_OR_GREATER
+#if NET
         [Event(3, Keywords = Keywords.Log, Level = EventLevel.Error)]
         [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The properties are preserved with the DynamicallyAccessedMembers attribute.")]
         public void Error(string message, RabbitMqExceptionDetail ex)
diff --git a/projects/RabbitMQ.Client/TaskExtensions.cs b/projects/RabbitMQ.Client/TaskExtensions.cs
@@ -37,7 +37,7 @@ namespace RabbitMQ.Client
 {
     internal static class TaskExtensions
     {
-#if NET6_0_OR_GREATER
+#if NET
         public static bool IsCompletedSuccessfully(this Task task)
         {
             return task.IsCompletedSuccessfully;
@@ -49,7 +49,7 @@ public static bool IsCompletedSuccessfully(this Task task)
         }
 #endif
 
-#if !NET6_0_OR_GREATER
+#if !NET
         private static readonly TaskContinuationOptions s_tco = TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously;
         private static void IgnoreTaskContinuation(Task t, object s) => t.Exception.Handle(e => true);
 
@@ -126,7 +126,7 @@ private static async Task DoWaitAsync(this Task task, CancellationToken cancella
 
         public static Task WaitAsync(this Task task, TimeSpan timeout)
         {
-#if NET6_0_OR_GREATER
+#if NET
             if (task.IsCompletedSuccessfully)
             {
                 return task;
@@ -171,7 +171,7 @@ public static async ValueTask TimeoutAfter(this ValueTask valueTask, TimeSpan ti
                 return;
             }
 
-#if NET6_0_OR_GREATER
+#if NET
             Task task = valueTask.AsTask();
             await task.WaitAsync(timeout)
                 .ConfigureAwait(false);
diff --git a/projects/RabbitMQ.Client/TcpClientAdapter.cs b/projects/RabbitMQ.Client/TcpClientAdapter.cs
@@ -20,7 +20,7 @@ public TcpClientAdapter(Socket socket)
             _sock = socket ?? throw new InvalidOperationException("socket must not be null");
         }
 
-#if NET6_0_OR_GREATER
+#if NET
         public virtual Task ConnectAsync(IPAddress ep, int port, CancellationToken cancellationToken = default)
         {
             return _sock.ConnectAsync(ep, port, cancellationToken).AsTask();
diff --git a/projects/Test/Common/Common.csproj b/projects/Test/Common/Common.csproj
@@ -26,6 +26,7 @@
   </ItemGroup>
   
   <ItemGroup>
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="EasyNetQ.Management.Client" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.abstractions" />
diff --git a/projects/Test/Common/IntegrationFixture.cs b/projects/Test/Common/IntegrationFixture.cs
@@ -89,7 +89,7 @@ public abstract class IntegrationFixture : IAsyncLifetime
         static IntegrationFixture()
         {
 
-#if NET6_0_OR_GREATER
+#if NET
             S_Random = Random.Shared;
 #else
             S_Random = new Random();
diff --git a/projects/Test/Common/TestOutputWriterEventListener.cs b/projects/Test/Common/TestOutputWriterEventListener.cs
@@ -76,7 +76,7 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
         {
             try
             {
-#if NET6_0_OR_GREATER
+#if NET
                 if (eventData.Payload.Count > 0)
                 {
                     string payloadName = eventData.PayloadNames[0];
diff --git a/projects/Test/Integration/Integration.csproj b/projects/Test/Integration/Integration.csproj
@@ -39,6 +39,7 @@
   -->
 
   <ItemGroup>
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
diff --git a/projects/Test/Integration/TestExchangeDeclare.cs b/projects/Test/Integration/TestExchangeDeclare.cs
@@ -112,6 +112,7 @@ public async Task TestConcurrentExchangeDeclareAndDelete()
             var exchangeNames = new ConcurrentBag<string>();
             var tasks = new List<Task>();
             NotSupportedException nse = null;
+            Exception unexpectedException = null;
             for (int i = 0; i < 256; i++)
             {
                 var t = Task.Run(async () =>
@@ -129,13 +130,24 @@ public async Task TestConcurrentExchangeDeclareAndDelete()
                             {
                                 nse = e;
                             }
+                            catch (Exception ex)
+                            {
+                                unexpectedException = ex;
+                            }
                         });
                 tasks.Add(t);
             }
 
             await Task.WhenAll(tasks);
 
-            Assert.Null(nse);
+            if (nse is not null)
+            {
+                Assert.Fail($"got unexpected NotSupportedException: {nse}");
+            }
+            if (unexpectedException is not null)
+            {
+                Assert.Fail($"got unexpected Exception: {unexpectedException}");
+            }
             tasks.Clear();
 
             foreach (string exchangeName in exchangeNames)
@@ -154,13 +166,24 @@ public async Task TestConcurrentExchangeDeclareAndDelete()
                             {
                                 nse = e;
                             }
+                            catch (Exception ex)
+                            {
+                                unexpectedException = ex;
+                            }
                         });
                 tasks.Add(t);
             }
 
             await Task.WhenAll(tasks);
 
-            Assert.Null(nse);
+            if (nse is not null)
+            {
+                Assert.Fail($"got unexpected NotSupportedException: {nse}");
+            }
+            if (unexpectedException is not null)
+            {
+                Assert.Fail($"got unexpected Exception: {unexpectedException}");
+            }
         }
     }
 }
diff --git a/projects/Test/OAuth2/OAuth2.csproj b/projects/Test/OAuth2/OAuth2.csproj
@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="System.Text.RegularExpressions" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
     <PackageReference Include="System.Net.Http" />
diff --git a/projects/Test/SequentialIntegration/SequentialIntegration.csproj b/projects/Test/SequentialIntegration/SequentialIntegration.csproj
@@ -17,6 +17,7 @@
     <SignAssembly>true</SignAssembly>
     <IsTestProject>true</IsTestProject>
     <LangVersion>12.0</LangVersion>
+    <TestTfmsInParallel>false</TestTfmsInParallel>
   </PropertyGroup>
 
   <ItemGroup>
@@ -38,6 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="OpenTelemetry.Exporter.InMemory" />
     <PackageReference Include="xunit" />
diff --git a/projects/Test/Unit/Unit.csproj b/projects/Test/Unit/Unit.csproj
@@ -24,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ namespace RabbitMQ.Client`
`37`	`37`	`{`
`38`	`38`	`public class DefaultEndpointResolver : IEndpointResolver`
`39`	`39`	`{`
`40`		`-#if !NET6_0_OR_GREATER`
	`40`	`+#if !NET`
`41`	`41`	`private readonly Random s_rnd = new Random();`
`42`	`42`	`#endif`
`43`	`43`	`private readonly List<AmqpTcpEndpoint> _endpoints;`
`@@ -49,7 +49,7 @@ public DefaultEndpointResolver(IEnumerable<AmqpTcpEndpoint> tcpEndpoints)`
`49`	`49`
`50`	`50`	`public IEnumerable<AmqpTcpEndpoint> All()`
`51`	`51`	`{`
`52`		`-#if NET6_0_OR_GREATER`
	`52`	`+#if NET`
`53`	`53`	`return _endpoints.OrderBy(item => Random.Shared.Next());`
`54`	`54`	`#else`
`55`	`55`	`return _endpoints.OrderBy(item => s_rnd.Next());`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public async ValueTask WaitAsync(CancellationToken cancellationToken)`
`64`	`64`	`cancellationToken.ThrowIfCancellationRequested();`
`65`	`65`
`66`	`66`	`CancellationTokenRegistration tokenRegistration =`
`67`		`-#if NET6_0_OR_GREATER`
	`67`	`+#if NET`
`68`	`68`	`cancellationToken.UnsafeRegister(`
`69`	`69`	`static state =>`
`70`	`70`	`{`
`@@ -87,7 +87,7 @@ public async ValueTask WaitAsync(CancellationToken cancellationToken)`
`87`	`87`	`}`
`88`	`88`	`finally`
`89`	`89`	`{`
`90`		`-#if NET6_0_OR_GREATER`
	`90`	`+#if NET`
`91`	`91`	`await tokenRegistration.DisposeAsync()`
`92`	`92`	`.ConfigureAwait(false);`
`93`	`93`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public AsyncRpcContinuation(TimeSpan continuationTimeout, CancellationToken canc`
`60`	`60`	`*/`
`61`	`61`	`_continuationTimeoutCancellationTokenSource = new CancellationTokenSource(continuationTimeout);`
`62`	`62`
`63`		`-#if NET6_0_OR_GREATER`
	`63`	`+#if NET`
`64`	`64`	`_continuationTimeoutCancellationTokenRegistration = _continuationTimeoutCancellationTokenSource.Token.UnsafeRegister((object? state) =>`
`65`	`65`	`{`
`66`	`66`	`var tcs = (TaskCompletionSource<T>)state!;`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private async ValueTask StartAndTuneAsync(CancellationToken cancellationToken)`
`76`	`76`	`{`
`77`	`77`	`var connectionStartCell = new TaskCompletionSource<ConnectionStartDetails?>(TaskCreationOptions.RunContinuationsAsynchronously);`
`78`	`78`
`79`		`-#if NET6_0_OR_GREATER`
	`79`	`+#if NET`
`80`	`80`	`using CancellationTokenRegistration ctr = cancellationToken.UnsafeRegister((object? state) =>`
`81`	`81`	`{`
`82`	`82`	`if (state != null)`
`@@ -197,7 +197,7 @@ private IAuthMechanismFactory GetAuthMechanismFactory(string supportedMechanismN`
`197`	`197`	`// Our list is in order of preference, the server one is not.`
`198`	`198`	`foreach (IAuthMechanismFactory factory in _config.AuthMechanisms)`
`199`	`199`	`{`
`200`		`-#if NET6_0_OR_GREATER`
	`200`	`+#if NET`
`201`	`201`	`if (supportedMechanismNames.Contains(factory.Name, StringComparison.OrdinalIgnoreCase))`
`202`	`202`	`#else`
`203`	`203`	`if (supportedMechanismNames.IndexOf(factory.Name, StringComparison.OrdinalIgnoreCase) >= 0)`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public override bool Equals(object? obj)`
`106`	`106`
`107`	`107`	`public override int GetHashCode()`
`108`	`108`	`{`
`109`		`-#if NET6_0_OR_GREATER`
	`109`	`+#if NET`
`110`	`110`	`return HashCode.Combine(_isQueueBinding, _destination, _source, _routingKey, _arguments);`
`111`	`111`	`#else`
`112`	`112`	`unchecked`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static async Task<ITcpClient> OpenAsync(AmqpTcpEndpoint amqpTcpEndpoint,`
`45`	`45`	`{`
`46`	`46`	`IPAddress[] ipAddresses = await Dns.GetHostAddressesAsync(`
`47`	`47`	`amqpTcpEndpoint.HostName`
`48`		`-#if NET6_0_OR_GREATER`
	`48`	`+#if NET`
`49`	`49`	`, cancellationToken`
`50`	`50`	`#endif`
`51`	`51`	`).ConfigureAwait(false);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static async Task<Stream> TcpUpgradeAsync(Stream tcpStream, SslOption opt`
`68`	`68`
`69`	`69`	`Task TryAuthenticating(SslOption opts)`
`70`	`70`	`{`
`71`		`-#if NET6_0_OR_GREATER`
	`71`	`+#if NET`
`72`	`72`	`X509RevocationMode certificateRevocationCheckMode = X509RevocationMode.NoCheck;`
`73`	`73`	`if (opts.CheckCertificateRevocation)`
`74`	`74`	`{`