com.wallstop-studios.dxmessaging 2.1.2 → 2.1.4

package/.github/workflows/dotnet-tests.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: "9.0.x"
 
@@ -47,7 +47,7 @@ jobs:
           cat artifacts/coverage/Summary.txt
 
       - name: Upload coverage report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: generator-coverage
           path: artifacts/coverage

package/.github/workflows/prettier-autofix.yml

@@ -46,10 +46,6 @@ jobs:
         if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
         run: npx --yes markdownlint-cli@0.40.0 "**/*.md" "**/*.markdown" --config .markdownlint.json --ignore-path .markdownlintignore --fix
 
-      - name: Fix EOL/BOM (Dependabot only)
-        if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
-        run: node scripts/fix-eol.js -v
-
       - name: Commit formatting changes to PR branch (Dependabot only)
         if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.user.login == 'dependabot[bot]' }}
         uses: stefanzweifel/git-auto-commit-action@v7
@@ -118,9 +114,6 @@ jobs:
       - name: Markdownlint (auto-fix)
         run: npx --yes markdownlint-cli@0.40.0 "**/*.md" "**/*.markdown" --config .markdownlint.json --ignore-path .markdownlintignore --fix
 
-      - name: Fix EOL/BOM
-        run: node scripts/fix-eol.js -v
-
       - name: Detect changes
         id: changes
         shell: bash

package/.pre-commit-config.yaml

@@ -57,14 +57,17 @@ repos:
 
   - repo: local
     hooks:
-      - id: eol-bom-fix
-        name: Auto-fix CRLF and remove BOM
-        entry: node scripts/fix-eol.js -v
+      - id: fix-eol
+        name: Normalize CRLF and strip BOM
+        entry: node scripts/fix-eol.js
         language: system
-        pass_filenames: false
         stages:
           - pre-commit
-        description: Convert line endings to CRLF and strip UTF-8 BOM on text files.
+        pass_filenames: true
+        description: Automatically rewrite text files to match CI EOL/BOM policy.
+
+  - repo: local
+    hooks:
       - id: eol-bom-check
         name: Enforce CRLF and no BOM
         entry: node scripts/check-eol.js

package/AGENTS.md

@@ -2,12 +2,12 @@
 
 ## Project Structure & Module Organization
 
-- `Runtime/` — core library (`DxMessaging.Core`) and Unity components (`DxMessaging.Unity`).
-- `Editor/` — editor utilities, analyzers, and setup (`DxMessaging.Editor`).
-- `SourceGenerators/` — Roslyn source generators (`netstandard2.0`).
-- `Tests/Runtime/` — NUnit/Unity Test Framework tests (e.g., `Core/NominalTests.cs`).
-- `Docs/` — usage patterns and examples.
-- Package manifest: `package.json` (published to NPM/UPM).
+- [Runtime](Runtime/) — core library (`DxMessaging.Core`) and Unity components (`DxMessaging.Unity`).
+- [Editor](Editor/) — editor utilities, analyzers, and setup (`DxMessaging.Editor`).
+- [SourceGenerators](SourceGenerators/) — Roslyn source generators (`netstandard2.0`).
+- [Tests/Runtime](Tests/Runtime/) — NUnit/Unity Test Framework tests (e.g., [Core Nominal tests](Tests/Runtime/Core/NominalTests.cs)).
+- [Docs](Docs/) — usage patterns and examples.
+- Package manifest: [package.json](package.json) (published to NPM/UPM).
 
 ## Build, Test, and Development Commands
 
@@ -17,9 +17,9 @@
 
 ## Coding Style & Naming Conventions
 
-- Indent with 4 spaces for `.cs` (JSON/YAML: 2). CRLF, UTF‑8 BOM (see `.editorconfig`).
+- Indent with 4 spaces for `.cs` (JSON/YAML: 2). CRLF, UTF‑8 BOM (see [.editorconfig](.editorconfig)).
 - Prefer explicit types over `var`. Braces required. `using` directives inside the namespace.
