chore: Release merge back 1.14.0 (#3570)

<!-- Replace this block with what this PR does and why. Describe what
you'd like reviewers to know, how you applied the engineering
principles, and any interesting tradeoffs made. Delete bullet points
below that don't apply, and update the changelog section as appropriate.
-->
update with latest package and changelog version + merge back fixes
needed for the release

<!-- Add short version of the JIRA ticket to the PR title (e.g. "feat:
new shiny feature [MTT-123]") -->


<!-- Uncomment and mark items off with a * if this PR deprecates any
API:
### Deprecated API
- [ ] An `[Obsolete]` attribute was added along with a `(RemovedAfter
yyyy-mm-dd)` entry.
- [ ] An [api updater] was added.
- [ ] Deprecation of the API is explained in the CHANGELOG.
- [ ] The users can understand why this API was removed and what they
should use instead.
-->

## Backport
Not needed 

<!-- If this is a backport:
 - Add the following to the PR title: "\[Backport\] ..." .
 - Link to the original PR.
If this needs a backport - state this here
If a backport is not needed please provide the reason why.
If the "Backports" section is not present it will lead to a CI test
failure.
-->

---------

Co-authored-by: michalChrobot <[email protected]>
Co-authored-by: Noel Stephens <[email protected]>
Co-authored-by: Michał Chrobot <[email protected]>

Author: 3 people

.yamato/wrench/recipe-regeneration.yml

@@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
+  - command: dotnet run --project Tools/CI/NGO.Cookbook.csproj
   - command: |-
       if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
         git status
         echo "Your repo is not clean - diff output:"
         git diff
         echo "You must run recipe generation after updating recipes to update the generated YAML!"
-        echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
+        echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
         exit 1
       fi
   variables:

.yamato/wrench/validation-jobs.yml

@@ -33,5 +33,5 @@
   "branch_pattern": "ReleaseSlash",
   "wrench_version": "0.12.2.0",
   "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
-  "cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
+  "cs_project_path": "Tools/CI/NGO.Cookbook.csproj"
 }

.yamato/wrench/wrench_config.json

@@ -12,7 +12,7 @@ public class NGOSettings : AnnotatedSettingsBase
     static ValidationOptions validationOptions = new ValidationOptions()
     {
         ProjectPath = "testproject",
-        UtrTestingYamatoTimeout = 40
+        UtrTestingYamatoTimeout = 180 // 3h This it to address the issue that we are running both package and project test and that their execution is much slower on editors below 6000
     };
 
     // update this to list all packages in this repo that you want to release.

Tools/CI/Settings/NGOSettings.cs

@@ -10,12 +10,15 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Added
 
+### Added
+
 ### Fixed
 
 - Fixed issue where NetworkConfig.ConnectionData could cause the ConnectionRequestMessage to exceed the transport's MTU size and would result in a buffer overflow error. (#3565)
 
 ### Changed
 
+
 ## [1.14.0] - 2025-07-21
 
 ### Added

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -95,7 +95,8 @@ public unsafe void Send(ulong clientId, NetworkDelivery delivery, FastBufferWrit
                             for (int i = 0; i < 4; i++)
                             {
                                 var currentByte = batchData.GetUnsafePtr()[i];
-                                batchData.WriteByteSafe((byte)(currentByte == 0 ? 1 : 0));
+                                currentByte = (byte)((currentByte + 1) % 255);
+                                batchData.WriteByteSafe(currentByte);
                                 MessageQueue.Add(batchData.ToArray());
                             }
                             break;

com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageCorruptionTests.cs

@@ -55,20 +55,28 @@ protected override void OnServerAndClientsCreated()
             base.OnServerAndClientsCreated();
         }
 
+        private MessageCatcher<ConnectionRequestMessage> m_ConnectionRequestCatcher;
+        private MessageCatcher<ConnectionApprovedMessage> m_ConnectionApprovedCatcher;
         protected override IEnumerator OnStartedServerAndClients()
         {
+            m_ClientStopped = false;
+            m_ServerStopped = false;
+            m_ClientNetworkManagers[0].OnClientStopped += OnClientStopped;
+            m_ServerNetworkManager.OnServerStopped += OnServerStopped;
             if (m_ApprovalFailureType == ApprovalTimedOutTypes.ServerDoesNotRespond)
             {
                 // We catch (don't process) the incoming approval message to simulate the server not sending the approved message in time
-                m_ClientNetworkManagers[0].ConnectionManager.MessageManager.Hook(new MessageCatcher<ConnectionApprovedMessage>(m_ClientNetworkManagers[0]));
+                m_ConnectionApprovedCatcher = new MessageCatcher<ConnectionApprovedMessage>(m_ClientNetworkManagers[0], m_EnableVerboseDebug);
+                m_ClientNetworkManagers[0].ConnectionManager.MessageManager.Hook(m_ConnectionApprovedCatcher);
                 m_ExpectedLogMessage = new Regex("Timed out waiting for the server to approve the connection request.");
                 m_LogType = LogType.Log;
             }
             else
             {
                 // We catch (don't process) the incoming connection request message to simulate a transport connection but the client never
                 // sends (or takes too long to send) the connection request.
-                m_ServerNetworkManager.ConnectionManager.MessageManager.Hook(new MessageCatcher<ConnectionRequestMessage>(m_ServerNetworkManager));
+                m_ConnectionRequestCatcher = new MessageCatcher<ConnectionRequestMessage>(m_ServerNetworkManager, m_EnableVerboseDebug);
+                m_ServerNetworkManager.ConnectionManager.MessageManager.Hook(m_ConnectionRequestCatcher);
 
                 // For this test, we know the timed out client will be Client-1
                 m_ExpectedLogMessage = new Regex("Server detected a transport connection from Client-1, but timed out waiting for the connection request message.");
@@ -98,6 +106,43 @@ public IEnumerator ValidateApprovalTimeout()
 
             Assert.AreEqual(0, m_ServerNetworkManager.ConnectionManager.PendingClients.Count, $"Expected no pending clients when there were {m_ServerNetworkManager.ConnectionManager.PendingClients.Count} pending clients!");
             Assert.True(!m_ClientNetworkManagers[0].LocalClient.IsApproved, $"Expected the client to not have been approved, but it was!");
+
+            if (m_ApprovalFailureType == ApprovalTimedOutTypes.ServerDoesNotRespond)
+            {
+                m_ConnectionApprovedCatcher.ClearMessages();
+            }
+            else
+            {
+                m_ConnectionRequestCatcher.ClearMessages();
+            }
+
+            if (!m_ClientStopped)
+            {
+                m_ClientNetworkManagers[0].Shutdown();
+            }
+
+            if (!m_ServerStopped)
+            {
+                m_ServerNetworkManager.Shutdown();
+            }
+
+            yield return WaitForConditionOrTimeOut(() => m_ClientStopped && m_ServerStopped);
+            AssertOnTimeout($"Timed out waiting for the client or server to stop!");
+        }
+
+        private bool m_ClientStopped;
+        private void OnClientStopped(bool obj)
+        {
+            m_ClientNetworkManagers[0].OnClientStopped -= OnClientStopped;
+            m_ClientStopped = true;
         }
+
+        private bool m_ServerStopped;
+        private void OnServerStopped(bool obj)
+        {
+            m_ServerNetworkManager.OnServerStopped -= OnServerStopped;
+            m_ServerStopped = true;
+        }
+
     }
 }

