Skip to content

Commit 070d2a0

Browse files
pets-svc[bot]svc-netcode-sdkmichalChrobot
committed
trunk shadow changes: com.unity.netcode.gameobjects (#4136)
* Updated changelog and package version for Netcode in anticipation of v2.13.1 release * typo in build automation * trunk shadow changes: com.unity.netcode.gameobjects [skip ci] * typo --------- Co-authored-by: netcode-automation <svc-netcode-sdk@unity3d.com> Co-authored-by: Michał Chrobot <michal.chrobot@unity3d.com> Co-authored-by: PETS automation <299490404+pets-svc[bot]@users.noreply.github.com>
1 parent 8623ebf commit 070d2a0

23 files changed

Lines changed: 155 additions & 81 deletions

‎com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DeferredDespawningTests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ protected override void OnServerAndClientsCreated()
5353

5454

5555
[UnityTest]
56-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149592", "NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer)")]
56+
#if ENABLE_CORECLR
57+
[Explicit("NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer), see https://jira.unity3d.com/browse/UUM-149592")]
58+
#endif
5759
public IEnumerator DeferredDespawning()
5860
{
5961
// Setup for test

‎com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/NetworkClientAndPlayerObjectTests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ private bool AllNetworkClientsValidated()
155155
/// Validates the same thing when a client late joins and when a client disconnects.
156156
/// </summary>
157157
[UnityTest]
158-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149595", "ValidateNetworkClients throws duplicate-key ArgumentException on CoreCLR (DAHost)")]
158+
#if ENABLE_CORECLR
159+
[Explicit("ValidateNetworkClients throws duplicate-key ArgumentException on CoreCLR (DAHost), see https://jira.unity3d.com/browse/UUM-149595")]
160+
#endif
159161
public IEnumerator ValidateNetworkClients()
160162
{
161163
// Validate the initial clients created

‎com.unity.netcode.gameobjects/Tests/Runtime/DocumentationCodeSamples/Configuration/SinglePlayerSessions.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
151151
}
152152

153153
[UnityTest]
154-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149592", "NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer)")]
154+
#if ENABLE_CORECLR
155+
[Explicit("NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer), see https://jira.unity3d.com/browse/UUM-149592")]
156+
#endif
155157
public IEnumerator SwitchTransportTest()
156158
{
157159
var authority = GetAuthorityNetworkManager();

‎com.unity.netcode.gameobjects/Tests/Runtime/DocumentationCodeSamples/NetworkVariable/CustomSerializationDocsTests.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections;
22
using System.Text;
3+
using NUnit.Framework;
34
using Unity.Netcode;
45
using Unity.Netcode.TestHelpers.Runtime;
56
using UnityEngine;
@@ -173,7 +174,9 @@ private bool ValidateAllAreEqual(StringBuilder errorLog)
173174
}
174175

175176
[UnityTest]
176-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149592", "NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer)")]
177+
#if ENABLE_CORECLR
178+
[Explicit("NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer), see https://jira.unity3d.com/browse/UUM-149592")]
179+
#endif
177180
public IEnumerator TestHealthCode()
178181
{
179182
var authority = GetAuthorityNetworkManager();

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
9494
}
9595