-- Naming: `PascalCase` for types/methods/properties; interfaces `I*`; type parameters `T*`; events prefixed `On*`; public fields lowerCamelCase (matches examples in `README.md`).
+- Naming: `PascalCase` for types/methods/properties; interfaces `I*`; type parameters `T*`; events prefixed `On*`; public fields lowerCamelCase (matches examples in the [README](README.md)).
 - Place code under `DxMessaging.Core`, `DxMessaging.Unity`, or `DxMessaging.Editor` as appropriate.
 - Do not use underscores in function names, especially test function names.
 - Do not use regions, anywhere, ever.
@@ -29,7 +29,7 @@
 ## Testing Guidelines
 
 - Frameworks: NUnit + Unity Test Framework. Use `[Test]`/`[UnityTest]` as needed.
-- Location: add files under `Tests/Runtime/<Area>/` named `*Tests.cs` with classes `*Tests`.
+- Location: add files under [Tests/Runtime](Tests/Runtime/) `<Area>/` named `*Tests.cs` with classes `*Tests`.
 - Keep tests independent: prefer a local `MessageBus` and explicit `MessageRegistrationToken` lifecycles.
 - Do not use underscores in test function names.
 - Prefer expressive assertions and failure messages so it is clear what exactly is failing when a test fails.
