Merge branch 'develop-2.0.0' into chore/update-ownership-documentation

Author: EmandM

.github/ISSUE_TEMPLATE/feature_request.md

@@ -75,20 +75,20 @@ pr_code_changes_checks:
     # Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
     - .yamato/vetting-test.yml#vetting_test
 
-    # Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.0)
-    - .yamato/package-tests.yml#package_test_-_ngo_trunk_mac
+    # Run package EditMode and Playmode package tests on 6000.5 and an older supported editor (6000.0)
+    - .yamato/package-tests.yml#package_test_-_ngo_6000.5_mac
     - .yamato/package-tests.yml#package_test_-_ngo_6000.0_win
 
-    # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.0)
-    - .yamato/project-tests.yml#test_testproject_win_trunk
+    # Run testproject EditMode and Playmode project tests on 6000.5 and an older supported editor (6000.0)
+    - .yamato/project-tests.yml#test_testproject_win_6000.5
     - .yamato/project-tests.yml#test_testproject_mac_6000.0
 
     # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
     # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
     # desktop_standalone_test and cmb_service_standalone_test are both reusing desktop_standalone_build dependency so we run those in the same configuration on PRs to reduce waiting time.
-    # Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
-    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
-    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
+    # Note that our daily tests will anyway run both test configurations in "minimal supported" and "6000.5" configurations
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.5
+    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.5
   triggers:
     expression: |-
       (pull_request.comment eq "ngo" OR

.yamato/_triggers.yml

@@ -181,6 +181,7 @@ validation_editors:
         - 6000.0
         - 6000.3
         - 6000.4
+        - 6000.5
         - trunk
     minimal:
         - 6000.0

.yamato/project.metafile

@@ -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/ReleaseAutomation/release_config.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:

Tools/scripts/Utils/triggerYamatoJobsForReleasePreparation.py

@@ -10,6 +10,8 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Added
 
+- Added a `WebSocketPath` field to `UnityTransport.ConnectionData` (which also shows up in the inspector if "Use WebSockets" is checked) that controls the path clients will connect to and servers/hosts will listen on when using WebSockets. (#3901)
+- `NetworkTransport.EarlyUpdate` and `NetworkTransport.PostLateUpdate` are now public. For the vast majority of users, there's really no point in ever calling those methods directly (the `NetworkManager` handles it). It's only useful if wrapping transports outside of NGO. (#3890)
 
 ### Changed
 
@@ -18,16 +20,19 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 
 ### Removed
-
+- Removed un-needed exceptions on `NetworkObject.cs`. (#3867)
 
 ### Fixed
 
+- 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 no longer used internally. (#3867)
 
 ## [2.10.0] - 2026-03-01
 

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -42,6 +42,7 @@ public class UnityTransportEditor : HiddenScriptEditor
 
         private SerializedProperty m_ServerAddressProperty;
         private SerializedProperty m_ServerPortProperty;
+        private SerializedProperty m_WebSocketPathProperty;
 
         private const string k_LoopbackIpv4 = "127.0.0.1";
         private const string k_LoopbackIpv6 = "::1";
@@ -62,6 +63,7 @@ private void Initialize()
 
             m_ServerAddressProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.Address));
             m_ServerPortProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.Port));
+            m_WebSocketPathProperty = connectionDataProperty.FindPropertyRelative(nameof(UnityTransport.ConnectionAddressData.WebSocketPath));
         }
 
         /// <summary>
@@ -79,6 +81,11 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(m_ServerAddressProperty);
             EditorGUILayout.PropertyField(m_ServerPortProperty);
 
+            if (m_UnityTransport.UseWebSockets)
+            {
+                EditorGUILayout.PropertyField(m_WebSocketPathProperty);
+            }
+
             serializedObject.ApplyModifiedProperties();
 
             EditorGUILayout.HelpBox("It's recommended to leave remote connections disabled for local testing to avoid exposing ports on your device.", MessageType.Info);