diff --git a/com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef b/com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef index 9ef9dac45f..ca7c2e6e26 100644 --- a/com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef +++ b/com.unity.netcode.gameobjects/Editor/Unity.Netcode.Editor.asmdef @@ -8,8 +8,8 @@ "Unity.Networking.Transport", "Unity.Services.Core", "Unity.Services.Authentication", - "Unity.NetCode", - "Unity.NetCode.Editor" + "GUID:953adc2a6b8b4e3c8df5b728bcd546e9", + "GUID:eb8cf780bf058694ebf7ec5cf5b8cfa3" ], "includePlatforms": [ "Editor" diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetricsManager.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetricsManager.cs index 2a137396f7..4af1d8def4 100644 --- a/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetricsManager.cs +++ b/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetricsManager.cs @@ -27,7 +27,7 @@ public void Initialize(NetworkManager networkManager) if (NetworkMetrics == null) { #if MULTIPLAYER_TOOLS - NetworkMetrics = new NetworkMetrics(); + NetworkMetrics = new ToolsNetworkMetrics(); #else NetworkMetrics = new NullNetworkMetrics(); #endif diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/ToolsNetworkMetrics.cs similarity index 98% rename from com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs rename to com.unity.netcode.gameobjects/Runtime/Metrics/ToolsNetworkMetrics.cs index 4bb7bb20a0..6aeba77c74 100644 --- a/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs +++ b/com.unity.netcode.gameobjects/Runtime/Metrics/ToolsNetworkMetrics.cs @@ -8,20 +8,22 @@ namespace Unity.Netcode { - internal class NetworkMetrics : INetworkMetrics + internal class ToolsNetworkMetrics : INetworkMetrics { private const ulong k_MaxMetricsPerFrame = 1000L; private static readonly Dictionary k_SceneEventTypeNames; private static readonly ProfilerMarker k_FrameDispatch; - static NetworkMetrics() + static ToolsNetworkMetrics() { k_SceneEventTypeNames = new Dictionary(); foreach (SceneEventType type in Enum.GetValues(typeof(SceneEventType))) { k_SceneEventTypeNames[(uint)type] = type.ToString(); } - k_FrameDispatch = new ProfilerMarker($"{nameof(NetworkMetrics)}.DispatchFrame"); + // Spelled out rather than nameof: this is the name shown in the Profiler, and it + // should not move because the implementing type was renamed. + k_FrameDispatch = new ProfilerMarker("NetworkMetrics.DispatchFrame"); } private static string GetSceneEventTypeName(uint typeCode) @@ -85,7 +87,7 @@ private static string GetSceneEventTypeName(uint typeCode) private ulong m_NumberOfMetricsThisFrame; - public NetworkMetrics() + public ToolsNetworkMetrics() { Dispatcher = new MetricDispatcherBuilder() .WithCounters(m_TransportBytesSent, m_TransportBytesReceived) diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs.meta b/com.unity.netcode.gameobjects/Runtime/Metrics/ToolsNetworkMetrics.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Metrics/ToolsNetworkMetrics.cs.meta diff --git a/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef b/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef index 98a2cd6a29..6b32d4a1b2 100644 --- a/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef +++ b/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef @@ -14,7 +14,7 @@ "Unity.Collections", "Unity.Burst", "Unity.Mathematics", - "Unity.NetCode", + "GUID:953adc2a6b8b4e3c8df5b728bcd546e9", "Unity.Entities" ], "includePlatforms": [], diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef b/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef index 86b6bae95f..af36db6c11 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef @@ -14,7 +14,7 @@ "Unity.Mathematics", "UnityEngine.TestRunner", "UnityEditor.TestRunner", - "Unity.NetCode", + "GUID:953adc2a6b8b4e3c8df5b728bcd546e9", "Unity.Entities" ], "includePlatforms": [],