Fixed weak events.

Author: Simnico99

ZirconNet.sln

@@ -16,7 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZirconNet.Console", "src\ZirconNet.Console\ZirconNet.Console.csproj", "{B4263499-9A0D-40D5-B38D-EFAD661A72B9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZirconNet.Microsoft.DependencyInjection", "src\ZirconNet.Microsoft.DependencyInjection\ZirconNet.Microsoft.DependencyInjection.csproj", "{60BD3E3D-6311-4DE2-81B3-FAC2BEE2C0E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZirconNet.Microsoft.DependencyInjection", "src\ZirconNet.Microsoft.DependencyInjection\ZirconNet.Microsoft.DependencyInjection.csproj", "{60BD3E3D-6311-4DE2-81B3-FAC2BEE2C0E8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/ZirconNet.Core/Events/WeakEventBase.cs

@@ -2,45 +2,54 @@
 // This software is distributed under the MIT license and its code is open-source and free for use, modification, and distribution.
 // </copyright>
 
-using System.Collections.Concurrent;
 using ZirconNet.Core.Extensions;
 
 namespace ZirconNet.Core.Events;
 
 public abstract class WeakEventBase
 {
-    private readonly ConcurrentDictionary<Type, List<Delegate>> _eventRegistrations = new();
+    private readonly List<(Type, Delegate)> _eventRegistrations = new();
+    private readonly object _lock = new();
 
     protected virtual Subscription SubscribeInternal<T>(T action)
         where T : Delegate
     {
-        if (action is null)
+        lock (_lock)
         {
-            throw new ArgumentNullException(nameof(action));
-        }
+            if (action is null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
 
-        _eventRegistrations.AddOrUpdate(typeof(T), new List<Delegate> { action }, (key, value) =>
-        {
-            value.Add(action);
-            return value;
-        });
+            _eventRegistrations.Add((typeof(T), action));
 
-        return new Subscription(() => _eventRegistrations.AddOrUpdate(typeof(T), new List<Delegate>(), (key, value) =>
-        {
-            value.Remove(action);
-            return value;
-        }));
+            return new Subscription(() =>
+            {
+                lock (_lock)
+                {
+                    _eventRegistrations.Remove((typeof(T), action));
+                }
+            });
+        }
     }
 
     protected virtual void PublishInternal<T>(T? data)
     {
         Task.Run(() =>
         {
-            if (_eventRegistrations.TryGetValue(typeof(T), out var actions))
+            lock (_lock)
             {
-                foreach (var action in actions)
+                foreach (var eventRegistration in _eventRegistrations)
                 {
-                    ((Action<T?>)action)(data);
+                    if (eventRegistration.Item2 is Action<T?> action)
+                    {
+                        action(data);
+                    }
+
+                    if (eventRegistration.Item2 is Func<T?> func)
+                    {
+                        func();
+                    }
                 }
             }
         }).Forget();