Merge branch 'develop' into fix/replace-null-coalescence-operators

Author: LPLafontaineB

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,6 +357,7 @@ public IEnumerator UnexpectedClientDisconnect_ClientReconnectingSuccessfully()
             subscriptions.Dispose();
         }
 
+#if !NETCODEFORGAMEOBJECTS_1_5_2_OR_1_6_0
         [UnityTest]
         public IEnumerator UnexpectedServerShutdown_ClientsFailToReconnect()
         {
@@ -435,6 +437,7 @@ public IEnumerator UnexpectedServerShutdown_ClientsFailToReconnect()
             Assert.AreEqual(NumberOfClients, nbGenericDisconnectMsgReceived, "Not all clients received a GenericDisconnect message.");
             subscriptions.Dispose();
         }
+#endif
 
         [UnityTest]
         public IEnumerator ClientAndHostChangingRolesBetweenSessions_Success()
@@ -508,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++)
@@ -523,6 +527,5 @@ public IEnumerator ClientCancellingWhileConnectingToNonExistingServer_NoConnecti
                 Assert.IsFalse(m_ClientNetworkManagers[i].IsConnectedClient, $"Client{i} is connected while no server is running.");
             }
         }
-
     }
 }

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
-}
+}

CHANGELOG.md

@@ -13,6 +13,8 @@ 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
 * Replaced usages of null-coalescing and null-conditional operators with regular null checks. (#867) These operators can cause issues when used with types inheriting UnityEngine.Object because that type redefines the == operator to define when an object is null. This redefinition applies to regular null checks (if foo == null) but not to those operators, thus this could lead to unexpected behaviour. While those operators were safely used within Boss Room, only with types that were not inheriting UnityEngine.Object, we decided to remove most usages for consistency. This will also help avoid accidental mistakes, such as a user reusing a part of this code, but modifying it so that one of those operators are used with a UnityEngine.Object.
+* 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 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).

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",

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"
     },