From 7c1c13780a502640aef61da09708cb605a9e85b4 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sun, 28 Jan 2024 19:32:01 +1100 Subject: [PATCH] Build fix --- .../client/api/ICredentialsRefresher.cs | 1 + .../logging/RabbitMqClientEventSource.cs | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/projects/RabbitMQ.Client/client/api/ICredentialsRefresher.cs b/projects/RabbitMQ.Client/client/api/ICredentialsRefresher.cs index c3fa966519..2922f1e2b5 100644 --- a/projects/RabbitMQ.Client/client/api/ICredentialsRefresher.cs +++ b/projects/RabbitMQ.Client/client/api/ICredentialsRefresher.cs @@ -31,6 +31,7 @@ using System; using System.Collections.Concurrent; +using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Tracing; using System.Timers; diff --git a/projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.cs b/projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.cs index 4481abcca1..1549f9bc20 100644 --- a/projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.cs +++ b/projects/RabbitMQ.Client/client/logging/RabbitMqClientEventSource.cs @@ -30,12 +30,13 @@ //--------------------------------------------------------------------------- using System; +using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Tracing; namespace RabbitMQ.Client.Logging { [EventSource(Name = "rabbitmq-dotnet-client")] - public sealed class RabbitMqClientEventSource : EventSource + internal sealed partial class RabbitMqClientEventSource : EventSource { public class Keywords { @@ -46,7 +47,7 @@ public RabbitMqClientEventSource() : base(EventSourceSettings.EtwSelfDescribingE { } - public static RabbitMqClientEventSource Log = new RabbitMqClientEventSource(); + public static readonly RabbitMqClientEventSource Log = new RabbitMqClientEventSource(); [Event(1, Message = "INFO", Keywords = Keywords.Log, Level = EventLevel.Informational)] public void Info(string message) @@ -70,11 +71,6 @@ public void Error(string message, RabbitMqExceptionDetail ex) #if NET6_0_OR_GREATER WriteExceptionEvent(message, ex); - [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The properties are preserved with the DynamicallyAccessedMembers attribute.")] - void WriteExceptionEvent<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T>(string message, T ex) - { - WriteEvent(3, message, ex); - } #else WriteEvent(3, message, ex); #endif @@ -86,5 +82,13 @@ public void Error(string message, Exception ex) { Error(message, new RabbitMqExceptionDetail(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) + { + WriteEvent(3, message, ex); + } +#endif } }