9696
[UnityTest]
97-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149591", "NGO multi-instance test sessions fail to start/connect or time out on CoreCLR")]
97+
#if ENABLE_CORECLR
98+
[Explicit("NGO multi-instance test sessions fail to start/connect or time out on CoreCLR, see https://jira.unity3d.com/browse/UUM-149591")]
99+
#endif
98100
public IEnumerator NetworkObjectDeserializationFailure()
99101
{
100102
m_CurrentLogLevel = LogLevel.Nothing;
@@ -278,7 +280,9 @@ private void ValidateNetworkBehaviourWithNetworkVariables(NetworkObject authorit
278280
/// will still be initialized properly
279281
/// </summary>
280282
[UnityTest]
281-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149591", "NGO multi-instance test sessions fail to start/connect or time out on CoreCLR")]
283+
#if ENABLE_CORECLR
284+
[Explicit("NGO multi-instance test sessions fail to start/connect or time out on CoreCLR, see https://jira.unity3d.com/browse/UUM-149591")]
285+
#endif
282286
public IEnumerator NetworkBehaviourSynchronization()
283287
{
284288
var authority = GetAuthorityNetworkManager();
@@ -321,7 +325,9 @@ public IEnumerator NetworkBehaviourSynchronization()
321325
/// A basic validation for the NetworkBehaviour.OnSynchronize method
322326
/// </summary>
323327
[UnityTest]
324-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149591", "NGO multi-instance test sessions fail to start/connect or time out on CoreCLR")]
328+
#if ENABLE_CORECLR
329+
[Explicit("NGO multi-instance test sessions fail to start/connect or time out on CoreCLR, see https://jira.unity3d.com/browse/UUM-149591")]
330+
#endif
325331
public IEnumerator NetworkBehaviourOnSynchronize()
326332
{
327333
var authority = GetAuthorityNetworkManager();

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkListTests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,9 @@ void TestForceUpdateCallback(NetworkListEvent<int> _)
248248

249249
// don't extend this please
250250
[UnityTest]
251-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149592", "NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer)")]
251+
#if ENABLE_CORECLR
252+
[Explicit("NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer), see https://jira.unity3d.com/browse/UUM-149592")]
253+
#endif
252254
public IEnumerator LegacyPredicateTesting()
253255
{
254256
var authority = GetAuthorityNetworkManager();

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableAnticipationTests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ public void SetReanticipateValueRpc(float f)
5959
}
6060
}
6161

62-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149591", "NGO multi-instance test sessions fail to start/connect or time out on CoreCLR")]
62+
#if ENABLE_CORECLR
63+
[Explicit("NGO multi-instance test sessions fail to start/connect or time out on CoreCLR, see https://jira.unity3d.com/browse/UUM-149591")]
64+
#endif
6365
internal class NetworkVariableAnticipationTests : NetcodeIntegrationTest
6466
{
6567
protected override int NumberOfClients => 2;

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsChangingTests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ namespace Unity.Netcode.RuntimeTests
1717
[TestFixture(HostOrServer.Host, CollectionTypes.Dictionary)]
1818
[TestFixture(HostOrServer.Server, CollectionTypes.List)]
1919
[TestFixture(HostOrServer.Server, CollectionTypes.Dictionary)]
20-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149592", "NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer)")]
20+
#if ENABLE_CORECLR
21+
[Explicit("NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer), see https://jira.unity3d.com/browse/UUM-149592")]
22+
#endif
2123
internal class NetworkVariableCollectionsChangingTests : NetcodeIntegrationTest
2224
{
2325
protected override int NumberOfClients => 2;

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ namespace Unity.Netcode.RuntimeTests
2222
/// </summary>
2323
[TestFixture(HostOrServer.Host)]
2424
[TestFixture(HostOrServer.Server)]
25-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149591", "NGO multi-instance test sessions fail to start/connect or time out on CoreCLR")]
25+
#if ENABLE_CORECLR
26+
[Explicit("NGO multi-instance test sessions fail to start/connect or time out on CoreCLR, see https://jira.unity3d.com/browse/UUM-149591")]
27+
#endif
2628
internal class NetworkVariableCollectionsTests : NetcodeIntegrationTest
2729
{
2830
protected override int NumberOfClients => 2;

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableGeneralTests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ private bool ChangedValueMatches(StringBuilder errorLog)
140140
/// instances invoke <see cref="NetworkBehaviour.OnNetworkSpawn"/>.
141141
/// </summary>
142142
[UnityTest]
143-
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149592", "NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer)")]
143+
#if ENABLE_CORECLR
144+
[Explicit("NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer), see https://jira.unity3d.com/browse/UUM-149592")]
145+
#endif
144146
public IEnumerator ApplyValueDuringSpawnSequence()
145147
{
146148
var authority = GetAuthorityNetworkManager();

0 commit comments

Comments
 (0)