update

Fixing minor merge issues.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Tests/Runtime/Rpc/RpcInvocationTests.cs

@@ -1,4 +1,4 @@
-#if MULTIPLAYER_TOOLS && (DEVELOPMENT_BUILD || UNITY_EDITOR || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE)
+#if MULTIPLAYER_TOOLS && (DEBUG || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE)
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs

@@ -622,7 +622,7 @@ private void InternalOnOneTimeSetup()
 
             VerboseDebug($"Exiting {nameof(OneTimeSetup)}");
 
-#if DEVELOPMENT_BUILD || UNITY_EDITOR
+#if DEBUG
             // Default to not log the serialized type not optimized warning message when testing.
             NetworkManager.DisableNotOptimizedSerializedType = true;
 #endif