com.wallstop-studios.dxmessaging 2.0.0-rc17 → 2.0.0-rc19

package/Editor/Analyzers/System.Runtime.CompilerServices.Unsafe.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 8c1cadaf86b083c49aac429e53fa3008
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 1
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/SetupCscRsp.cs

@@ -35,10 +35,13 @@ namespace DxMessaging.Editor
             "Microsoft.CodeAnalysis.dll",
             "Microsoft.CodeAnalysis.CSharp.dll",
             "System.Reflection.Metadata.dll",
+            "System.Runtime.CompilerServices.Unsafe.dll",
         };
 
         private static readonly string LibraryArgument = $"-a:\"{LibraryPathRelative}\"";
 
+        private static readonly HashSet<string> DllNames = new(StringComparer.OrdinalIgnoreCase);
+
         static SetupCscRsp()
         {
             EditorApplication.delayCall += EnsureDLLsExistInAssets;
@@ -47,21 +50,26 @@ namespace DxMessaging.Editor
 
         private static void EnsureDLLsExistInAssets()
         {
-            HashSet<string> dllNames = new();
+            DllNames.Clear();
             foreach (
                 string dllGuid in AssetDatabase.FindAssets("t:DefaultAsset", new[] { "Assets" })
             )
             {
                 string dllPath = AssetDatabase.GUIDToAssetPath(dllGuid);
-                if (!dllPath.EndsWith(".dll"))
+                if (!dllPath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
                 {
                     continue;
                 }
 
-                if (!dllPath.Contains("Assets/Plugins/WallstopStudios.DxMessaging"))
+                if (
+                    !dllPath.Contains(
+                        "Assets/Plugins/WallstopStudios.DxMessaging",
+                        StringComparison.OrdinalIgnoreCase
+                    )
+                )
                 {
                     string dllName = Path.GetFileName(dllPath);
-                    dllNames.Add(dllName);
+                    DllNames.Add(dllName);
                 }
             }
 
@@ -70,7 +78,7 @@ namespace DxMessaging.Editor
             bool anyFound = false;
             foreach (
                 string requiredDllName in RequiredDllNames.Where(dllName =>
-                    !dllNames.Contains(dllName)
+                    !DllNames.Contains(dllName)
                 )
             )
             {
@@ -160,12 +168,12 @@ namespace DxMessaging.Editor
                 }
 
                 string rspContent = File.ReadAllText(RspFilePath);
-                if (rspContent.Contains(LibraryArgument))
+                if (rspContent.Contains(LibraryArgument, StringComparison.OrdinalIgnoreCase))
                 {
                     return;
                 }
 
-                File.AppendAllText(RspFilePath, $"{LibraryArgument}\n");
+                File.AppendAllText(RspFilePath, $"{LibraryArgument}{Environment.NewLine}");
                 AssetDatabase.ImportAsset("csc.rsp");
                 Debug.Log("Updated csc.rsp.");
             }

package/README.md

@@ -26,26 +26,23 @@ Check out the latest [Releases](https://github.com/wallstop/DxMessaging/releases
 4. Add an entry for a new "Scoped Registry"
     - Name: `NPM`
     - URL: `https://registry.npmjs.org`
-    - Scope(s): `com.wallstop-studios.dxmessaging` *and* `com.wallstop-studios.unity-helpers`
+    - Scope(s): `com.wallstop-studios.dxmessaging`
 5. Resolve the latest `DxMessaging`
 
 ## From Source
 Grab a copy of this repo (either `git clone` both [this repo](https://github.com/wallstop/DxMessaging) *and* [Unity Helpers](https://github.com/wallstop/unity-helpers) or [download a zip of the source](https://github.com/wallstop/DxMessaging/archive/refs/heads/master.zip) and [Unity Helper's source](https://github.com/wallstop/unity-helpers/archive/refs/heads/main.zip)) and copy the contents to your project's `Assets` folder.
 
-# Dependencies
-This project has a dependency on my [`Unity Helpers`](https://github.com/wallstop/unity-helpers) project, which contains the `System.Runtime.CompilerServices.Unsafe.dll`, which is used for some speed hacks in DxMessaging directly. Unity Helpers bundles a few (small) dependencies, including protobuf. If you don't want these dependencies, or if they conflict in some way, you can either include a copy of the `System.Runtime.CompilerServices.Unsafe.dll` yourself without relying on UnityHelpers, or manually download and include the Unity Helpers project and delete anything that conflicts with your project. Or, manually download this project without UnityHelpers. The choice is yours.
-
 # Benchmarks
 DxMessaging is currently roughly on-par with than Unity's built in messaging solution (when running in Unity). [Source](./Tests/Runtime/Benchmarks/PerformanceTests.cs). However, it is allocation-free and can be used in hot paths.
 
 | Message Tech | Operations / Second | Allocations? |
 | ------------ | ------------------- | ------------ | 
-| Unity | 2,493,950 | Yes |
-| DxMessaging (GameObject) - Normal | 2,075,850 | No |
-| DxMessaging (Component) - Normal | 2,072,550 | No |
-| DxMessaging (GameObject) - No-Copy | 2,159,400 | No |
-| DxMessaging (Component) - No-Copy | 2,163,800 | No |
-| DxMessaging (Untargeted) - No-Copy | 3,086,450 | No |
+| Unity | 2,621,200 | Yes |
+| DxMessaging (GameObject) - Normal | 2,048,600 | No |
+| DxMessaging (Component) - Normal | 2,054,600 | No |
+| DxMessaging (GameObject) - No-Copy | 2,137,800 | No |
+| DxMessaging (Component) - No-Copy | 2,136,400 | No |
+| DxMessaging (Untargeted) - No-Copy | 3,028,400 | No |
 
 # Functionality
 While not as fast, DxMessaging offers *additional functionality* as compared to Unity's messaging solution.

package/Tests/Runtime/Benchmarks/PerformanceTests.cs

@@ -17,7 +17,7 @@
 
     public sealed class PerformanceTests : MessagingTestBase
     {
-        private const int NumInvocationsPerIteration = 250;
+        private const int NumInvocationsPerIteration = 1_000;
 
         protected override bool MessagingDebugEnabled => false;
 

package/Tests/Runtime/Core/EnablementTests.cs

@@ -0,0 +1,69 @@
+namespace DxMessaging.Tests.Runtime.Core
+{
+    using System.Collections;
+    using DxMessaging.Core.Extensions;
+    using NUnit.Framework;
+    using Scripts.Components;
+    using Scripts.Messages;
+    using UnityEngine;
+    using UnityEngine.TestTools;
+
+    public sealed class EnablementTests : MessagingTestBase
+    {
+        [UnityTest]
+        public IEnumerator StartsDisabled()
+        {
+            GameObject prefab = new("Prefab", typeof(SimpleMessageAwareComponent));
+            _spawned.Add(prefab);
+            SimpleMessageAwareComponent prefabMessaging =
+                prefab.GetComponent<SimpleMessageAwareComponent>();
+            prefabMessaging.enabled = false;
+
+            GameObject copy = Object.Instantiate(prefab);
+            _spawned.Add(copy);
+            SimpleMessageAwareComponent spawnedMessaging =
+                copy.GetComponent<SimpleMessageAwareComponent>();
+            Assert.IsFalse(spawnedMessaging.enabled);
+            int copyCount = 0;
+            spawnedMessaging.untargetedHandler += () => copyCount++;
+
+            SimpleUntargetedMessage untargeted = new();
+            untargeted.EmitUntargeted();
+            Assert.AreEqual(0, copyCount);
+
+            spawnedMessaging.enabled = true;
+            untargeted.EmitUntargeted();
+            Assert.AreEqual(1, copyCount);
+            yield break;
+        }
+
+        [UnityTest]
+        public IEnumerator StartsEnabled()
+        {
+            GameObject prefab = new("Prefab", typeof(SimpleMessageAwareComponent));
+            _spawned.Add(prefab);
+            SimpleMessageAwareComponent prefabMessaging =
+                prefab.GetComponent<SimpleMessageAwareComponent>();
+
+            int count = 0;
+            prefabMessaging.untargetedHandler += () => count++;
+
+            SimpleUntargetedMessage untargeted = new();
+            untargeted.EmitUntargeted();
+            Assert.AreEqual(1, count);
+
+            prefabMessaging.enabled = false;
+            untargeted.EmitUntargeted();
+            Assert.AreEqual(1, count);
+
+            prefabMessaging.enabled = true;
+            untargeted.EmitUntargeted();
+            Assert.AreEqual(2, count);
+
+            Object.Destroy(prefabMessaging);
+            yield return null;
+            untargeted.EmitUntargeted();
+            Assert.AreEqual(2, count);
+        }
+    }
+}

package/Tests/Runtime/Core/EnablementTests.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: eea2922068114db1a00375d95322a755
+timeCreated: 1744481637

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "com.wallstop-studios.dxmessaging",
-  "version": "2.0.0-rc17",
+  "version": "2.0.0-rc19",
   "displayName": "DxMessaging",
   "description": "Synchronous Event Bus for Unity",
   "unity": "2021.3",
-  "dependencies": {
-    "com.wallstop-studios.unity-helpers" : "2.0.0-rc58"
-  },
+  "dependencies": {},
   "keywords": [
     "messaging",
     "message",

package/Editor/Analyzers/WallstopStudios.DxMessaging.SourceGenerators.pdb.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9e450a3f92f4be74da41959260563827
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: