com.wallstop-studios.dxmessaging 2.2.0 → 3.0.1

package/Editor/SetupCscRsp.cs

@@ -7,6 +7,7 @@ namespace DxMessaging.Editor
     using System.IO;
     using System.Linq;
     using System.Security.Cryptography;
+    using DxMessaging.Editor.Settings;
     using UnityEditor;
     using UnityEngine;
     using Object = UnityEngine.Object;
@@ -30,9 +31,20 @@ namespace DxMessaging.Editor
         private static readonly string SourceGeneratorDllName =
             "WallstopStudios.DxMessaging.SourceGenerators.dll";
 
+        // The analyzer DLL is a SEPARATE assembly compiled against Roslyn 3.8.0 because Unity 2021's
+        // analyzer loader silently rejects analyzer DLLs built against Roslyn 4.x. The source-
+        // generator DLL above stays at Roslyn 4.x because it uses IIncrementalGenerator (4.0+).
+        // Both DLLs ship side-by-side and both need the RoslynAnalyzer label.
+        private static readonly string AnalyzerDllName = "WallstopStudios.DxMessaging.Analyzer.dll";
+
+        // The analyzer DLLs and shared Roslyn surface ship unconditionally; they're light enough
+        // and required for DXMSG002–DXMSG009 to function at all. The list intentionally references
+        // a few transitive Roslyn deps that may or may not physically ship with the package; the
+        // copy loop below silently skips any name that isn't on disk.
         private static readonly string[] RequiredDllNames =
         {
             SourceGeneratorDllName,
+            AnalyzerDllName,
             "Microsoft.CodeAnalysis.dll",
             "Microsoft.CodeAnalysis.CSharp.dll",
             "System.Text.Encodings.Web.dll",
@@ -44,7 +56,17 @@ namespace DxMessaging.Editor
             "System.Threading.Tasks.Extensions.dll",
             "System.Numerics.Vectors.dll",
             "System.Text.Encoding.CodePages.dll",
-            "Microsoft.Bcl.AsyncInterfaces.dll",
+        };
+
+        // DLLs that must be tagged with Unity's "RoslynAnalyzer" asset label so Unity's compiler
+        // pipeline picks them up as analyzer/source-generator hosts. Other DLLs in the same folder
+        // (Roslyn runtime, immutable collections) are plain Editor-only plugin DLLs.
+        private static readonly HashSet<string> AnalyzerLabeledDllNames = new(
+            StringComparer.OrdinalIgnoreCase
+        )
+        {
+            SourceGeneratorDllName,
+            AnalyzerDllName,
         };
 
         private static readonly HashSet<string> DllNames = new(StringComparer.OrdinalIgnoreCase);
@@ -53,6 +75,7 @@ namespace DxMessaging.Editor
         {
             EditorApplication.delayCall += EnsureDLLsExistInAssets;
             EditorApplication.delayCall += EnsureCscRsp;
+            EditorApplication.delayCall += EnsureAdditionalFileForIgnoreList;
         }
 
         private static void EnsureDLLsExistInAssets()
@@ -107,7 +130,7 @@ namespace DxMessaging.Editor
                             AssetDatabase.ImportAsset(outputAsset);
                         }
 
-                        if (requiredDllName == SourceGeneratorDllName)
+                        if (AnalyzerLabeledDllNames.Contains(requiredDllName))
                         {
                             Object loadedDll = AssetDatabase.LoadMainAssetAtPath(outputAsset);
                             if (loadedDll != null)
@@ -190,6 +213,10 @@ namespace DxMessaging.Editor
             return !sourceHash.AsSpan().SequenceEqual(destinationHash);
         }
 
+        /// <summary>
+        /// Synchronizes <c>csc.rsp</c> with the current set of analyzer arguments derived from the
+        /// on-disk DLL roster.
+        /// </summary>
         private static void EnsureCscRsp()
         {
             try
@@ -201,20 +228,81 @@ namespace DxMessaging.Editor
                 }
 
                 string rspContent = File.ReadAllText(RspFilePath);
