Skip to content

Add conditional define for the tools library #908

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
bendoyon merged 3 commits into from
Jun 17, 2021
Merged

Add conditional define for the tools library #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9635ca
Add conditional define for the tools library
Jun 15, 2021
a902a29
Remove conditional define from test project
Jun 16, 2021
f6e399e
Revert asmdef changes
Jun 17, 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
2 changes: 1 addition & 1 deletion com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ private void Init(bool server)

if (NetworkMetrics == null)
{
#if true
#if MULTIPLAYER_TOOLS
NetworkMetrics = new NetworkMetrics(this);
#else
NetworkMetrics = new NullNetworkMetrics();
Expand Down
2 changes: 1 addition & 1 deletion com.unity.multiplayer.mlapi/Runtime/Metrics/NetworkMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace MLAPI.Metrics
{
#if true
#if MULTIPLAYER_TOOLS
public class NetworkMetrics : INetworkMetrics
{
private readonly NetworkManager m_NetworkManager;
Expand Down
8 changes: 7 additions & 1 deletion com.unity.multiplayer.mlapi/Runtime/com.unity.multiplayer.mlapi.runtime.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"versionDefines": [
{
"name": "com.unity.multiplayer.tools",
"expression": "",
"define": "MULTIPLAYER_TOOLS"
Comment thread
bendoyon marked this conversation as resolved.
}
],
"noEngineReferences": false
}
2 changes: 0 additions & 2 deletions ...multiplayer.mlapi/Tests/Runtime/Metrics/Messaging/NetworkMetricsMessagingDispatchTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

namespace MLAPI.RuntimeTests.Metrics.Messaging
{
#if true
public class NetworkMetricsMessagingDispatchTests
{
NetworkManager m_NetworkManager;
Expand Down Expand Up @@ -104,5 +103,4 @@ public IEnumerator TrackUnnamedMessageSentMetricToMultipleClients()
Assert.Contains(300UL, clientIds);
}
}
#endif
}
2 changes: 0 additions & 2 deletions ...ultiplayer.mlapi/Tests/Runtime/Metrics/Messaging/NetworkMetricsMessagingReceptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

namespace MLAPI.RuntimeTests.Metrics.Messaging
{
#if true
public class NetworkMetricsMessagingReceptionTests
{
NetworkManager m_Server;
Expand Down Expand Up @@ -89,5 +88,4 @@ public IEnumerator TrackUnnamedMessageReceivedMetric()
Assert.AreEqual(m_Server.LocalClientId, unnamedMessageReceived.Connection.Id);
}
}
#endif
}