Skip to content

chore: updated all of the namespaces to match the tools package change #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 27, 2021
Merged

chore: updated all of the namespaces to match the tools package change #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fa7d2b
chore: updated all of the namespaces to match the tools package change
becksebenius-unity Aug 26, 2021
ce465ec
Merge branch 'develop' into chore/update-namespaces-for-tools-package
becksebenius-unity Aug 26, 2021
f16d0d8
updated to tools version 5
becksebenius-unity Aug 26, 2021
88ee20c
Merge branch 'develop' into chore/update-namespaces-for-tools-package
becksebenius-unity Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#if MULTIPLAYER_TOOLS
using System.Collections.Generic;
using Unity.Multiplayer.MetricTypes;
using Unity.Multiplayer.NetStats.Dispatch;
using Unity.Multiplayer.NetStats.Metrics;
using Unity.Multiplayer.NetStatsReporting;
using Unity.Multiplayer.Tools;
using Unity.Multiplayer.Tools.MetricTypes;
using Unity.Multiplayer.Tools.NetStats;
Comment on lines +3 to +5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so, are these namespaces per asmdef now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep


namespace Unity.Netcode
{
Expand Down Expand Up @@ -219,12 +218,12 @@ public void TrackRpcReceived(

public void TrackServerLogSent(ulong receiverClientId, uint logType, long bytesCount)
{
m_ServerLogSentEvent.Mark(new ServerLogEvent(new ConnectionInfo(receiverClientId), (Unity.Multiplayer.MetricTypes.LogLevel)logType, bytesCount));
m_ServerLogSentEvent.Mark(new ServerLogEvent(new ConnectionInfo(receiverClientId), (Unity.Multiplayer.Tools.MetricTypes.LogLevel)logType, bytesCount));
}

public void TrackServerLogReceived(ulong senderClientId, uint logType, long bytesCount)
{
m_ServerLogReceivedEvent.Mark(new ServerLogEvent(new ConnectionInfo(senderClientId), (Unity.Multiplayer.MetricTypes.LogLevel)logType, bytesCount));
m_ServerLogReceivedEvent.Mark(new ServerLogEvent(new ConnectionInfo(senderClientId), (Unity.Multiplayer.Tools.MetricTypes.LogLevel)logType, bytesCount));
}

public void DispatchFrame()
Expand Down
8 changes: 3 additions & 5 deletions com.unity.netcode.gameobjects/Tests/Editor/Metrics/NetworkMetricsRegistrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#if MULTIPLAYER_TOOLS

using System;
using System.Linq;
using System.Reflection;
using NUnit.Framework;
using Unity.Multiplayer.MetricTypes;
using Unity.Multiplayer.NetStats.Dispatch;
using Unity.Multiplayer.NetStats.Metrics;
using Unity.Multiplayer.Tools.MetricTypes;
using Unity.Multiplayer.Tools.NetStats;

namespace Unity.Netcode.EditorTests.Metrics
{
Expand All @@ -16,7 +14,7 @@ public class NetworkMetricsRegistrationTests
.SelectMany(x => x.GetTypes())
.Where(x => x.GetInterfaces().Contains(typeof(INetworkMetricEvent)))
.ToArray();

[TestCaseSource(nameof(s_MetricTypes))]
public void ValidateThatAllMetricTypesAreRegistered(Type metricType)
{
Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Linq;
using System.Text;
using NUnit.Framework;
using Unity.Multiplayer.MetricTypes;
using Unity.Multiplayer.Tools.MetricTypes;
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
using UnityEngine;
using UnityEngine.TestTools;
Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using Unity.Multiplayer.MetricTypes;
using Unity.Multiplayer.Tools.MetricTypes;
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
using UnityEngine;
using UnityEngine.TestTools;
Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections;
using System.Linq;
using NUnit.Framework;
using Unity.Multiplayer.MetricTypes;
using Unity.Multiplayer.Tools.MetricTypes;
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
using UnityEngine;
using UnityEngine.TestTools;
Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections;
using System.Linq;
using NUnit.Framework;
using Unity.Multiplayer.MetricTypes;
using Unity.Multiplayer.Tools.MetricTypes;
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
using UnityEngine;
using UnityEngine.TestTools;
Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections;
using System.Linq;
using NUnit.Framework;
using Unity.Multiplayer.MetricTypes;
using Unity.Multiplayer.Tools.MetricTypes;
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
using UnityEngine;
using UnityEngine.TestTools;
Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections;
using System.Linq;
using NUnit.Framework;
using Unity.Multiplayer.MetricTypes;
using Unity.Multiplayer.Tools.MetricTypes;
using Unity.Netcode.RuntimeTests.Metrics.Utlity;
using UnityEngine.TestTools;

Expand Down
3 changes: 1 addition & 2 deletions com.unity.netcode.gameobjects/Tests/Runtime/Metrics/Utility/WaitForMetricValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using Unity.Multiplayer.NetStats.Dispatch;
using Unity.Multiplayer.NetStats.Metrics;
using Unity.Multiplayer.Tools.NetStats;
using UnityEngine;

namespace Unity.Netcode.RuntimeTests.Metrics.Utlity
Expand Down
2 changes: 1 addition & 1 deletion testproject-tools-integration/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dependencies": {
"com.unity.ide.rider": "3.0.7",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.multiplayer.tools": "0.0.1-preview.4",
"com.unity.multiplayer.tools": "0.0.1-preview.5",
"com.unity.multiplayer.transport.utp": "file:../../com.unity.multiplayer.transport.utp",
"com.unity.test-framework": "1.1.26",
"com.unity.modules.ai": "1.0.0",
Expand Down