Make use of System.Threading.Lock

Directory.Packages.props

@@ -17,6 +17,7 @@
     <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.30" />
     <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.18.1" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.22.1" />
+    <PackageVersion Include="Backport.System.Threading.Lock" Version="3.0.1" />
     <PackageVersion Include="Blazorise" Version="1.6.2" />
     <PackageVersion Include="Blazorise.Components" Version="1.6.2" />
     <PackageVersion Include="Blazorise.DataGrid" Version="1.6.2" />

framework/Directory.Build.props

@@ -0,0 +1,18 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Backport.System.Threading.Lock">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>analyzers</IncludeAssets>
+	</PackageReference>	  
+    <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>

framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/ExceptionHandling/AbpExceptionHandlingLoggerProvider.cs

@@ -6,7 +6,7 @@ namespace Volo.Abp.AspNetCore.Components.Web.ExceptionHandling;
 public class AbpExceptionHandlingLoggerProvider : ILoggerProvider
 {
     private AbpExceptionHandlingLogger? _logger;
-    private static readonly object SyncObj = new object();
+    private static readonly Lock SyncObj = new();
     private readonly IServiceCollection _serviceCollection;
 
     public AbpExceptionHandlingLoggerProvider(IServiceCollection serviceCollection)

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleConfigurationCollection.cs

@@ -10,6 +10,7 @@ public class BundleConfigurationCollection
     private readonly ConcurrentDictionary<string, BundleConfiguration> _bundles;
     private readonly ConcurrentDictionary<string, List<Action<BundleConfiguration>>> _lazyBundleConfigurationActions;
     private readonly List<Action<BundleConfiguration>> _lazyAllBundleConfigurationActions;
+    private readonly Lock _syncLock = new();
 
     public BundleConfigurationCollection()
     {
@@ -92,7 +93,7 @@ private BundleConfiguration CreateBundle(string bundleName, Action<BundleConfigu
             }
         }
 
-        lock (_lazyAllBundleConfigurationActions)
+        lock (_syncLock)
         {
             _lazyAllBundleConfigurationActions.ForEach(c => c.Invoke(bundle));
         }
@@ -146,7 +147,7 @@ public BundleConfigurationCollection ConfigureAll([NotNull] Action<BundleConfigu
             configureAction.Invoke(bundle.Value);
         }
 
-        lock (_lazyAllBundleConfigurationActions)
+        lock (_syncLock)
         {
             _lazyAllBundleConfigurationActions.Add(configureAction);
         }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleCacheItem.cs

@@ -9,6 +9,8 @@ public class BundleCacheItem
 
     public List<IDisposable> WatchDisposeHandles { get; }
 
+    public Lock SyncLock { get; } = new();
+
     public BundleCacheItem(List<BundleFile> files)
     {
         Files = files;

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs

@@ -138,13 +138,13 @@ private BundleCacheItem AddToBundleCache(string bundleName, IBundler bundler, Li
 
     private void WatchChanges(BundleCacheItem cacheValue, List<string> files, string bundleRelativePath)
     {
-        lock (cacheValue.WatchDisposeHandles)
+        lock (cacheValue.SyncLock)
         {
             foreach (var file in files)
             {
                 var watchDisposeHandle = HostingEnvironment.WebRootFileProvider.Watch(file).RegisterChangeCallback(_ =>
                 {
-                    lock (cacheValue.WatchDisposeHandles)
+                    lock (cacheValue.SyncLock)
                     {
                         cacheValue.WatchDisposeHandles.ForEach(h => h.Dispose());
                         cacheValue.WatchDisposeHandles.Clear();

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs

@@ -13,7 +13,7 @@ public class CachedObjectExtensionsDtoService : ICachedObjectExtensionsDtoServic
 {
     protected IExtensionPropertyAttributeDtoFactory ExtensionPropertyAttributeDtoFactory { get; }
     protected volatile ObjectExtensionsDto? CachedValue;
-    protected readonly object SyncLock = new object();
+    protected readonly Lock SyncLock = new();
 
     public CachedObjectExtensionsDtoService(IExtensionPropertyAttributeDtoFactory extensionPropertyAttributeDtoFactory)
     {

framework/src/Volo.Abp.Core/Volo/Abp/DynamicProxy/DynamicProxyIgnoreTypes.cs

@@ -15,6 +15,7 @@ namespace Volo.Abp.DynamicProxy;
 public static class DynamicProxyIgnoreTypes
 {
     private static HashSet<Type> IgnoredTypes { get; } = new HashSet<Type>();
+    private static readonly Lock _syncLock = LockFactory.Create();
 
     public static void Add<T>()
     {
@@ -23,23 +24,23 @@ public static void Add<T>()
 
     public static void Add(Type type)
     {
-        lock (IgnoredTypes)
+        lock (_syncLock)
         {
             IgnoredTypes.AddIfNotContains(type);
         }
     }
 
     public static void Add(params Type[] types)
     {
-        lock (IgnoredTypes)
+        lock (_syncLock)
         {
             IgnoredTypes.AddIfNotContains(types);
         }
     }
 
     public static bool Contains(Type type, bool includeDerivedTypes = true)
     {
-        lock (IgnoredTypes)
+        lock (_syncLock)
         {
             return includeDerivedTypes
                 ? IgnoredTypes.Any(t => t.IsAssignableFrom(type))

framework/src/Volo.Abp.Core/Volo/Abp/RandomHelper.cs

@@ -12,6 +12,7 @@ namespace Volo.Abp;
 public static class RandomHelper
 {
     private static readonly Random Rnd = new Random();
+    private static readonly Lock _syncLock = LockFactory.Create();
 
     /// <summary>
     /// Returns a random number within a specified range.
@@ -25,7 +26,7 @@ public static class RandomHelper
     /// </returns>
     public static int GetRandom(int minValue, int maxValue)
     {
-        lock (Rnd)
+        lock (_syncLock)
         {
             return Rnd.Next(minValue, maxValue);
         }
@@ -42,7 +43,7 @@ public static int GetRandom(int minValue, int maxValue)
     /// </returns>
     public static int GetRandom(int maxValue)
     {
-        lock (Rnd)
+        lock (_syncLock)
         {
             return Rnd.Next(maxValue);
         }
@@ -54,7 +55,7 @@ public static int GetRandom(int maxValue)
     /// <returns>A 32-bit signed integer greater than or equal to zero and less than <see cref="int.MaxValue"/>.</returns>
     public static int GetRandom()
     {
-        lock (Rnd)
+        lock (_syncLock)
         {
             return Rnd.Next();
         }

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/VirtualFiles/VirtualFileLocalizationResourceContributorBase.cs

@@ -18,7 +18,7 @@ public abstract class VirtualFileLocalizationResourceContributorBase : ILocaliza
     private IVirtualFileProvider _virtualFileProvider = default!;
     private Dictionary<string, ILocalizationDictionary>? _dictionaries;
     private bool _subscribedForChanges;
-    private readonly object _syncObj = new object();
+    private readonly Lock _syncObj = LockFactory.Create();
     private LocalizationResourceBase _resource = default!;
 
     protected VirtualFileLocalizationResourceContributorBase(string virtualPath)

framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilder.cs

@@ -17,7 +17,7 @@ public class MongoModelBuilder : IMongoModelBuilder
 {
     private readonly Dictionary<Type, object> _entityModelBuilders;
 
-    private static readonly object SyncObj = new object();
+    private static readonly Lock SyncObj = LockFactory.Create();
 
     public MongoModelBuilder()
     {

framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\configureawait.props" />
   <Import Project="..\..\..\common.props" />

framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs

@@ -6,7 +6,7 @@ namespace Volo.Abp.ObjectExtending.Modularity;
 
 public static class ModuleExtensionConfigurationHelper
 {
-    private static object SyncLock = new object();
+    private static Lock SyncLock = LockFactory.Create();
 
     public static void ApplyEntityConfigurationToEntity(
         string moduleName,

framework/src/Volo.Abp.TestBase/Volo/Abp/Testing/Utils/TestCounter.cs

@@ -6,6 +6,7 @@ namespace Volo.Abp.Testing.Utils;
 public class TestCounter : ITestCounter, ISingletonDependency
 {
     private readonly Dictionary<string, int> _values;
+    private readonly Lock _syncLock = LockFactory.Create();
 
     public TestCounter()
     {
@@ -24,7 +25,7 @@ public int Decrement(string name)
 
     public int Add(string name, int count)
     {
-        lock (_values)
+        lock (_syncLock)
         {
             var newValue = _values.GetOrDefault(name) + count;
             _values[name] = newValue;
@@ -34,15 +35,15 @@ public int Add(string name, int count)
 
     public int GetValue(string name)
     {
-        lock (_values)
+        lock (_syncLock)
         {
             return _values.GetOrDefault(name);
         }
     }
 
     public void ResetCount(string name)
     {
-        lock (_values)
+        lock (_syncLock)
         {
             _values[name] = 0;
         }