Skip to content

Commit 06e58e7

Browse files
EmandMEmandM
committed
Merge branch 'develop' of https://github.com/Unity-Technologies/com.unity.netcode.gameobjects into pvp-fixes-develop
2 parents 12a5334 + 3b63bdf commit 06e58e7

31 files changed

+172
-46
lines changed

‎.yamato/_run-all.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,13 @@ run_all_project_tests_desktop_standalone:
130130
{% for platform in test_platforms.desktop -%}
131131
{% for editor in validation_editors.all -%}
132132
{% for backend in scripting_backends -%}
133+
# There is an error 'No usable version of libssl' when it comes to building with combination of ubuntu and 2021 editor. It's not really worth to address it since
134+
# 1) The 2021 editor will soon be out of support
135+
# 2) We still have the same coverage by using mac and ubuntu is used in a whole bunch of different tests, so I'm quite sure it won't lead to any bug leaks
136+
# 3) The solution could be to manually install libss1.1 (since image has libssl3 and this causes conflicts on 2021 editor related to dotnet versions and support). There were several threads on this topic which can be looked on
137+
{% if editor != "2021.3" or platform.name != "ubuntu" %}
133138
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
139+
{% endif -%}
134140
{% endfor -%}
135141
{% endfor -%}
136142
{% endfor -%}
@@ -158,7 +164,13 @@ run_all_project_tests_desktop_standalone_2021:
158164
{% for project in projects.default -%}
159165
{% for platform in test_platforms.desktop -%}
160166
{% for backend in scripting_backends -%}
167+
# There is an error 'No usable version of libssl' when it comes to building with combination of ubuntu and 2021 editor. It's not really worth to address it since
168+
# 1) The 2021 editor will soon be out of support
169+
# 2) We still have the same coverage by using mac and ubuntu is used in a whole bunch of different tests, so I'm quite sure it won't lead to any bug leaks
170+
# 3) The solution could be to manually install libss1.1 (since image has libssl3 and this causes conflicts on 2021 editor related to dotnet versions and support). There were several threads on this topic which can be looked on
171+
{% if platform.name != "ubuntu" %}
161172
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_2021.3
173+
{% endif -%}
162174
{% endfor -%}
163175
{% endfor -%}
164176
{% endfor -%}
@@ -206,7 +218,10 @@ run_all_project_tests_console_standalone:
206218
{% for project in projects.default -%}
207219
{% for platform in test_platforms.console_test -%}
208220
{% for editor in validation_editors.all -%}
221+
# When building consoles with 2023 editor there are errors related to SDK version or uninstalled components. I will disable those for now and will add to my investigation list
222+
{% if editor != "2023.3" %}
209223
- .yamato/console-standalone-test.yml#run_{{ project.name }}_tests_{{ platform.name }}_{{ editor }}
224+
{% endif -%}
210225
{% endfor -%}
211226
{% endfor -%}
212227
{% endfor -%}

‎.yamato/code-coverage.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ code_coverage_{{ platform.name }}_{{ editor }}:
1616
commands:
1717
- npm install -g upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1818
- unity-downloader-cli -u {{ editor }} -c Editor --fast --wait
19-
- {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %} upm-ci package test -u {{ editor }} --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime' --extra-utr-arg="--extra-editor-arg=--burst-disable-compilation --extra-editor-arg=-testCategory --extra-editor-arg=!Performance --timeout=1800 --reruncount=1 --clean-library-on-rerun"
19+
- DISPLAY=:0 upm-ci package test -u {{ editor }} --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime' --extra-utr-arg="--extra-editor-arg=--burst-disable-compilation --extra-editor-arg=testCategory --extra-editor-arg=!Performance --timeout=1800 --reruncount=1 --clean-library-on-rerun"
2020
artifacts:
2121
logs:
2222
paths:
2323
- "upm-ci~/test-results/**/*"
24+
- "upm-ci~/test-results/CoverageResults/**/*"
2425
dependencies:
25-
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
26+
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}_upmCI
2627
{% endfor -%}
2728
{% endfor -%}

