Address new issues after multi-targeting

Author: bart-vmware

shared-package.props

@@ -33,6 +33,14 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!--
+      Temporary workaround for CA1873: Evaluation of this argument may be expensive and unnecessary if logging is disabled.
+      Should be revisited as part of https://github.com/SteeltoeOSS/Steeltoe/issues/969.
+      -->
+    <NoWarn>$(NoWarn);CA1873</NoWarn>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(CI)' != ''">
     <!--
       While deterministic builds are enabled by default in .NET SDK projects, there is an extra property, ContinuousIntegrationBuild,

src/Common/src/Certificates/ConfigureCertificateOptions.cs

@@ -42,12 +42,14 @@ public void Configure(string? name, CertificateOptions options)
 
         string? privateKeyFilePath = _configuration.GetValue<string>(GetConfigurationKey(name, "PrivateKeyFilePath"));
 
+#pragma warning disable SYSLIB0057 // Type or member is obsolete
         options.Certificate = privateKeyFilePath != null && File.Exists(privateKeyFilePath)
             ? X509Certificate2.CreateFromPemFile(certificateFilePath, privateKeyFilePath)
             : new X509Certificate2(certificateFilePath);
 
         X509Certificate2[] certificateChain = CertificateRegex.Matches(File.ReadAllText(certificateFilePath))
             .Select(x => new X509Certificate2(Encoding.ASCII.GetBytes(x.Value))).ToArray();
+#pragma warning restore SYSLIB0057 // Type or member is obsolete
 
         foreach (X509Certificate2 issuer in certificateChain.Skip(1))
         {

src/Common/src/Certificates/LocalCertificateWriter.cs

@@ -63,7 +63,9 @@ public void Write(Guid orgId, Guid spaceId)
         }
         else
         {
+#pragma warning disable SYSLIB0057 // Type or member is obsolete
             caCertificate = new X509Certificate2(RootCaPfxPath);
+#pragma warning restore SYSLIB0057 // Type or member is obsolete
         }
 
         // Create the intermediate certificate if it doesn't already exist (can be shared by multiple applications)
@@ -76,7 +78,9 @@ public void Write(Guid orgId, Guid spaceId)
         }
         else
         {
+#pragma warning disable SYSLIB0057 // Type or member is obsolete
             intermediateCertificate = new X509Certificate2(IntermediatePfxPath);
+#pragma warning restore SYSLIB0057 // Type or member is obsolete
         }
 
         var subjectAlternativeNameBuilder = new SubjectAlternativeNameBuilder();

src/Common/src/Logging/BootstrapLoggerFactory.cs

@@ -4,6 +4,13 @@
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using LockPrimitive =
+#if NET10_0_OR_GREATER
+    System.Threading.Lock
+#else
+    object
+#endif
+    ;
 
 namespace Steeltoe.Common.Logging;
 
@@ -30,7 +37,7 @@ public sealed class BootstrapLoggerFactory : ILoggerFactory
         loggingBuilder.AddConfiguration(configuration);
     };
 
-    private readonly object _lock = new();
+    private readonly LockPrimitive _lock = new();
     private readonly Dictionary<string, UpgradableLogger> _loggersByCategoryName = [];
     private ILoggerFactory _innerFactory;
 

src/Connectors/src/Connectors/Connector.cs

@@ -4,6 +4,13 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using LockPrimitive =
+#if NET10_0_OR_GREATER
+    System.Threading.Lock
+#else
+    object
+#endif
+    ;
 
 namespace Steeltoe.Connectors;
 
@@ -25,7 +32,7 @@ public sealed class Connector<TOptions, TConnection> : IDisposable
     private readonly bool _useSingletonConnection;
     private readonly IOptionsMonitor<TOptions> _optionsMonitor;
 
-    private readonly object _singletonLock = new();
+    private readonly LockPrimitive _singletonLock = new();
     private ConnectionWithOptionsSnapshot? _singletonSnapshot;
     private bool _singletonIsDisposed;
 

src/Discovery/src/Eureka/EurekaApplicationInfoManager.cs

@@ -6,6 +6,13 @@
 using Microsoft.Extensions.Options;
 using Steeltoe.Discovery.Eureka.AppInfo;
 using Steeltoe.Discovery.Eureka.Configuration;
+using LockPrimitive =
+#if NET10_0_OR_GREATER
+    System.Threading.Lock
+#else
+    object
+#endif
+    ;
 
 namespace Steeltoe.Discovery.Eureka;
 
@@ -19,7 +26,7 @@ public sealed class EurekaApplicationInfoManager : IDisposable
     private readonly TimeProvider _timeProvider;
     private readonly IDisposable? _instanceOptionsChangeToken;
     private readonly ILogger<EurekaApplicationInfoManager> _logger;
-    private readonly object _instanceWriteLock = new();
+    private readonly LockPrimitive _instanceWriteLock = new();
 
     // Readers must never be blocked, as it may delay the periodic heartbeat.
     // Updates from user code must be synchronized with configuration changes.

src/Discovery/src/Eureka/EurekaServiceUriStateManager.cs

@@ -6,6 +6,13 @@
 using Microsoft.Extensions.Options;
 using Steeltoe.Discovery.Eureka.Configuration;
 using Steeltoe.Discovery.Eureka.Transport;
+using LockPrimitive =
+#if NET10_0_OR_GREATER
+    System.Threading.Lock
+#else
+    object
+#endif
+    ;
 
 namespace Steeltoe.Discovery.Eureka;
 
@@ -17,7 +24,7 @@ public sealed class EurekaServiceUriStateManager
     private readonly IOptionsMonitor<EurekaClientOptions> _optionsMonitor;
     private readonly ILogger<EurekaServiceUriStateManager> _logger;
 
-    private readonly object _lockObject = new();
+    private readonly LockPrimitive _lockObject = new();
     private readonly HashSet<Uri> _failedServiceUris = [];
     private Uri? _lastWorkingServiceUri;
 

src/Logging/src/DynamicSerilog/DynamicSerilogLoggerProvider.cs

@@ -7,6 +7,13 @@
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Extensions.Logging;
+using LockPrimitive =
+#if NET10_0_OR_GREATER
+    System.Threading.Lock
+#else
+    object
+#endif
+    ;
 
 namespace Steeltoe.Logging.DynamicSerilog;
 
@@ -15,7 +22,7 @@ namespace Steeltoe.Logging.DynamicSerilog;
 /// </summary>
 public sealed class DynamicSerilogLoggerProvider : DynamicLoggerProvider
 {
-    private static readonly object LoggerLock = new();
+    private static readonly LockPrimitive LoggerLock = new();
     private static Logger? _serilogLogger;
     private readonly IDisposable? _optionsChangeListener;
 

src/Security/src/Authorization.Certificate/PostConfigureCertificateAuthenticationOptions.cs

@@ -39,8 +39,10 @@ public void PostConfigure(string? name, CertificateAuthenticationOptions options
 
         if (!string.IsNullOrEmpty(systemCertPath))
         {
+#pragma warning disable SYSLIB0057 // Type or member is obsolete
             X509Certificate2[] systemCertificates =
                 Directory.GetFiles(systemCertPath).Select(certificateFilename => new X509Certificate2(certificateFilename)).ToArray();
+#pragma warning restore SYSLIB0057 // Type or member is obsolete
 
             options.CustomTrustStore.AddRange(systemCertificates);
         }