Skip to content

Commit 4dfc760

Browse files
chore: updated all of the namespaces to match the tools package change (#1095)
* chore: updated all of the namespaces to match the tools package change * updated to tools version 5
1 parent 15d5bef commit 4dfc760

File tree

10 files changed

+16
-20
lines changed

10 files changed

+16
-20
lines changed

com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#if MULTIPLAYER_TOOLS
22
using System.Collections.Generic;
3-
using Unity.Multiplayer.MetricTypes;
4-
using Unity.Multiplayer.NetStats.Dispatch;
5-
using Unity.Multiplayer.NetStats.Metrics;
6-
using Unity.Multiplayer.NetStatsReporting;
3+
using Unity.Multiplayer.Tools;
4+
using Unity.Multiplayer.Tools.MetricTypes;
5+
using Unity.Multiplayer.Tools.NetStats;
76

87
namespace Unity.Netcode
98
{
@@ -219,12 +218,12 @@ public void TrackRpcReceived(
219218

220219
public void TrackServerLogSent(ulong receiverClientId, uint logType, long bytesCount)
221220
{
222-
m_ServerLogSentEvent.Mark(new ServerLogEvent(new ConnectionInfo(receiverClientId), (Unity.Multiplayer.MetricTypes.LogLevel)logType, bytesCount));
221+
m_ServerLogSentEvent.Mark(new ServerLogEvent(new ConnectionInfo(receiverClientId), (Unity.Multiplayer.Tools.MetricTypes.LogLevel)logType, bytesCount));
223222
}
224223

225224
public void TrackServerLogReceived(ulong senderClientId, uint logType, long bytesCount)
226225
{
227-
m_ServerLogReceivedEvent.Mark(new ServerLogEvent(new ConnectionInfo(senderClientId), (Unity.Multiplayer.MetricTypes.LogLevel)logType, bytesCount));
226+
m_ServerLogReceivedEvent.Mark(new ServerLogEvent(new ConnectionInfo(senderClientId), (Unity.Multiplayer.Tools.MetricTypes.LogLevel)logType, bytesCount));
228227
}
229228

230229
public void DispatchFrame()

com.unity.netcode.gameobjects/Tests/Editor/Metrics/NetworkMetricsRegistrationTests.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
#if MULTIPLAYER_TOOLS
2-
32
using System;
43
using System.Linq;
54
using System.Reflection;
65
using NUnit.Framework;
7-
using Unity.Multiplayer.MetricTypes;
8-
using Unity.Multiplayer.NetStats.Dispatch;
9-
using Unity.Multiplayer.NetStats.Metrics;
6+
using Unity.Multiplayer.Tools.MetricTypes;
7+
using Unity.Multiplayer.Tools.NetStats;
108

119
namespace Unity.Netcode.EditorTests.Metrics
1210
{
@@ -16,7 +14,7 @@ public class NetworkMetricsRegistrationTests
1614
.SelectMany(x => x.GetTypes())
1715
.Where(x => x.GetInterfaces().Contains(typeof(INetworkMetricEvent)))
1816
.ToArray();
19-
17+
2018
[TestCaseSource(nameof(s_MetricTypes))]
2119
public void ValidateThatAllMetricTypesAreRegistered(Type metricType)
2220
{

com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Linq;
77
using System.Text;
88
using NUnit.Framework;
9-
using Unity.Multiplayer.MetricTypes;
9+
using Unity.Multiplayer.Tools.MetricTypes;
1010
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
1111
using UnityEngine;
1212
using UnityEngine.TestTools;

com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using System.Linq;
66
using NUnit.Framework;
7-
using Unity.Multiplayer.MetricTypes;
7+
using Unity.Multiplayer.Tools.MetricTypes;
88
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
99
using UnityEngine;
1010
using UnityEngine.TestTools;

com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Collections;
44
using System.Linq;
55
using NUnit.Framework;
6-
using Unity.Multiplayer.MetricTypes;
6+
using Unity.Multiplayer.Tools.MetricTypes;
77
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
88
using UnityEngine;
99
using UnityEngine.TestTools;

com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Collections;
44
using System.Linq;
55
using NUnit.Framework;
6-
using Unity.Multiplayer.MetricTypes;
6+
using Unity.Multiplayer.Tools.MetricTypes;
77
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
88
using UnityEngine;
99
using UnityEngine.TestTools;

com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Collections;
44
using System.Linq;
55
using NUnit.Framework;
6-
using Unity.Multiplayer.MetricTypes;
6+
using Unity.Multiplayer.Tools.MetricTypes;
77
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
88
using UnityEngine;
99
using UnityEngine.TestTools;

com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Collections;
44
using System.Linq;
55
using NUnit.Framework;
6-
using Unity.Multiplayer.MetricTypes;
6+
using Unity.Multiplayer.Tools.MetricTypes;
77
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
88
using UnityEngine.TestTools;
99

com.unity.netcode.gameobjects/Tests/Runtime/Metrics/Utility/WaitForMetricValues.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
using System.Collections.Generic;
44
using System.Linq;
55
using NUnit.Framework;
6-
using Unity.Multiplayer.NetStats.Dispatch;
7-
using Unity.Multiplayer.NetStats.Metrics;
6+
using Unity.Multiplayer.Tools.NetStats;
87
using UnityEngine;
98

109
namespace Unity.Netcode.RuntimeTests.Metrics.Utlity

testproject-tools-integration/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dependencies": {
44
"com.unity.ide.rider": "3.0.7",
55
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
6-
"com.unity.multiplayer.tools": "0.0.1-preview.4",
6+
"com.unity.multiplayer.tools": "0.0.1-preview.5",
77
"com.unity.multiplayer.transport.utp": "file:../../com.unity.multiplayer.transport.utp",
88
"com.unity.test-framework": "1.1.26",
99
"com.unity.modules.ai": "1.0.0",

0 commit comments

Comments
 (0)