Skip to content

Commit d64e191

Browse files
pets-svc[bot]svc-netcode-sdkmichalChrobotEmandM
authored
trunk shadow changes: com.unity.netcode.gameobjects (#4120)
* 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] * Revert CHANGELOG changes * Added UNITY_TEST_FRAMEWORK_1_7_OR_NEWER guard and UnityCoreClrExplicitDisabledAttributeShim.cs to make attribute usage possible * corrected svc bot exclusion --------- 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> Co-authored-by: Emma <emma.mcmillan@unity3d.com>
1 parent 95e472b commit d64e191

25 files changed

Lines changed: 84 additions & 2 deletions

.github/workflows/pr-description-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
// This should be automations where we don't care that much about the description format
3535
const skipUserPatterns = [
3636
/^unity-renovate/,
37-
/(^|-)svc(-|$)/
37+
/svc/
3838
];
3939
4040
// If PR author matches the skip list, exit early

Tools/scripts/BuildAutomation/manifest_update.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def main():
5151
# Extract the version, providing a default if not found
5252
local_package_version = local_package_data.get('version', 'N/A')
5353

54-
print(f"--> Verified local '{args.package-name}' version is: {local_package_version}")
54+
print(f"--> Verified local '{args.package_name}' version is: {local_package_version}")
5555

5656
except FileNotFoundError:
5757
print(f"Warning: Could not find package.json at '{local_package_json_path}'")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ 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)")]
5657
public IEnumerator DeferredDespawning()
5758
{
5859
// Setup for test

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ 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)")]
158159
public IEnumerator ValidateNetworkClients()
159160
{
160161
// Validate the initial clients created

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ 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)")]
154155
public IEnumerator SwitchTransportTest()
155156
{
156157
var authority = GetAuthorityNetworkManager();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ private bool ValidateAllAreEqual(StringBuilder errorLog)
173173
}
174174

175175
[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)")]
176177
public IEnumerator TestHealthCode()
177178
{
178179
var authority = GetAuthorityNetworkManager();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ 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")]
9798
public IEnumerator NetworkObjectDeserializationFailure()
9899
{
99100
m_CurrentLogLevel = LogLevel.Nothing;
@@ -277,6 +278,7 @@ private void ValidateNetworkBehaviourWithNetworkVariables(NetworkObject authorit
277278
/// will still be initialized properly
278279
/// </summary>
279280
[UnityTest]
281+
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149591", "NGO multi-instance test sessions fail to start/connect or time out on CoreCLR")]
280282
public IEnumerator NetworkBehaviourSynchronization()
281283
{
282284
var authority = GetAuthorityNetworkManager();
@@ -319,6 +321,7 @@ public IEnumerator NetworkBehaviourSynchronization()
319321
/// A basic validation for the NetworkBehaviour.OnSynchronize method
320322
/// </summary>
321323
[UnityTest]
324+
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149591", "NGO multi-instance test sessions fail to start/connect or time out on CoreCLR")]
322325
public IEnumerator NetworkBehaviourOnSynchronize()
323326
{
324327
var authority = GetAuthorityNetworkManager();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ void TestForceUpdateCallback(NetworkListEvent<int> _)
244244

245245
// don't extend this please
246246
[UnityTest]
247+
[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-149592", "NGO NetworkVariable serialization codegen not generated for some types on CoreCLR (falls back to FallbackSerializer)")]
247248
public IEnumerator LegacyPredicateTesting()
248249
{
249250
var authority = GetAuthorityNetworkManager();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using NUnit.Framework;
44
using Unity.Netcode.TestHelpers.Runtime;
55
using UnityEngine;
6+
using UnityEngine.TestTools;
67

78
namespace Unity.Netcode.RuntimeTests
89
{
@@ -58,6 +59,7 @@ public void SetReanticipateValueRpc(float f)
5859
}
5960
}
6061

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ 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)")]
2021
internal class NetworkVariableCollectionsChangingTests : NetcodeIntegrationTest
2122
{
2223
protected override int NumberOfClients => 2;

0 commit comments

Comments
 (0)