Use the new more efficient .NET 9 Lock type (#18015)

Author: Henr1k80

src/Umbraco.Core/Cache/ValueEditorCache.cs

@@ -5,13 +5,13 @@ namespace Umbraco.Cms.Core.Cache;
 
 public class ValueEditorCache : IValueEditorCache
 {
-    private readonly object _dictionaryLocker;
+    private readonly Lock _dictionaryLocker;
     private readonly Dictionary<string, Dictionary<int, IDataValueEditor>> _valueEditorCache;
 
     public ValueEditorCache()
     {
         _valueEditorCache = new Dictionary<string, Dictionary<int, IDataValueEditor>>();
-        _dictionaryLocker = new object();
+        _dictionaryLocker = new Lock();
     }
 
     public IDataValueEditor GetValueEditor(IDataEditor editor, IDataType dataType)

src/Umbraco.Core/Composing/CollectionBuilderBase.cs

@@ -13,7 +13,7 @@ public abstract class CollectionBuilderBase<TBuilder, TCollection, TItem> : ICol
     where TBuilder : CollectionBuilderBase<TBuilder, TCollection, TItem>
     where TCollection : class, IBuilderCollection<TItem>
 {
-    private readonly object _locker = new();
+    private readonly Lock _locker = new();
     private readonly List<Type> _types = new();
     private Type[]? _registeredTypes;
 

src/Umbraco.Core/Composing/TypeFinder.cs

@@ -40,7 +40,7 @@ public class TypeFinder : ITypeFinder
     private static readonly ConcurrentDictionary<string, Type?> TypeNamesCache = new();
 
     private readonly IAssemblyProvider _assemblyProvider;
-    private readonly object _localFilteredAssemblyCacheLocker = new();
+    private readonly Lock _localFilteredAssemblyCacheLocker = new();
     private readonly ILogger<TypeFinder> _logger;
     private readonly List<string> _notifiedLoadExceptionAssemblies = new();
 

src/Umbraco.Core/Composing/TypeLoader.cs

@@ -20,7 +20,7 @@ namespace Umbraco.Cms.Core.Composing;
 /// </remarks>
 public sealed class TypeLoader
 {
-    private readonly object _locko = new();
+    private readonly Lock _locko = new();
     private readonly ILogger<TypeLoader> _logger;
 
     private readonly Dictionary<CompositeTypeTypeKey, TypeList> _types = new();

src/Umbraco.Core/Diagnostics/MiniDump.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Cms.Core.Diagnostics;
 // which itself got it from http://blog.kalmbach-software.de/2008/12/13/writing-minidumps-in-c/
 public static class MiniDump
 {
-    private static readonly object LockO = new();
+    private static readonly Lock LockO = new();
 
     [Flags]
     public enum Option : uint

src/Umbraco.Core/Events/ScopedNotificationPublisher.cs

@@ -18,7 +18,7 @@ public class ScopedNotificationPublisher<TNotificationHandler> : IScopedNotifica
     private readonly IEventAggregator _eventAggregator;
     private readonly List<INotification> _notificationOnScopeCompleted = new List<INotification>();
     private readonly bool _publishCancelableNotificationOnScopeExit;
-    private readonly object _locker = new();
+    private readonly Lock _locker = new();
     private bool _isSuppressed;
 
     public ScopedNotificationPublisher(IEventAggregator eventAggregator, bool publishCancelableNotificationOnScopeExit = false)

src/Umbraco.Core/Extensions/WaitHandleExtensions.cs

@@ -12,7 +12,7 @@ public static class WaitHandleExtensions
     public static Task WaitOneAsync(this WaitHandle handle, int millisecondsTimeout = Timeout.Infinite)
     {
         var tcs = new TaskCompletionSource<object?>();
-        var callbackHandleInitLock = new object();
+        var callbackHandleInitLock = new Lock();
         lock (callbackHandleInitLock)
         {
             RegisteredWaitHandle? callbackHandle = null;

src/Umbraco.Core/IO/FileSystems.cs

@@ -31,7 +31,7 @@ public sealed class FileSystems
 
         // shadow support
         private readonly List<ShadowWrapper> _shadowWrappers = new();
-        private readonly object _shadowLocker = new();
+        private readonly Lock _shadowLocker = new();
         private static string? _shadowCurrentId; // static - unique!!
         #region Constructor
 

src/Umbraco.Core/Models/PropertyCollection.cs

@@ -13,7 +13,7 @@ namespace Umbraco.Cms.Core.Models;
 [DataContract(IsReference = true)]
 public class PropertyCollection : KeyedCollection<string, IProperty>, IPropertyCollection
 {
-    private readonly object _addLocker = new();
+    private readonly Lock _addLocker = new();
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="PropertyCollection" /> class.

src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs

@@ -14,7 +14,7 @@ public class PublishedPropertyType : IPublishedPropertyType
     {
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly PropertyValueConverterCollection _propertyValueConverters;
-        private readonly object _locker = new object();
+        private readonly Lock _locker = new();
         private volatile bool _initialized;
         private IPropertyValueConverter? _converter;
         private PropertyCacheLevel _cacheLevel;