-                bool modified = false;
-                foreach (string analyzerArgument in GetAnalyzerArguments())
+
+                // Get current valid analyzer arguments
+                HashSet<string> currentAnalyzerArgs = new(
+                    GetAnalyzerArguments(),
+                    StringComparer.OrdinalIgnoreCase
+                );
+
+                // Parse existing lines and filter out stale DxMessaging analyzer entries
+                List<string> newLines = new();
+                bool foundStaleEntries = false;
+
+                foreach (
+                    string line in rspContent.Split(
+                        new[] { '\r', '\n' },
+                        StringSplitOptions.RemoveEmptyEntries
+                    )
+                )
                 {
-                    if (rspContent.Contains(analyzerArgument, StringComparison.OrdinalIgnoreCase))
+                    string trimmedLine = line.Trim();
+
+                    // Check if this is a DxMessaging analyzer line
+                    bool isDxMessagingAnalyzer =
+                        trimmedLine.StartsWith("-a:", StringComparison.OrdinalIgnoreCase)
+                        && (
+                            trimmedLine.Contains(
+                                "com.wallstop-studios.dxmessaging",
+                                StringComparison.OrdinalIgnoreCase
+                            )
+                            || trimmedLine.Contains(
+                                "WallstopStudios.DxMessaging",
+                                StringComparison.OrdinalIgnoreCase
+                            )
+                        );
+
+                    if (isDxMessagingAnalyzer)
                     {
-                        continue;
+                        // Only keep if it's in the current valid set
+                        if (currentAnalyzerArgs.Contains(trimmedLine))
+                        {
+                            newLines.Add(trimmedLine);
+                        }
+                        else
+                        {
+                            foundStaleEntries = true;
+                        }
                     }
+                    else
+                    {
+                        // Keep all non-DxMessaging lines as-is
+                        newLines.Add(trimmedLine);
+                    }
+                }
 
-                    File.AppendAllText(RspFilePath, analyzerArgument + Environment.NewLine);
-                    modified = true;
+                // Add any new analyzer arguments that aren't already present
+                bool foundNewEntries = false;
+                foreach (string analyzerArgument in currentAnalyzerArgs)
+                {
+                    if (!newLines.Contains(analyzerArgument, StringComparer.OrdinalIgnoreCase))
+                    {
+                        newLines.Add(analyzerArgument);
+                        foundNewEntries = true;
+                    }
                 }
 
+                bool modified = foundStaleEntries || foundNewEntries;
+
                 if (modified)
                 {
+                    // Write the cleaned up content
+                    string newContent = string.Join(Environment.NewLine, newLines);
+                    if (!string.IsNullOrEmpty(newContent))
+                    {
+                        newContent += Environment.NewLine;
+                    }
+                    File.WriteAllText(RspFilePath, newContent);
                     AssetDatabase.ImportAsset("csc.rsp");
                     Debug.Log("Updated csc.rsp.");
                 }
@@ -225,6 +313,119 @@ namespace DxMessaging.Editor
             }
         }
 