‎.yamato/console-standalone-test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
{% for project in projects.default -%}
1616
{% for platform in test_platforms.console_build -%}
1717
{% for editor in validation_editors.all -%}
18+
# When building consoles with 2023 editor there are errors related to SDK version or uninstalled components. I will disable those for now and will add to my investigation list
19+
{% if editor != "2023.3" %}
1820
build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
1921
name: Build {{ project.name }} - [{{ platform.name }}, {{ editor }}, il2cpp{% if platform.name == "switch" %}, arm64{% endif %}]
2022
agent:
@@ -47,6 +49,7 @@ build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
4749
logs:
4850
paths:
4951
- "artifacts/**/*"
52+
{% endif -%}
5053
{% endfor -%}
5154
{% endfor -%}
5255
{% endfor -%}
@@ -57,6 +60,8 @@ build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5760
{% for project in projects.default -%}
5861
{% for platform in test_platforms.console_test -%}
5962
{% for editor in validation_editors.all -%}
63+
# When building consoles with 2023 editor there are errors related to SDK version or uninstalled components. I will disable those for now and will add to my investigation list
64+
{% if editor != "2023.3" %}
6065
run_{{ project.name }}_tests_{{ platform.name }}_{{ editor }}:
6166
name: Run {{ project.name }} Tests - [{{ platform.name }}, {{ editor }}, il2cpp]
6267
agent:
@@ -91,6 +96,7 @@ run_{{ project.name }}_tests_{{ platform.name }}_{{ editor }}:
9196
- "test-results/**/*"
9297
dependencies:
9398
- .yamato/console-standalone-test.yml#build_{{ project.name }}_{{ platform.name }}_{{ editor }}
99+
{% endif -%}
94100
{% endfor -%}
95101
{% endfor -%}
96102
{% endfor -%}

‎.yamato/desktop-standalone-tests.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
{% for platform in test_platforms.desktop -%}
1414
{% for editor in validation_editors.all -%}
1515
{% for backend in scripting_backends -%}
16+
# There is an error 'No usable version of libssl' when it comes to building with combination of ubuntu and 2021 editor. It's not really worth to address it since
17+
# 1) The 2021 editor will soon be out of support
18+
# 2) We still have the same coverage by using mac and ubuntu is used in a whole bunch of different tests, so I'm quite sure it won't lead to any bug leaks
19+
# 3) The solution could be to manually install libss1.1 (since image has libssl3 and this causes conflicts on 2021 editor related to dotnet versions and support). There were several threads on this topic which can be looked on
20+
{% if editor != "2021.3" or platform.name != "ubuntu" %}
1621
desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}:
1722
name : Standalone Build - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}]
1823
agent:
@@ -57,6 +62,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
5762

5863
dependencies:
5964
- .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
65+
{% endif %}
6066
{% endfor -%}
6167
{% endfor -%}
6268
{% endfor -%}
@@ -70,6 +76,11 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
7076
{% for platform in test_platforms.desktop -%}
7177
{% for editor in validation_editors.all -%}
7278
{% for backend in scripting_backends -%}
79+
# There is an error 'No usable version of libssl' when it comes to building with combination of ubuntu and 2021 editor. It's not really worth to address it since
80+
# 1) The 2021 editor will soon be out of support
81+
# 2) We still have the same coverage by using mac and ubuntu is used in a whole bunch of different tests, so I'm quite sure it won't lead to any bug leaks
82+
# 3) The solution could be to manually install libss1.1 (since image has libssl3 and this causes conflicts on 2021 editor related to dotnet versions and support). There were several threads on this topic which can be looked on
83+
{% if editor != "2021.3" or platform.name != "ubuntu" %}
7384
desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}:
7485
name : Standalone Test - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}]
7586
agent:
@@ -102,6 +113,7 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
102113
- "test-results/**/*"
103114
dependencies:
104115
- .yamato/desktop-standalone-tests.yml#desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
116+
{% endif %}
105117
{% endfor -%}
106118
{% endfor -%}
107119
{% endfor -%}

