update

Adding same condition define, NGO_FINDOBJECTS_NOSORTING, to the testproject.manualtests assembly define.

Author: NoelStephensUnity

testproject/Assets/Tests/Manual/SceneTransitioningAdditive/NetworkManagerMonitor.cs

@@ -1,33 +1,33 @@
 using Unity.Netcode;
 using UnityEngine;
 
-/// <summary>
-/// This can be added to the same GameObject the NetworkManager component is assigned to in order to prevent
-/// multiple NetworkManager instances from being instantiated if the same scene is loaded.
-/// </summary>
-public class NetworkManagerMonitor : MonoBehaviour
+namespace TestProject.ManualTests
 {
-    // Start is called before the first frame update
-    private void Start()
+    /// <summary>
+    /// This can be added to the same GameObject the NetworkManager component is assigned to in order to prevent
+    /// multiple NetworkManager instances from being instantiated if the same scene is loaded.
+    /// </summary>
+    public class NetworkManagerMonitor : MonoBehaviour
     {
-#if UNITY_6000_4_OR_NEWER
-        var networkManagerInstances = FindObjectsByType<NetworkManager>();
-#else
-#if UNITY_2023_1_OR_NEWER
-        var networkManagerInstances = FindObjectsByType<NetworkManager>(FindObjectsSortMode.None);
+        // Start is called before the first frame update
+        private void Start()
+        {
+#if NGO_FINDOBJECTS_NOSORTING
+            var networkManagerInstances = FindObjectsByType<NetworkManager>();
+#elif UNITY_2023_1_OR_NEWER
+            var networkManagerInstances = FindObjectsByType<NetworkManager>(FindObjectsSortMode.None);
 #else
-        var networkManagerInstances = FindObjectsOfType<NetworkManager>();
-#endif
+            var networkManagerInstances = FindObjectsOfType<NetworkManager>();
 #endif
-
-        foreach (var instance in networkManagerInstances)
-        {
-            if (instance.IsListening)
+            foreach (var instance in networkManagerInstances)
             {
-                if (gameObject != instance.gameObject)
+                if (instance.IsListening)
                 {
-                    var networkManager = GetComponent<NetworkManager>();
-                    Destroy(gameObject);
+                    if (gameObject != instance.gameObject)
+                    {
+                        var networkManager = GetComponent<NetworkManager>();
+                        Destroy(gameObject);
+                    }
                 }
             }
         }

testproject/Assets/Tests/Manual/Scripts/NetworkPrefabPool.cs

@@ -348,16 +348,13 @@ private void ShowHideObjectIdLabelClientRpc(bool isVisible)
         {
             m_LabelEnabled = isVisible;
             NetworkObjectLabel.GlobalVisibility = m_LabelEnabled;
-#if UNITY_6000_4_OR_NEWER
+#if NGO_FINDOBJECTS_NOSORTING
             var labels = FindObjectsByType<NetworkObjectLabel>();
-#else
-#if UNITY_2023_1_OR_NEWER
+#elif UNITY_2023_1_OR_NEWER
             var labels = FindObjectsByType<NetworkObjectLabel>(FindObjectsSortMode.None);
 #else
             var labels = FindObjectsOfType<NetworkObjectLabel>();
 #endif
-#endif
-
             foreach (var label in labels)
             {
                 label.SetLabelVisibility(isVisible);

testproject/Assets/Tests/Manual/testproject.manualtests.asmdef

@@ -7,5 +7,13 @@
         "Unity.Netcode.Components",
         "Unity.Collections",
         "Unity.Mathematics"
-    ]
-}
+    ],
+    "versionDefines": [
+        {
+            "name": "Unity",
+            "expression": "6000.4.0b5",
+            "define": "NGO_FINDOBJECTS_NOSORTING"
+        }
+    ],
+    "noEngineReferences": false
+}