@@ -43,10 +43,10 @@
 ## Commit & Pull Request Guidelines
 
 - Commits: short, imperative subject; group related changes; reference issues/PRs (e.g., “Fix registration dedupe (#123)”).
-- PRs: include a clear description, linked issues, before/after notes for performance changes (see `Tests/Runtime/Benchmarks`), and tests for bug fixes/features.
-- Releasing: changes to `package.json` on `master` may trigger the NPM publish workflow.
+- PRs: include a clear description, linked issues, before/after notes for performance changes (see [Tests/Runtime/Benchmarks](Tests/Runtime/Benchmarks/)), and tests for bug fixes/features.
+- Releasing: changes to [package.json](package.json) on `master` may trigger the NPM publish workflow.
 
 ## Security & Configuration Tips
 
-- Editor analyzer DLLs are copied into the Unity project by `Editor/SetupCscRsp.cs`; do not commit generated DLLs into this repo.
+- Editor analyzer DLLs are copied into the Unity project by [SetupCscRsp.cs](Editor/SetupCscRsp.cs); do not commit generated DLLs into this repo.
 - Keep public APIs minimal and consistent; avoid breaking changes without a major version bump.

package/CONTRIBUTING.md

@@ -8,7 +8,12 @@ Before committing, please enable our git hooks and local linters so you catch is
 - Install hooks: `pre-commit install`
 - Run on all files: `pre-commit run --all-files`
 
-Note: If the "Enforce CRLF and no BOM" hook fails, run `node scripts/fix-eol.js -v` to auto-fix line endings and strip any BOM.
+Line endings: Git already normalizes files to CRLF through `.gitattributes`. Run this once after cloning (especially on Windows) so your working tree matches CI:
+
+```bash
+git config core.autocrlf false
+git add --renormalize .
+```
 
 What runs locally:
 
@@ -29,5 +34,6 @@ Handy commands:
 - Format JSON/.asmdef (manual): `npx prettier@3.6.2 --write "**/*.{json,asmdef}"`
 - Format YAML (all files): `pre-commit run prettier-yaml --all-files`
 - Check YAML formatting + lint: `npm run check:yaml`
-- Fix EOL/BOM issues quickly: `node scripts/fix-eol.js -v`
 - Format C#: `dotnet tool restore && dotnet tool run csharpier format`
+
+If you do still need to repair line endings manually (for example, after copying files from an external tool), run `node scripts/fix-eol.js -v` and then re-stage the affected files.

package/Docs/Comparisons.md

@@ -28,16 +28,16 @@
 
 ## Performance Benchmarks
 
-These sections are auto-updated by the PlayMode comparison benchmarks in `Tests/Runtime/Benchmarks/ComparisonPerformanceTests.cs`. Run the suite locally to refresh the tables.
+These sections are auto-updated by the PlayMode comparison benchmarks in the [Comparison Performance PlayMode tests](../Tests/Runtime/Benchmarks/ComparisonPerformanceTests.cs). Run the suite locally to refresh the tables.
 
 ### Comparisons (Windows)
 
 | Message Tech                       | Operations / Second | Allocations? |
 | ---------------------------------- | ------------------- | ------------ |
-| DxMessaging (Untargeted) - No-Copy | 14,734,000          | No           |
-| UniRx MessageBroker                | 18,044,000          | No           |
-| MessagePipe (Global)               | 97,774,000          | No           |
-| Zenject SignalBus                  | 2,600,000           | Yes          |
+| DxMessaging (Untargeted) - No-Copy | 14,640,000          | No           |
+| UniRx MessageBroker                | 18,074,000          | No           |
+| MessagePipe (Global)               | 97,824,000          | No           |
+| Zenject SignalBus                  | 2,354,000           | Yes          |
 
 ### Comparisons (macOS)
 

package/Docs/InterceptorsAndOrdering.md

@@ -36,7 +36,7 @@ new GameEvent().Emit();  // Both DoWork() and ProcessLater() execute
 - Ensures all listeners see a consistent view of the registration state
 - Makes debugging and reasoning about message flow easier
 
-This snapshot behavior is extensively tested in `MutationDuringEmissionTests.cs`.
+This snapshot behavior is extensively tested in the [Mutation During Emission tests](../Tests/Runtime/Core/MutationDuringEmissionTests.cs).
 
 ---
 

package/Docs/Performance.md

@@ -1,6 +1,6 @@
 # Performance Benchmarks
 
-This page is auto-updated by the Unity PlayMode benchmark tests in `Tests/Runtime/Benchmarks/PerformanceTests.cs`.
+This page is auto-updated by the Unity PlayMode benchmark tests in the [Performance PlayMode benchmark suite](../Tests/Runtime/Benchmarks/PerformanceTests.cs).
 
 How it works:
 
@@ -8,23 +8,23 @@ How it works:
 - The benchmark test writes an OS-specific section below with a markdown table.
 - CI runs skip writing to avoid noisy diffs.
 
-See also: `Docs/DesignAndArchitecture.md#performance-optimizations` for design details.
+See also: [Performance optimizations](./DesignAndArchitecture.md#performance-optimizations) for design details.
 
 ## Windows
 
 | Message Tech                               | Operations / Second | Allocations? |
 | ------------------------------------------ | ------------------- | ------------ |
-| Unity                                      | 2,564,000           | Yes          |
-| DxMessaging (GameObject) - Normal          | 8,476,000           | No           |
-| DxMessaging (Component) - Normal           | 8,474,000           | No           |
-| DxMessaging (GameObject) - No-Copy         | 9,418,000           | No           |
-| DxMessaging (Component) - No-Copy          | 9,536,000           | No           |
-| DxMessaging (Untargeted) - No-Copy         | 14,736,000          | No           |
-| DxMessaging (Untargeted) - Interceptors    | 6,618,000           | No           |
-| DxMessaging (Untargeted) - Post-Processors | 5,244,000           | No           |
-| Reflexive (One Argument)                   | 2,828,000           | No           |
-| Reflexive (Two Arguments)                  | 2,360,000           | No           |
-| Reflexive (Three Arguments)                | 2,358,000           | No           |
+| Unity                                      | 2,522,000           | Yes          |
+| DxMessaging (GameObject) - Normal          | 8,606,000           | No           |
+| DxMessaging (Component) - Normal           | 8,608,000           | No           |
+| DxMessaging (GameObject) - No-Copy         | 9,534,000           | No           |
+| DxMessaging (Component) - No-Copy          | 9,658,000           | No           |
+| DxMessaging (Untargeted) - No-Copy         | 15,008,000          | No           |
+| DxMessaging (Untargeted) - Interceptors    | 6,944,000           | No           |
+| DxMessaging (Untargeted) - Post-Processors | 5,146,000           | No           |
+| Reflexive (One Argument)                   | 2,822,000           | No           |
+| Reflexive (Two Arguments)                  | 2,370,000           | No           |
+| Reflexive (Three Arguments)                | 2,342,000           | No           |
 
 ## macOS
 

package/Docs/QuickReference.md

@@ -106,7 +106,7 @@ public sealed class DamageSystem : IStartable, IDisposable
 }
 ```
 
-Tip: Define `ZENJECT_PRESENT`, `VCONTAINER_PRESENT`, or `REFLEX_PRESENT` to enable the optional shims under `Runtime/Unity/Integrations/` that bind the builder automatically for those containers.
+Tip: Define `ZENJECT_PRESENT`, `VCONTAINER_PRESENT`, or `REFLEX_PRESENT` to enable the optional shims under [Runtime/Unity/Integrations](../Runtime/Unity/Integrations/) that bind the builder automatically for those containers.
 
 Interceptors and post‑processors
 

package/Docs/Reference.md

@@ -64,11 +64,11 @@ Unity bridge types
 
 Source files (for exploration)
 
-- Message bus interface: Runtime/Core/MessageBus/IMessageBus.cs
-- Message bus: Runtime/Core/MessageBus/MessageBus.cs
-- Message handler/token: Runtime/Core/MessageHandler.cs, Runtime/Core/MessageRegistrationToken.cs
-- Emit helpers: Runtime/Core/Extensions/MessageExtensions.cs
-- Attributes: Runtime/Core/Attributes/\*.cs
+- Message bus interface: [IMessageBus](../Runtime/Core/MessageBus/IMessageBus.cs)
+- Message bus: [MessageBus](../Runtime/Core/MessageBus/MessageBus.cs)
+- Message handler/token: [MessageHandler](../Runtime/Core/MessageHandler.cs), [MessageRegistrationToken](../Runtime/Core/MessageRegistrationToken.cs)
+- Emit helpers: [MessageExtensions](../Runtime/Core/Extensions/MessageExtensions.cs)
+- Attributes: [Attributes directory](../Runtime/Core/Attributes/)
 
 API tables (quick view)
 

package/Editor/CustomEditors/MessagingComponentEditor.cs

@@ -37,6 +37,9 @@ namespace DxMessaging.Editor.CustomEditors
             _listenerFoldouts.Clear();
         }
 
+        /// <summary>
+        /// Draws the custom inspector, including diagnostics summaries and listener management controls.
+        /// </summary>
         public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();

package/Editor/DxMessagingEditorInitializer.cs

@@ -1,9 +1,11 @@
 namespace DxMessaging.Editor
 {
 #if UNITY_EDITOR
+    using Core;
     using Core.MessageBus;
     using Settings;
     using UnityEditor;
+    using UnityEngine;
 
     /// <summary>
     /// Applies DxMessaging Editor settings to global runtime defaults on domain load.
@@ -11,12 +13,67 @@ namespace DxMessaging.Editor
     [InitializeOnLoad]
     public static class DxMessagingEditorInitializer
     {
+        private static bool s_playModeWarningIssued;
+
         static DxMessagingEditorInitializer()
         {
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+            ApplyEditorSettings();
+            WarnIfDomainReloadDisabled();
+        }
+
+        private static void OnPlayModeStateChanged(PlayModeStateChange stateChange)
+        {
+            if (
+                stateChange == PlayModeStateChange.EnteredEditMode
+                || stateChange == PlayModeStateChange.EnteredPlayMode
+            )
+            {
+                ApplyEditorSettings();
+                WarnIfDomainReloadDisabled();
+            }
+        }
+
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+        private static void ApplySettingsBeforeSceneLoad()
+        {
+            if (!Application.isPlaying)
+            {
+                return;
+            }
+
+            ApplyEditorSettings();
+        }
+
+        private static void ApplyEditorSettings()
+        {
+            DxMessagingStaticState.Reset();
             DxMessagingSettings settings = DxMessagingSettings.GetOrCreateSettings();
-            IMessageBus.GlobalDiagnosticsMode = settings.EnableDiagnosticsInEditor;
+            IMessageBus.GlobalDiagnosticsTargets = settings.DiagnosticsTargets;
             IMessageBus.GlobalMessageBufferSize = settings.MessageBufferSize;
         }
+
+        private static void WarnIfDomainReloadDisabled()
+        {
+            DxMessagingSettings settings = DxMessagingSettings.GetOrCreateSettings();
+            if (
+                s_playModeWarningIssued
+                || settings.SuppressDomainReloadWarning
+                || !EditorSettings.enterPlayModeOptionsEnabled
+                || (EditorSettings.enterPlayModeOptions & EnterPlayModeOptions.DisableDomainReload)
+                    == 0
+            )
+            {
+                return;
+            }
+
+            s_playModeWarningIssued = true;
+            Debug.LogWarning(
+                "[DxMessaging] Enter Play Mode Options are disabling domain reload. "
+                    + "DxMessaging resets its internal statics, but third-party static state will persist. "
+                    + "Audit integration code or re-enable domain reload if inconsistent behaviour occurs."
+            );
+        }
     }
 #endif
 }

package/Editor/DxMessagingMenu.cs

@@ -0,0 +1,38 @@
+namespace DxMessaging.Editor
+{
+#if UNITY_EDITOR
+    using Core;
+    using Core.MessageBus;
+    using UnityEditor;
+    using UnityEngine;
+
+    internal static class DxMessagingMenu
+    {
+        private const string Root = "Tools/Wallstop Studios/DxMessaging/";
+
+        [MenuItem(Root + "Reset Static State")]
+        private static void ResetStatics()
+        {
+            DxMessagingStaticState.Reset();
+            Debug.Log("[DxMessaging] Static state reset.");
+        }
+
+        [MenuItem(Root + "Toggle Global Diagnostics")]
+        private static void ToggleGlobalDiagnostics()
+        {
+            DiagnosticsTarget current = IMessageBus.GlobalDiagnosticsTargets;
+            DiagnosticsTarget next = current switch
+            {
+                DiagnosticsTarget.Off => DiagnosticsTarget.Editor,
+                DiagnosticsTarget.Editor => DiagnosticsTarget.Runtime,
+                DiagnosticsTarget.Runtime => DiagnosticsTarget.All,
+                DiagnosticsTarget.All => DiagnosticsTarget.Off,
+                _ => DiagnosticsTarget.Off,
+            };
+
+            IMessageBus.GlobalDiagnosticsTargets = next;
+            Debug.Log($"[DxMessaging] Global diagnostics targets set to {next}.");
+        }
+    }
+#endif
+}

package/Editor/DxMessagingMenu.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 517da34a8f694371b843ba34f89077d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/DxMessagingSceneBuildProcessor.cs

@@ -0,0 +1,81 @@
+namespace DxMessaging.Editor
+{
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
+    using System.Collections.Generic;
+    using DxMessaging.Unity;
+    using UnityEditor.Build;
+    using UnityEditor.Build.Reporting;
+    using UnityEngine;
+    using UnityEngine.SceneManagement;
+
+    /// <summary>
+    /// Ensures MessagingComponent instances do not carry runtime registrations into player builds.
+    /// </summary>
+    internal sealed class DxMessagingSceneBuildProcessor : IProcessSceneWithReport
+    {
+        public int callbackOrder => int.MaxValue;
+
+        /// <summary>
+        /// Strips runtime-only messaging state from the scene before it is serialized into the build.
+        /// </summary>
+        /// <param name="scene">Scene currently being processed.</param>
+        /// <param name="report">Build report associated with the scene export.</param>
+        public void OnProcessScene(Scene scene, BuildReport report)
+        {
+            if (!scene.IsValid() || !scene.isLoaded)
+            {
+                return;
+            }
+
+            MessagingComponent[] components = FindMessagingComponents(scene);
+            if (components == null || components.Length == 0)
+            {
+                return;
+            }
+
+            int cleared = 0;
+            for (int i = 0; i < components.Length; ++i)
+            {
+                MessagingComponent component = components[i];
+                if (component != null && component.EditorResetRuntimeState())
+                {
+                    cleared++;
+                }
+            }
+
+            if (cleared > 0 && report != null)
+            {
+                Debug.Log(
+                    $"[DxMessaging] Cleared {cleared} MessagingComponent instance(s) in scene '{scene.path}' prior to build."
+                );
+            }
+        }
+
+        private static MessagingComponent[] FindMessagingComponents(Scene scene)
+        {
+            List<MessagingComponent> buffer = new List<MessagingComponent>();
+            GameObject[] roots = scene.GetRootGameObjects();
+            for (int i = 0; i < roots.Length; ++i)
+            {
+                GameObject root = roots[i];
+                if (root == null)
+                {
+                    continue;
+                }
+
+                MessagingComponent[] components = root.GetComponentsInChildren<MessagingComponent>(
+                    includeInactive: true
+                );
+                if (components == null || components.Length == 0)
+                {
+                    continue;
+                }
+
+                buffer.AddRange(components);
+            }
+
+            return buffer.ToArray();
+        }
+    }
+#endif
+}

package/Editor/DxMessagingSceneBuildProcessor.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ec8789213f7f4c30a9353e90fb4345c8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/Settings/DxMessagingSettings.cs

@@ -2,8 +2,10 @@ namespace DxMessaging.Editor.Settings
 {
 #if UNITY_EDITOR
     using System.Linq;
+    using Core.MessageBus;
     using UnityEditor;
     using UnityEngine;
+    using UnityEngine.Serialization;
 
     /// <summary>
     /// Project-wide DxMessaging settings asset (Editor-only).
@@ -18,18 +20,26 @@ namespace DxMessaging.Editor.Settings
         private const string SettingsPath = "Assets/Editor/DxMessagingSettings.asset";
 
         [SerializeField]
-        internal bool _enableDiagnosticsInEditor;
+        internal DiagnosticsTarget _diagnosticsTargets = DiagnosticsTarget.Off;
+
+        [SerializeField]
+        [HideInInspector]
+        [FormerlySerializedAs("_enableDiagnosticsInEditor")]
+        private bool _legacyEnableDiagnosticsInEditor;
 
         [SerializeField]
         internal int _messageBufferSize = DefaultBufferSize;
 
+        [SerializeField]
+        internal bool _suppressDomainReloadWarning = true;
+
         /// <summary>
-        /// Enables <see cref="Core.MessageBus.IMessageBus.GlobalDiagnosticsMode"/> in the Editor.
+        /// Controls <see cref="DiagnosticsTarget"/> values applied to <see cref="IMessageBus.GlobalDiagnosticsTargets"/>.
         /// </summary>
-        public bool EnableDiagnosticsInEditor
+        public DiagnosticsTarget DiagnosticsTargets
         {
-            get => _enableDiagnosticsInEditor;
-            set => _enableDiagnosticsInEditor = value;
+            get => _diagnosticsTargets;
+            set => _diagnosticsTargets = value;
         }
 
         /// <summary>
@@ -41,6 +51,15 @@ namespace DxMessaging.Editor.Settings
             set => _messageBufferSize = value;
         }
 
+        /// <summary>
+        /// When true, suppresses the Enter Play Mode Options domain reload warning in the Editor.
+        /// </summary>
+        public bool SuppressDomainReloadWarning
+        {
+            get => _suppressDomainReloadWarning;
+            set => _suppressDomainReloadWarning = value;
+        }
+
         /// <summary>
         /// Loads the settings asset if present, otherwise creates it with sensible defaults.
         /// </summary>
@@ -62,8 +81,9 @@ namespace DxMessaging.Editor.Settings
             if (settings == null)
             {
                 settings = CreateInstance<DxMessagingSettings>();
-                settings._enableDiagnosticsInEditor = false;
+                settings._diagnosticsTargets = DiagnosticsTarget.Off;
                 settings._messageBufferSize = DefaultBufferSize;
+                settings._suppressDomainReloadWarning = true;
                 if (!AssetDatabase.IsValidFolder("Assets/Editor"))
                 {
                     AssetDatabase.CreateFolder("Assets", "Editor");
@@ -72,6 +92,17 @@ namespace DxMessaging.Editor.Settings
                 AssetDatabase.SaveAssets();
             }
 
+            if (
+                settings._diagnosticsTargets == DiagnosticsTarget.Off
+                && settings._legacyEnableDiagnosticsInEditor
+            )
+            {
+                settings._diagnosticsTargets = DiagnosticsTarget.Editor;
+                settings._legacyEnableDiagnosticsInEditor = false;
+                EditorUtility.SetDirty(settings);
+                AssetDatabase.SaveAssets();
+            }
+
             return settings;
         }