Merge branch 'develop-2.0.0' into chore/remove-spawn-state-exceptions-network-object

# Conflicts:
#	com.unity.netcode.gameobjects/CHANGELOG.md

Author: noellie-velez

Tools/scripts/ReleaseAutomation/release_config.py

@@ -98,16 +98,16 @@ def __init__(self):
 
         self.yamato_build_automation_configs = [
             {
-                "job_name": "Build Sample for Windows with minimal supported editor (2022.3), burst ON, IL2CPP",
+                "job_name": "Build Sample for Windows with minimal supported editor (6000.0), burst ON, IL2CPP",
                 "variables": [
                     { "key": "BURST_ON_OFF", "value": "on" },
                     { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" },
                     { "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
-                    { "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
+                    { "key": "UNITY_VERSION", "value": "6000.0" } # Minimal supported editor
                 ]
             },
             {
-                "job_name": "Build Sample for Windows with latest functional editor (6000.2), burst ON, IL2CPP",
+                "job_name": "Build Sample for Windows with latest functional editor (6000.3), burst ON, IL2CPP",
                 "variables": [
                     { "key": "BURST_ON_OFF", "value": "on" },
                     { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" },
@@ -125,16 +125,16 @@ def __init__(self):
                 ]
             },
             {
-                "job_name": "Build Sample for MacOS with minimal supported editor (2022.3), burst OFF, Mono",
+                "job_name": "Build Sample for MacOS with minimal supported editor (6000.0), burst OFF, Mono",
                 "variables": [
                     { "key": "BURST_ON_OFF", "value": "off" },
                     { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "mac" },
                     { "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "mono" },
-                    { "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
+                    { "key": "UNITY_VERSION", "value": "6000.0" } # Minimal supported editor
                 ]
             },
             {
-                "job_name": "Build Sample for MacOS with latest functional editor (6000.2), burst OFF, Mono",
+                "job_name": "Build Sample for MacOS with latest functional editor (6000.3), burst OFF, Mono",
                 "variables": [
                     { "key": "BURST_ON_OFF", "value": "off" },
                     { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "mac" },
@@ -152,16 +152,16 @@ def __init__(self):
                 ]
             },
             {
-                "job_name": "Build Sample for Android with minimal supported editor (2022.3), burst ON, IL2CPP",
+                "job_name": "Build Sample for Android with minimal supported editor (6000.0), burst ON, IL2CPP",
                 "variables": [
                     { "key": "BURST_ON_OFF", "value": "on" },
                     { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "android" },
                     { "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
-                    { "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
+                    { "key": "UNITY_VERSION", "value": "6000.0" } # Minimal supported editor
                 ]
             },
             {
-                "job_name": "Build Sample for Android with latest functional editor (6000.2), burst ON, IL2CPP",
+                "job_name": "Build Sample for Android with latest functional editor (6000.3), burst ON, IL2CPP",
                 "variables": [
                     { "key": "BURST_ON_OFF", "value": "on" },
                     { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "android" },

Tools/scripts/Utils/triggerYamatoJobsForReleasePreparation.py

@@ -75,12 +75,12 @@ def trigger_automated_builds_job_on_yamato(yamato_api_token, project_id, branch_
 
     build_automation_configs = [
         {
-            "job_name": "Build Sample for Windows with minimal supported editor (2022.3), burst ON, IL2CPP",
+            "job_name": "Build Sample for Windows with latest supported editor (6000.3), burst ON, IL2CPP",
             "variables": [
                 { "key": "BURST_ON_OFF", "value": "on" },
                 { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" },
                 { "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
-                { "key": "UNITY_VERSION", "value": "2022.3" }
+                { "key": "UNITY_VERSION", "value": "6000.3" }
             ]
         }
     ]
@@ -125,7 +125,8 @@ def trigger_release_preparation_jobs(config: ReleaseConfig):
     try:
         revision_sha = get_latest_git_revision(config.release_branch_name)
 
-        trigger_wrench_promotion_job_on_yamato(config.yamato_api_token, config.yamato_project_id, config.release_branch_name, revision_sha)
+        # We don't need to trigger promotion job to run the tests for the release branch since those are being triggered automatically on release/ prefixed branches
+        #trigger_wrench_promotion_job_on_yamato(config.yamato_api_token, config.yamato_project_id, config.release_branch_name, revision_sha)
         trigger_automated_builds_job_on_yamato(config.yamato_api_token, config.yamato_project_id, config.release_branch_name, revision_sha, config.yamato_samples_to_build, config.yamato_build_automation_configs)
 
     except Exception as e:

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -23,14 +23,15 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
-- Fixed `NetworkShow` behavior when it is called twice. (#3867)
+- Fixed issue where an attachable could log an error upon being de-spawned during shutdown. (#3895)
 - NestedNetworkVariables initialized with no value no longer throw an error. (#3891)
+- Fixed `NetworkShow` behavior when it is called twice. (#3867)
 
 ### Security
 
 
 ### Obsolete
-- `NotListeningException` is now marked as obsolete as it is not used internally anymore. (#3867)
+- `NotListeningException` is now marked as obsolete as it is no longer used internally. (#3867)
 
 ## [2.10.0] - 2026-03-01
 

com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs

@@ -278,7 +278,7 @@ internal void ForceDetach()
         /// <inheritdoc/>
         public override void OnNetworkPreDespawn()
         {
-            if (AutoDetach.HasFlag(AutoDetachTypes.OnDespawn))
+            if (NetworkManager.ShutdownInProgress || AutoDetach.HasFlag(AutoDetachTypes.OnDespawn))
             {
                 ForceDetach();
             }
@@ -474,10 +474,11 @@ internal void InternalDetach()
         /// </summary>
         public void Detach()
         {
-            if (!gameObject)
+            if (!gameObject || NetworkObject == null || NetworkManager == null || NetworkManager.ShutdownInProgress)
             {
                 return;
             }
+
             if (!IsSpawned)
             {
                 NetworkLog.LogError($"[{name}][Detach][Not Spawned] Cannot detach if not spawned!");

com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectNetworkClientOwnedObjectsTests.cs

@@ -75,7 +75,7 @@ public IEnumerator WhenOwnershipIsChanged_OwnershipValuesUpdateCorrectly()
             Assert.IsFalse(serverBehaviour.IsOwnedByServer);
             Assert.AreEqual(m_ClientNetworkManagers[0].LocalClientId, serverBehaviour.OwnerClientId);
 
-            var clientObject = FindObjects.ByType<NetworkObject>(orderByIdentifier: true).Where((obj) => obj.NetworkManagerOwner == m_ClientNetworkManagers[0]).FirstOrDefault();
+            var clientObject = m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects.ContainsKey(serverObject.NetworkObjectId) ? m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[serverObject.NetworkObjectId] : null;
 
             Assert.IsNotNull(clientObject);
             Assert.IsTrue(clientObject.IsOwner);