‎.yamato/package-pack.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,27 @@ package_pack_-_ngo_{{ platform.name }}:
2525
packages:
2626
paths:
2727
- "upm-ci~/**"
28+
{% endfor -%}
29+
30+
# This is in essence the same job as the one above with the difference that upm-ci is used instead of upm-pvp
31+
# The reason for using it is that I had some problems with Code Coverage which in its current form uses upm-ci but if we would use the other pack job (the one above) we would need to use upm-pvp
32+
# I had some problems with getting it to work so as temporary solution I created this pack job which is used ONLY as a dependency of Code Coverage job (other jobs use the above definition of pack job)
33+
# TODO: remove this job and utilize the above one for Code Coverage job. This is tracked in MTT-11383
34+
{% for platform in test_platforms.default -%}
35+
{% for project in projects.default -%}
36+
package_pack_-_ngo_{{ platform.name }}_upmCI:
37+
name: Package Pack (legacy upm-ci) - NGO [{{ platform.name }}]
38+
agent:
39+
type: {{ platform.type }}
40+
image: {{ platform.image }}
41+
flavor: {{ platform.flavor }}
42+
timeout: 0.25
43+
commands:
44+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
45+
- upm-ci project pack --project-path {{ project.path }}
46+
artifacts:
47+
packages:
48+
paths:
49+
- "upm-ci~/packages/**/*"
50+
{% endfor -%}
2851
{% endfor -%}

‎com.unity.netcode.gameobjects/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Additional documentation and release notes are available at [Multiplayer Documen
99
## [Unreleased]
1010

1111
### Added
12+
- Added `FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator)` constructor that uses the `ArraySegment.Offset` as the `FastBufferReader` offset and the `ArraySegment.Count` as the `FastBufferReader` length. (#3320)
13+
- Added `FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator, int length = -1)` constructor that uses the `ArraySegment.Offset` as the `FastBufferReader` offset. (#3320)
1214

1315
### Fixed
1416

‎com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferReader.cs

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,59 @@ public unsafe FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocato
136136
}
137137
fixed (byte* data = buffer.Array)
138138
{
139+
139140
Handle = CreateHandle(data, length == -1 ? buffer.Count : length, offset, copyAllocator, Allocator.Temp);
140141
}
141142
}
142143

144+
/// <summary>
145+
/// Create a FastBufferReader from an ArraySegment that uses the ArraySegment.Offset for the reader's offset.
146+
///
147+
/// A new buffer will be created using the given allocator and the value will be copied in.
148+
/// FastBufferReader will then own the data.
149+
///
150+
/// Allocator.None is not supported for byte[]. If you need this functionality, use a fixed() block
151+
/// and ensure the FastBufferReader isn't used outside that block.
152+
/// </summary>
153+
/// <param name="buffer">The buffer to copy from</param>
154+
/// <param name="copyAllocator">The allocator type used for internal data when copying an existing buffer if other than Allocator.None is specified, that memory will be owned by this FastBufferReader instance</param>
155+
/// <param name="length">The number of bytes to copy (all if this is -1)</param>
156+
public unsafe FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator, int length = -1)
157+
{
158+
if (copyAllocator == Allocator.None)
159+
{
160+
throw new NotSupportedException("Allocator.None cannot be used with managed source buffers.");
161+
}
162+
fixed (byte* data = buffer.Array)
163+
{
164+
165+
Handle = CreateHandle(data, length == -1 ? buffer.Count : length, buffer.Offset, copyAllocator, Allocator.Temp);
166+
}
167+
}
168+
169+
/// <summary>
170+
/// Create a FastBufferReader from an ArraySegment that uses the ArraySegment.Offset for the reader's offset and the ArraySegment.Count for the reader's length.
171+
///
172+
/// A new buffer will be created using the given allocator and the value will be copied in.
173+
/// FastBufferReader will then own the data.
174+
///
175+
/// Allocator.None is not supported for byte[]. If you need this functionality, use a fixed() block
176+
/// and ensure the FastBufferReader isn't used outside that block.
177+
/// </summary>
178+
/// <param name="buffer">The buffer to copy from</param>
179+
/// <param name="copyAllocator">The allocator type used for internal data when copying an existing buffer if other than Allocator.None is specified, that memory will be owned by this FastBufferReader instance</param>
180+
public unsafe FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator)
181+
{
182+
if (copyAllocator == Allocator.None)
183+
{
184+
throw new NotSupportedException("Allocator.None cannot be used with managed source buffers.");
185+
}
186+
fixed (byte* data = buffer.Array)
187+
{
188+
Handle = CreateHandle(data, buffer.Count, buffer.Offset, copyAllocator, Allocator.Temp);
189+
}
190+
}
191+
143192
/// <summary>
144193
/// Create a FastBufferReader from an existing byte array.
145194
///

‎com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,16 +1241,16 @@ public NetworkEndpoint GetEndpoint(ulong clientId)
12411241
}
12421242
#else
12431243
/// <summary>
1244-
/// Provides the <see cref="NetworkEndPoint"/> for the NGO client identifier specified.
1244+
/// Provides the <see cref="NetworkEndpoint"/> for the NGO client identifier specified.
12451245
/// </summary>
12461246
/// <remarks>
12471247
/// - This is only really useful for direct connections.
12481248
/// - Relay connections and clients connected using a distributed authority network topology will not provide the client's actual endpoint information.
12491249
/// - For LAN topologies this should work as long as it is a direct connection and not a relay connection.
12501250
/// </remarks>
12511251
/// <param name="clientId">NGO client identifier to get endpoint information about.</param>
1252-
/// <returns><see cref="NetworkEndPoint"/></returns>
1253-
public NetworkEndPoint GetEndpoint(ulong clientId)
1252+
/// <returns><see cref="NetworkEndpoint"/></returns>
1253+
public NetworkEndpoint GetEndpoint(ulong clientId)
12541254
{
12551255
if (m_Driver.IsCreated && NetworkManager != null && NetworkManager.IsListening)
12561256
{
@@ -1261,7 +1261,7 @@ public NetworkEndPoint GetEndpoint(ulong clientId)
12611261
return m_Driver.RemoteEndPoint(networkConnection);
12621262
}
12631263
}
1264-
return new NetworkEndPoint();
1264+
return new NetworkEndpoint();
12651265
}
12661266
#endif
12671267

‎com.unity.netcode.gameobjects/TestHelpers/Runtime/Metrics/WaitForMetricValues.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public WaitForMetricValues(IMetricDispatcher dispatcher, DirectionalMetricInfo d
2121
dispatcher.RegisterObserver(this);
2222
}
2323

24-
abstract public void Observe(MetricCollection collection);
24+
public abstract void Observe(MetricCollection collection);
2525

2626
public void AssertMetricValuesHaveNotBeenFound()
2727
{

‎com.unity.netcode.gameobjects/Tests/Editor/InterpolatorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void OutOfOrderShouldStillWork()
105105
Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(2f).Within(k_Precision));
106106
}
107107

108-
[Ignore("TODO: Fix this test to still handle testing message loss without extrapolation")]
108+
[Ignore("TODO: Fix this test to still handle testing message loss without extrapolation. This is tracked in MTT-11338")]
109109
[Test]
110110
public void MessageLoss()
111111
{
@@ -306,7 +306,7 @@ public void TestUpdatingInterpolatorWithNoData()
306306
Assert.Throws<InvalidOperationException>(() => interpolator.Update(1f, serverTime));
307307
}
308308

309-
[Ignore("TODO: Fix this test to still test duplicated values without extrapolation")]
309+
[Ignore("TODO: Fix this test to still test duplicated values without extrapolation. This is tracked in MTT-11338")]
310310
[Test]
311311
public void TestDuplicatedValues()
312312
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class NetworkMetricsRegistrationTests
1616
.ToArray();
1717

1818
[TestCaseSource(nameof(s_MetricTypes))]
19-
[Ignore("Disable test while we reevaluate the assumption that INetworkMetricEvent interfaces must be reported from MLAPI.")]
19+
[Ignore("Disable test while we reevaluate the assumption that INetworkMetricEvent interfaces must be reported from MLAPI. This is tracked in MTT-11339")]
2020
public void ValidateThatAllMetricTypesAreRegistered(Type metricType)
2121
{
2222
var dispatcher = new NetworkMetrics().Dispatcher as MetricDispatcher;

‎com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferReaderTests.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,5 +1579,21 @@ public unsafe void WhenCallingTryBeginReadInternal_AllowedReadPositionDoesNotMov
15791579
Assert.AreEqual(reader.Handle->AllowedReadMark, 25);
15801580
}
15811581
}
1582+
1583+
[Test]
1584+
public unsafe void WhenUsingArraySegment_ConstructorHonorsArraySegmentConfiguration()
1585+
{
1586+
var bytes = new byte[] { 0, 1, 2, 3 };
1587+
var segment = new ArraySegment<byte>(bytes, 1, 3);
1588+
var reader = new FastBufferReader(segment, Allocator.Temp);
1589+
1590+
var readerArray = reader.ToArray();
1591+
Assert.True(readerArray.Length == bytes.Length - 1, $"Array of reader should have a length of {bytes.Length - 1} but was {readerArray.Length}!");
1592+
for (int i = 0; i < readerArray.Length; i++)
1593+
{
1594+
Assert.True(bytes[i + 1] == readerArray[i], $"Value of {nameof(readerArray)} at index {i} is {readerArray[i]} but should be {bytes[i + 1]}!");
1595+
}
1596+
reader.Dispose();
1597+
}
15821598
}
15831599
}

‎com.unity.netcode.gameobjects/Tests/Runtime/DeferredMessagingTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,6 @@ public void WhenANetworkVariableDeltaMessageArrivesBeforeASpawnArrives_ItIsDefer
492492
}
493493

494494
[Test]
495-
//[Ignore("Disabling this temporarily until it is migrated into new integration test.")]
496495
public void WhenASpawnMessageArrivesBeforeThePrefabIsAvailable_ItIsDeferred()
497496
{
498497
m_SkipAddingPrefabsToClient = true;

‎com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
using System.Collections;
44
using NUnit.Framework;
55
using Unity.Multiplayer.Tools.NetStats;
6-
using UnityEngine.TestTools;
76
using Unity.Netcode.TestHelpers.Runtime;
7+
using UnityEngine.TestTools;
88

99
namespace Unity.Netcode.RuntimeTests.Metrics
1010
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
using System.Linq;
55
using NUnit.Framework;
66
using Unity.Multiplayer.Tools.MetricTypes;
7+
using Unity.Netcode.TestHelpers.Runtime.Metrics;
78
using UnityEngine;
89
using UnityEngine.TestTools;
910

10-
using Unity.Netcode.TestHelpers.Runtime.Metrics;
11-
1211
namespace Unity.Netcode.RuntimeTests.Metrics
1312
{
1413
internal class NetworkObjectMetricsTests : SingleClientMetricTestBase

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

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

99
namespace Unity.Netcode.RuntimeTests.Metrics
1010
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using NUnit.Framework;
55
using Unity.Collections;
66
using Unity.Multiplayer.Tools.MetricTypes;
7-
using UnityEngine;
8-
using UnityEngine.TestTools;
97
using Unity.Netcode.TestHelpers.Runtime;
108
using Unity.Netcode.TestHelpers.Runtime.Metrics;
9+
using UnityEngine;
10+
using UnityEngine.TestTools;
1111

1212
namespace Unity.Netcode.RuntimeTests.Metrics
1313
{

‎com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#if MULTIPLAYER_TOOLS
22
#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
3-
43
using System.Collections;
54
using NUnit.Framework;
65
using Unity.Collections;

‎com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using NUnit.Framework;
55
using Unity.Collections;
66
using Unity.Multiplayer.Tools.MetricTypes;
7-
using UnityEngine.TestTools;
87
using Unity.Netcode.TestHelpers.Runtime.Metrics;
8+
using UnityEngine.TestTools;
99

1010
namespace Unity.Netcode.RuntimeTests.Metrics
1111
{

0 commit comments

Comments
 (0)