com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApprovalTimeoutTests.cs

@@ -1,14 +1,17 @@
 using System;
 using System.Collections.Generic;
 using Unity.Collections;
+using UnityEngine;
 
 namespace Unity.Netcode.RuntimeTests
 {
     internal class MessageCatcher<TMessageType> : INetworkHooks where TMessageType : INetworkMessage
     {
         private NetworkManager m_OwnerNetworkManager;
 
-        public MessageCatcher(NetworkManager ownerNetworkManager)
+        private bool m_VerboseDebug;
+
+        public MessageCatcher(NetworkManager ownerNetworkManager, bool verboseDebug = false)
         {
             m_OwnerNetworkManager = ownerNetworkManager;
         }
@@ -23,9 +26,38 @@ private struct TriggerData
         }
         private readonly List<TriggerData> m_CaughtMessages = new List<TriggerData>();
 
-        public void ReleaseMessages()
+
+        private void Log(string message)
         {
+            if (!m_VerboseDebug)
+            {
+                return;
+            }
 
+            Debug.Log($"[Client-{m_OwnerNetworkManager.LocalClientId}] {message}");
+        }
+
+        internal void ClearMessages()
+        {
+            if (m_CaughtMessages.Count == 0)
+            {
+                return;
+            }
+            Log($"Clearing messages.");
+            foreach (var caughtSpawn in m_CaughtMessages)
+            {
+                if (caughtSpawn.Reader.IsInitialized)
+                {
+                    Log($"Disposing reader (size: {caughtSpawn.Reader.Length}).");
+                    caughtSpawn.Reader.Dispose();
+                }
+            }
+
+            m_CaughtMessages.Clear();
+        }
+
+        public void ReleaseMessages()
+        {
             foreach (var caughtSpawn in m_CaughtMessages)
             {
                 // Reader will be disposed within HandleMessage

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

@@ -43,6 +43,7 @@ public IEnumerator Cleanup()
 
                 // Need to destroy the GameObject (all assigned components will get destroyed too)
                 UnityEngine.Object.DestroyImmediate(m_Server.gameObject);
+                m_Server = null;
             }
 
             if (m_Client1)
@@ -51,6 +52,7 @@ public IEnumerator Cleanup()
 
                 // Need to destroy the GameObject (all assigned components will get destroyed too)
                 UnityEngine.Object.DestroyImmediate(m_Client1.gameObject);
+                m_Client1 = null;
             }
 
             if (m_Client2)
@@ -59,6 +61,7 @@ public IEnumerator Cleanup()
 
                 // Need to destroy the GameObject (all assigned components will get destroyed too)
                 UnityEngine.Object.DestroyImmediate(m_Client2.gameObject);
+                m_Client2 = null;
             }
 
             m_ServerEvents?.Clear();
@@ -315,7 +318,7 @@ public IEnumerator DisconnectOnReliableSendQueueOverflow()
             m_Server.StartServer();
             m_Client1.StartClient();
 
-            yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
+            yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events, 5.0f);
 
             m_Server.Shutdown();