V9.0.0/lock refactoring

.nuget/Cuemon.Extensions.Threading/PackageReleaseNotes.txt

@@ -1,4 +1,13 @@
-Version 8.3.2
+Version 9.0.0
+Availability: .NET 9, .NET 8, .NET 6 and .NET Standard 2.0
+
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+
+# New Features
+- ADDED support for System.Threading.Lock object that targets .NET TFM prior to .NET 9 (credits to Mark Cilia Vincenti, https://github.com/MarkCiliaVincenti/Backport.System.Threading.Lock)
+
+Version 8.3.2
 Availability: .NET 8, .NET 6 and .NET Standard 2.0
 
 # ALM

CHANGELOG.md

@@ -24,6 +24,7 @@ New features:
 - FailureConverter class in the Cuemon.Extensions.Newtonsoft.Json.Converters namespace to convert FailureConverter to JSON
 - FailureConverter class in the Cuemon.Extensions.Text.Json.Converters namespace to convert FailureConverter to JSON
 - FailureConverter class in the Cuemon.Xml.Serialization.Converters namespace to convert FailureConverter to XML
+- Support for System.Threading.Lock object that targets TFMs prior to .NET 9 (credits to Mark Cilia Vincenti, https://github.com/MarkCiliaVincenti/Backport.System.Threading.Lock)
 
 ### Changed
 

src/Cuemon.Core/Cuemon.Core.csproj

@@ -13,8 +13,4 @@
     <PackageTags>action-factory bit-unit byte-unit binary-prefix decimal-prefix prefix-multiple multiple-table calculator configure configure-revert configure-exchange configurable condition options-pattern data-reader decorator delimited-string disposable finalize-disposable safe-invoke safe-invoke-async func-factory patterns reference-project clean-architecture clean-code task-action-factory task-func-factory template template-factory time-range time-unit validator guard text-encoding parser-factory security aes-cryptor cyclic-redundancy-check fowler-noll-vo-hash hash-factory hash-result hmac-message-digest hmac-secure-hash-algorithm keyed-crypto-hash keyed-crypto-algorithm message-digest non-crypto-algorithm secure-hash-algorithm unkeyed-crypto-hash</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
-    <Compile Remove="Threading\Lock.cs" />
-  </ItemGroup>
-
 </Project>

src/Cuemon.Core/Runtime/Dependency.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Cuemon.Runtime
@@ -13,7 +12,7 @@ public abstract class Dependency : IDependency
     {
         private IEnumerable<IWatcher> _watchers;
         private readonly Func<EventHandler<WatcherEventArgs>, IEnumerable<IWatcher>> _watchersHandler;
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Dependency" /> class.

src/Cuemon.Core/Runtime/FileWatcher.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using Cuemon.Security;
 
@@ -12,7 +11,7 @@ namespace Cuemon.Runtime
     /// <seealso cref="Watcher" />
     public class FileWatcher : Watcher
     {
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FileWatcher"/> class.

src/Cuemon.Core/Runtime/Watcher.cs

@@ -10,7 +10,7 @@ namespace Cuemon.Runtime
     /// </summary>
     public abstract class Watcher : Disposable, IWatcher
     {
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
         private Timer _watcherTimer;
         private Timer _watcherPostponingTimer;
 

src/Cuemon.Data/BulkCopyDataReader.cs

@@ -6,7 +6,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Threading;
 
 namespace Cuemon.Data
 {
@@ -15,7 +14,7 @@ namespace Cuemon.Data
     /// </summary>
     public sealed class BulkCopyDataReader : DbDataReader
     {
-        private static readonly Lock PadLock = new();
+        private static readonly object PadLock = new();
         private IOrderedDictionary _defaultFields;
 
         /// <summary>

src/Cuemon.Data/DatabaseWatcher.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Cuemon.Runtime;
 using Cuemon.Security;
@@ -15,7 +14,7 @@ namespace Cuemon.Data
     /// <seealso cref="Watcher" />
     public class DatabaseWatcher : Watcher
     {
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DatabaseWatcher"/> class.

src/Cuemon.Extensions.AspNetCore.Newtonsoft.Json/Bootstrapper.cs

@@ -1,12 +1,11 @@
 using Cuemon.Extensions.AspNetCore.Newtonsoft.Json.Converters;
 using Cuemon.Extensions.Newtonsoft.Json.Formatters;
-using System.Threading;
 
 namespace Cuemon.Extensions.AspNetCore.Newtonsoft.Json
 {
     internal static class Bootstrapper
     {
-        private static readonly Lock PadLock = new();
+        private static readonly object PadLock = new();
         private static bool _initialized;
 
         internal static void Initialize()

src/Cuemon.Extensions.AspNetCore.Text.Json/Bootstrapper.cs

@@ -1,12 +1,11 @@
 using Cuemon.Extensions.AspNetCore.Text.Json.Converters;
 using Cuemon.Extensions.Text.Json.Formatters;
-using System.Threading;
 
 namespace Cuemon.Extensions.AspNetCore.Text.Json
 {
     internal static class Bootstrapper
     {
-        private static readonly Lock PadLock = new();
+        private static readonly object PadLock = new();
         private static bool _initialized;
 
         internal static void Initialize()

src/Cuemon.Extensions.AspNetCore.Xml/Bootstrapper.cs

@@ -1,12 +1,11 @@
 using Cuemon.Extensions.AspNetCore.Xml.Converters;
 using Cuemon.Xml.Serialization.Formatters;
-using System.Threading;
 
 namespace Cuemon.Extensions.AspNetCore.Xml
 {
     internal static class Bootstrapper
     {
-        private static readonly Lock PadLock = new();
+        private static readonly object PadLock = new();
         private static bool _initialized;
 
         internal static void Initialize()

src/Cuemon.Extensions.Net/Http/SlimHttpClientFactory.cs

@@ -29,7 +29,7 @@ public class SlimHttpClientFactory : IHttpClientFactory
         private readonly ConcurrentDictionary<string, Lazy<ActiveHandler>> _activeHandlers = new();
         private readonly ConcurrentQueue<ExpiredHandler> _expiredHandlers = new();
         private readonly Func<HttpClientHandler> _handlerFactory;
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
         private readonly SlimHttpClientFactoryOptions _options;
         internal static readonly TimeSpan ExpirationTimerDueTime = TimeSpan.FromSeconds(15);
         private Timer _expirationTimer;

src/Cuemon.Extensions.Newtonsoft.Json/Formatters/NewtonsoftJsonFormatterOptions.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Net.Http.Headers;
 using System.Reflection;
-using System.Threading;
 using Cuemon.Configuration;
 using Cuemon.Diagnostics;
 using Cuemon.Extensions.Newtonsoft.Json.Converters;
@@ -17,7 +16,7 @@ namespace Cuemon.Extensions.Newtonsoft.Json.Formatters
     /// </summary>
     public class NewtonsoftJsonFormatterOptions : IExceptionDescriptorOptions, IContentNegotiation, IValidatableParameterObject
     {
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
         private bool _refreshed;
 
         /// <summary>

src/Cuemon.Extensions.Runtime.Caching/CacheEnumerableExtensions.cs

@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using System.Threading;
 using Cuemon.Collections.Generic;
 using Cuemon.Reflection;
 using Cuemon.Runtime;
@@ -707,7 +706,7 @@ public static Func<T1, T2, T3, T4, T5, TResult> Memoize<TKey, T1, T2, T3, T4, T5
             };
         }
 
-        private static readonly Lock PadLock = new();
+        private static readonly object PadLock = new();
 
         private static TResult Memoize<TKey, TTuple, TResult>(ICacheEnumerable<TKey> cache, string key, CacheInvalidation invalidation, FuncFactory<TTuple, TResult> valueFactory) where TTuple : Template
         {

src/Cuemon.Extensions.Text.Json/Formatters/JsonFormatterOptions.cs

@@ -4,7 +4,6 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading;
 using Cuemon.Configuration;
 using Cuemon.Diagnostics;
 using Cuemon.Extensions.Text.Json.Converters;
@@ -17,7 +16,7 @@ namespace Cuemon.Extensions.Text.Json.Formatters
     /// </summary>
     public class JsonFormatterOptions : IContentNegotiation, IExceptionDescriptorOptions, IValidatableParameterObject
     {
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
         private bool _refreshed;
 
         /// <summary>

src/Cuemon.Extensions.Threading/Cuemon.Extensions.Threading.csproj

@@ -13,4 +13,11 @@
     <ProjectReference Include="..\Cuemon.Threading\Cuemon.Threading.csproj" />
   </ItemGroup>
 
-</Project>
+  <ItemGroup>
+    <PackageReference Include="Backport.System.Threading.Lock" Version="2.0.0" />
+    <Using Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Alias="Lock" Include="System.Threading.Lock" />
+    <Using Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Alias="Lock" Include="Backport.System.Threading.Lock" />
+    <Using Alias="LockFactory" Include="Backport.System.Threading.LockFactory" />
+  </ItemGroup>
+
+</Project>

src/Cuemon.Extensions.YamlDotNet/Formatters/YamlFormatterOptions.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http.Headers;
-using System.Threading;
 using Cuemon.Configuration;
 using Cuemon.Diagnostics;
 using Cuemon.Extensions.YamlDotNet.Converters;
@@ -16,7 +15,7 @@ namespace Cuemon.Extensions.YamlDotNet.Formatters
     /// </summary>
     public class YamlFormatterOptions : EncodingOptions, IExceptionDescriptorOptions, IContentNegotiation, IValidatableParameterObject
     {
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
         private bool _refreshed;
 
         /// <summary>

src/Cuemon.Xml/Serialization/Formatters/XmlFormatterOptions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http.Headers;
-using System.Threading;
 using Cuemon.Configuration;
 using Cuemon.Diagnostics;
 using Cuemon.Net.Http;
@@ -14,7 +13,7 @@ namespace Cuemon.Xml.Serialization.Formatters
     /// </summary>
     public class XmlFormatterOptions : IExceptionDescriptorOptions, IContentNegotiation, IValidatableParameterObject
     {
-        private readonly Lock _locker = new();
+        private readonly object _locker = new();
         private bool _refreshed;
 
         /// <summary>