+        /// <summary>
+        /// Ensures <c>csc.rsp</c> contains a single <c>-additionalfile:</c> line pointing at the
+        /// base-call ignore sidecar, when (and only when) that sidecar physically exists. Stale
+        /// entries pointing at moved or deleted sidecar paths are removed.
+        /// </summary>
+        /// <remarks>
+        /// The sidecar is generated by <see cref="DxMessagingBaseCallIgnoreSync"/> only when there
+        /// is content to write. csc happily runs without it, so this method does NOT auto-create.
+        /// </remarks>
+        private static void EnsureAdditionalFileForIgnoreList()
+        {
+            try
+            {
+                if (!File.Exists(RspFilePath))
+                {
+                    File.WriteAllText(RspFilePath, string.Empty);
+                    AssetDatabase.ImportAsset("csc.rsp");
+                }
+
+                string sidecarRelativePath = DxMessagingBaseCallIgnoreSync.SidecarAssetPath;
+                string projectRoot = Path.GetFullPath(Path.Combine(Application.dataPath, ".."))
+                    .Replace("\\", "/");
+                string sidecarAbsolutePath = Path.Combine(projectRoot, sidecarRelativePath)
+                    .Replace("\\", "/");
+
+                bool sidecarExists = File.Exists(sidecarAbsolutePath);
+                string desiredLine = $"-additionalfile:\"{sidecarRelativePath}\"";
+
+                string rspContent = File.ReadAllText(RspFilePath);
+                List<string> newLines = new();
+                bool foundDesired = false;
+                bool foundStale = false;
+
+                foreach (
+                    string line in rspContent.Split(
+                        new[] { '\r', '\n' },
+                        StringSplitOptions.RemoveEmptyEntries
+                    )
+                )
+                {
+                    string trimmedLine = line.Trim();
+
+                    bool isDxMessagingAdditionalFile =
+                        trimmedLine.StartsWith(
+                            "-additionalfile:",
+                            StringComparison.OrdinalIgnoreCase
+                        )
+                        && trimmedLine.Contains("DxMessaging.", StringComparison.OrdinalIgnoreCase)
+                        && trimmedLine.Contains(
+                            "BaseCallIgnore",
+                            StringComparison.OrdinalIgnoreCase
+                        );
+
+                    if (isDxMessagingAdditionalFile)
+                    {
+                        if (
+                            sidecarExists
+                            && string.Equals(
+                                trimmedLine,
+                                desiredLine,
+                                StringComparison.OrdinalIgnoreCase
+                            )
+                        )
+                        {
+                            if (!foundDesired)
+                            {
+                                newLines.Add(trimmedLine);
+                                foundDesired = true;
+                            }
+                            else
+                            {
+                                // Drop duplicate.
+                                foundStale = true;
+                            }
+                        }
+                        else
+                        {
+                            // Stale entry pointing at a moved/renamed/deleted sidecar; drop it.
+                            foundStale = true;
+                        }
+                    }
+                    else
+                    {
+                        newLines.Add(trimmedLine);
+                    }
+                }
+
+                bool needsAppend = sidecarExists && !foundDesired;
+                if (needsAppend)
+                {
+                    newLines.Add(desiredLine);
+                }
+
+                bool modified = foundStale || needsAppend;
+
+                if (modified)
+                {
+                    string newContent = string.Join(Environment.NewLine, newLines);
+                    if (!string.IsNullOrEmpty(newContent))
+                    {
+                        newContent += Environment.NewLine;
+                    }
+                    File.WriteAllText(RspFilePath, newContent);
+                    AssetDatabase.ImportAsset("csc.rsp");
+                    Debug.Log("Updated csc.rsp additionalfile entries.");
+                }
+            }
+            catch (IOException ex)
+            {
+                Debug.LogError($"Failed to update csc.rsp additionalfile entry: {ex}");
+            }
+        }
+
         private static IEnumerable<string> GetAnalyzerArguments()
         {
             HashSet<string> yielded = new(StringComparer.OrdinalIgnoreCase);

package/Editor/SetupCscRsp.cs.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: 54bd01ff5fd34bbc9950a1c7230a15d8
+fileFormatVersion: 2
+guid: 54bd01ff5fd34bbc9950a1c7230a15d8
 timeCreated: 1730841461

package/Editor/Testing/MessagingComponentEditorHarness.cs

@@ -7,7 +7,7 @@ namespace DxMessaging.Editor.Testing
     using Core;
     using Core.Diagnostics;
     using Core.MessageBus;
-    using Unity;
+    using DxMessaging.Unity;
     using UnityEngine;
 
     /// <summary>

package/Editor/Testing/MessagingComponentEditorHarness.cs.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: 2624c9e8eb5243ebb71545774f411c2c
-timeCreated: 1761880591
+fileFormatVersion: 2
+guid: 2624c9e8eb5243ebb71545774f411c2c
+timeCreated: 1761880591

package/Editor/Testing.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: a61780c8ba084b29bb44fdefc9b7fcf2
-timeCreated: 1761880591
+fileFormatVersion: 2
+guid: a61780c8ba084b29bb44fdefc9b7fcf2
+timeCreated: 1761880591

package/Editor/WallstopStudios.DxMessaging.Editor.asmdef

@@ -1,14 +1,14 @@
-{
-  "name": "WallstopStudios.DxMessaging.Editor",
-  "rootNamespace": "DxMessaging.Editor",
-  "references": ["WallstopStudios.DxMessaging"],
-  "includePlatforms": ["Editor"],
-  "excludePlatforms": [],
-  "allowUnsafeCode": false,
-  "overrideReferences": false,
-  "precompiledReferences": [],
-  "autoReferenced": true,
-  "defineConstraints": [],
-  "versionDefines": [],
-  "noEngineReferences": false
-}
+{
+  "name": "WallstopStudios.DxMessaging.Editor",
+  "rootNamespace": "DxMessaging.Editor",
+  "references": ["WallstopStudios.DxMessaging"],
+  "includePlatforms": ["Editor"],
+  "excludePlatforms": [],
+  "allowUnsafeCode": false,
+  "overrideReferences": false,
+  "precompiledReferences": [],
+  "autoReferenced": true,
+  "defineConstraints": [],
+  "versionDefines": [],
+  "noEngineReferences": false
+}

package/Editor/WallstopStudios.DxMessaging.Editor.asmdef.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 4be90ea11db262f43913b0e065a25c7f
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 4be90ea11db262f43913b0e065a25c7f
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 41dce8be641afe34ca8363865b8cd5d9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 41dce8be641afe34ca8363865b8cd5d9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/LICENSE.md

@@ -1,9 +1,9 @@
-# License
-
-Copyright 2023 Eli Pinkerton
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# License
+
+Copyright 2023 Eli Pinkerton
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/LICENSE.md.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 2f7b715fd1838ea49b6fe45bcdd2e7eb
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 2f7b715fd1838ea49b6fe45bcdd2e7eb
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: