From 4f5f28c1ed436e798f7c996cf73b31d0b9499669 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 25 Aug 2023 17:49:27 -0400 Subject: [PATCH 1/6] upgrade project to NGO v1.6.0 --- Packages/manifest.json | 2 +- Packages/packages-lock.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index f2102a4c11..abb68c8f43 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.learn.iet-framework": "3.1.3", "com.unity.memoryprofiler": "1.0.0", "com.unity.multiplayer.tools": "2.0.0-pre.3", - "com.unity.netcode.gameobjects": "1.4.0", + "com.unity.netcode.gameobjects": "1.6.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.postprocessing": "3.2.2", "com.unity.render-pipelines.universal": "14.0.8", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index fa95b1dc95..869a8b6df5 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -143,12 +143,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.4.0", + "version": "1.6.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.3" + "com.unity.transport": "1.3.4" }, "url": "https://packages.unity.com" }, From 16f77e6d80ce62d85245a347627e3094dd2ba0dd Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Mon, 28 Aug 2023 13:38:00 -0400 Subject: [PATCH 2/6] creating version define for NGO versions of range 1.5.2 to 1.6.0 & excluding single failing test --- Assets/Tests/Runtime/ConnectionManagementTests.cs | 2 ++ .../Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/Tests/Runtime/ConnectionManagementTests.cs b/Assets/Tests/Runtime/ConnectionManagementTests.cs index a602174285..5f9fb0d6b7 100644 --- a/Assets/Tests/Runtime/ConnectionManagementTests.cs +++ b/Assets/Tests/Runtime/ConnectionManagementTests.cs @@ -356,6 +356,7 @@ public IEnumerator UnexpectedClientDisconnect_ClientReconnectingSuccessfully() subscriptions.Dispose(); } + #if !NETCODEFORGAMEOBJECTS_1_5_2_OR_1_6_0 [UnityTest] public IEnumerator UnexpectedServerShutdown_ClientsFailToReconnect() { @@ -435,6 +436,7 @@ public IEnumerator UnexpectedServerShutdown_ClientsFailToReconnect() Assert.AreEqual(NumberOfClients, nbGenericDisconnectMsgReceived, "Not all clients received a GenericDisconnect message."); subscriptions.Dispose(); } +#endif [UnityTest] public IEnumerator ClientAndHostChangingRolesBetweenSessions_Success() diff --git a/Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef b/Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef index 1fb1fad2fb..4a416b5efb 100644 --- a/Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef +++ b/Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef @@ -28,6 +28,12 @@ "defineConstraints": [ "UNITY_INCLUDE_TESTS" ], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.netcode.gameobjects", + "expression": "[1.5.2,1.6.0]", + "define": "NETCODEFORGAMEOBJECTS_1_5_2_OR_1_6_0" + } + ], "noEngineReferences": false -} +} \ No newline at end of file From 765fe1e37219f8224d730e45cc126f07d9472562 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Mon, 28 Aug 2023 14:10:26 -0400 Subject: [PATCH 3/6] code standards pass --- Assets/Tests/Runtime/ConnectionManagementTests.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/Tests/Runtime/ConnectionManagementTests.cs b/Assets/Tests/Runtime/ConnectionManagementTests.cs index 5f9fb0d6b7..91d05649ba 100644 --- a/Assets/Tests/Runtime/ConnectionManagementTests.cs +++ b/Assets/Tests/Runtime/ConnectionManagementTests.cs @@ -67,7 +67,6 @@ public override void LoadScene(string sceneName, bool useNetworkSceneManager, Lo ConnectionManager[] m_ClientConnectionManagers; ConnectionManager m_ServerConnectionManager; - protected override bool CanStartServerAndClients() { return false; @@ -154,6 +153,7 @@ protected override IEnumerator OnTearDown() { GameObject.DestroyImmediate(sceneGameObject); } + yield return base.OnTearDown(); } @@ -285,6 +285,7 @@ public IEnumerator AttemptingToConnectWithSamePlayerId_ClientsDisconnectedWithRe // The first client should be able to connect Assert.IsTrue(m_ClientNetworkManagers[0].IsConnectedClient, "The first client is not connected."); + // Every other client should get their connection denied for (var i = 1; i < NumberOfClients; i++) { @@ -356,7 +357,7 @@ public IEnumerator UnexpectedClientDisconnect_ClientReconnectingSuccessfully() subscriptions.Dispose(); } - #if !NETCODEFORGAMEOBJECTS_1_5_2_OR_1_6_0 +#if !NETCODEFORGAMEOBJECTS_1_5_2_OR_1_6_0 [UnityTest] public IEnumerator UnexpectedServerShutdown_ClientsFailToReconnect() { @@ -510,6 +511,7 @@ public IEnumerator ClientCancellingWhileConnectingToNonExistingServer_NoConnecti { m_ClientConnectionManagers[i].StartClientIp($"client{i}", "127.0.0.1", 9998); } + m_ClientConnectionManagers[0].RequestShutdown(); for (var i = 1; i < NumberOfClients; i++) @@ -525,6 +527,5 @@ public IEnumerator ClientCancellingWhileConnectingToNonExistingServer_NoConnecti Assert.IsFalse(m_ClientNetworkManagers[i].IsConnectedClient, $"Client{i} is connected while no server is running."); } } - } } From 116c1c0ba67160e3614dc709102b49c47367e81b Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Mon, 28 Aug 2023 15:03:04 -0400 Subject: [PATCH 4/6] changelog addition --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 469ee6c4a8..aefd746cc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ Additional documentation and release notes are available at [Multiplayer Documen * Upgraded editor version to 2022.3.7f1 (#855) * Upgraded Authentication Service package to v2.7.1 * Upgraded Wire Service package to v1.2.0 +* Upgraded Boss Room to Netcode for GameObjects v1.6.0 (#865) + * A package Version Define has been created for Netcode for GameObjects v.1.5.2 - v1.6.0. A subsequent NGO version upgrade will address the runtime test that has been ignored with this version bump ### Fixed * Fixed colliders on diagonal walls to not have negative scale (#854). From b93d3bc89e6c49206786f4fdf4fa697c497255da Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Wed, 30 Aug 2023 13:44:42 -0400 Subject: [PATCH 5/6] adding more context --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aefd746cc9..7a82936468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ Additional documentation and release notes are available at [Multiplayer Documen * Upgraded Authentication Service package to v2.7.1 * Upgraded Wire Service package to v1.2.0 * Upgraded Boss Room to Netcode for GameObjects v1.6.0 (#865) - * A package Version Define has been created for Netcode for GameObjects v.1.5.2 - v1.6.0. A subsequent NGO version upgrade will address the runtime test that has been ignored with this version bump + * A package Version Define has been created for Netcode for GameObjects v.1.5.2 - v1.6.0. Recent refactorings to NetworkManager's shutdown have prevented the ability to invoke CustomMessages when OnClientDisconnected callbacks are invoked during a shutdown as host. This is a known issue and will be addressed in a future NGO version. ### Fixed * Fixed colliders on diagonal walls to not have negative scale (#854). From ddfd13c444c6504df06018d5d2c987076c3e8247 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Wed, 30 Aug 2023 14:48:34 -0400 Subject: [PATCH 6/6] more context --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a82936468..5dbf3b3ec1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ Additional documentation and release notes are available at [Multiplayer Documen * Upgraded Authentication Service package to v2.7.1 * Upgraded Wire Service package to v1.2.0 * Upgraded Boss Room to Netcode for GameObjects v1.6.0 (#865) - * A package Version Define has been created for Netcode for GameObjects v.1.5.2 - v1.6.0. Recent refactorings to NetworkManager's shutdown have prevented the ability to invoke CustomMessages when OnClientDisconnected callbacks are invoked during a shutdown as host. This is a known issue and will be addressed in a future NGO version. + * A package Version Define has been created for Netcode for GameObjects v.1.5.2 - v1.6.0. Recent refactorings to NetworkManager's shutdown have prevented the ability to invoke CustomMessages when OnClientDisconnected callbacks are invoked during a shutdown as host. This regression has caused one of our runtime tests, namely Unity.BossRoom.Tests.Runtime.ConnectionManagementTests.UnexpectedServerShutdown_ClientsFailToReconnect, to fail and it does not impact gameplay. This is a known issue and will be addressed in a future NGO version. ### Fixed * Fixed colliders on diagonal walls to not have negative scale (#854).