Unity-Technologies · NoelStephensUnity · May 18, 2023 · May 24, 2023 · Dec 7, 2025 · Dec 7, 2025
@@ -6,6 +6,7 @@ on:
     branches:
     - develop
     - develop-2.0.0
+    - develop-3.x.x
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"

@@ -58,6 +58,7 @@ pr_minimal_required_checks:
       (pull_request.comment eq "ngo" OR
       (pull_request.target eq "develop" OR
       pull_request.target eq "develop-2.0.0" OR
+      pull_request.target eq "develop-3.x.x" OR
       pull_request.target match "release/*")) AND
       NOT pull_request.draft
     cancel_old_ci: true
@@ -94,6 +95,7 @@ pr_code_changes_checks:
       (pull_request.comment eq "ngo" OR
       (pull_request.target eq "develop" OR
       pull_request.target eq "develop-2.0.0" OR
+      pull_request.target eq "develop-3.x.x" OR
       pull_request.target match "release/*")) AND
       NOT pull_request.draft AND
       pull_request.changes.any match [

@@ -2,6 +2,9 @@
 
 #if UNITY_INCLUDE_TESTS
 #if UNITY_EDITOR
+[assembly: InternalsVisibleTo("Unity.Netcode.GameObjects.Editor.Tests")]
+[assembly: InternalsVisibleTo("Unity.Netcode.GameObjects.EditorTests")]
+[assembly: InternalsVisibleTo("Unity.Netcode.GameObjects.Editor")]
 [assembly: InternalsVisibleTo("Unity.Netcode.Editor.Tests")]
 [assembly: InternalsVisibleTo("TestProject.Runtime.Tests")]
 #endif // UNITY_EDITOR

@@ -12,7 +12,7 @@
 using UnityEngine;
 using Object = System.Object;
 
-namespace Unity.Netcode.Editor.CodeGen
+namespace Unity.Netcode.GameObjects.Editor.CodeGen
 {
     internal static class CodeGenHelpers
     {

@@ -11,7 +11,7 @@
 using ILPPInterface = Unity.CompilationPipeline.Common.ILPostProcessing.ILPostProcessor;
 using MethodAttributes = Mono.Cecil.MethodAttributes;
 
-namespace Unity.Netcode.Editor.CodeGen
+namespace Unity.Netcode.GameObjects.Editor.CodeGen
 {
     internal sealed class INetworkMessageILPP : ILPPInterface
     {

@@ -8,7 +8,7 @@
 using Unity.CompilationPipeline.Common.ILPostProcessing;
 using ILPPInterface = Unity.CompilationPipeline.Common.ILPostProcessing.ILPostProcessor;
 
-namespace Unity.Netcode.Editor.CodeGen
+namespace Unity.Netcode.GameObjects.Editor.CodeGen
 {
     internal sealed class INetworkSerializableILPP : ILPPInterface
     {

@@ -16,7 +16,7 @@
 using MethodAttributes = Mono.Cecil.MethodAttributes;
 using ParameterAttributes = Mono.Cecil.ParameterAttributes;
 
-namespace Unity.Netcode.Editor.CodeGen
+namespace Unity.Netcode.GameObjects.Editor.CodeGen
 {
     internal sealed class NetworkBehaviourILPP : ILPPInterface
     {

@@ -6,7 +6,7 @@
 using Mono.Cecil;
 using Unity.CompilationPipeline.Common.ILPostProcessing;
 
-namespace Unity.Netcode.Editor.CodeGen
+namespace Unity.Netcode.GameObjects.Editor.CodeGen
 {
     internal class PostProcessorAssemblyResolver : IAssemblyResolver
     {

@@ -2,7 +2,7 @@
 using System.Reflection;
 using Mono.Cecil;
 
-namespace Unity.Netcode.Editor.CodeGen
+namespace Unity.Netcode.GameObjects.Editor.CodeGen
 {
     internal class PostProcessorReflectionImporter : DefaultReflectionImporter
     {

@@ -1,6 +1,6 @@
 using Mono.Cecil;
 
-namespace Unity.Netcode.Editor.CodeGen
+namespace Unity.Netcode.GameObjects.Editor.CodeGen
 {
     internal class PostProcessorReflectionImporterProvider : IReflectionImporterProvider
     {

@@ -7,7 +7,7 @@
 using Unity.CompilationPipeline.Common.ILPostProcessing;
 using ILPPInterface = Unity.CompilationPipeline.Common.ILPostProcessing.ILPostProcessor;
 
-namespace Unity.Netcode.Editor.CodeGen
+namespace Unity.Netcode.GameObjects.Editor.CodeGen
 {
     internal sealed class RuntimeAccessModifiersILPP : ILPPInterface
     {

@@ -1,6 +1,6 @@
 {
-    "name": "Unity.Netcode.Editor.CodeGen",
-    "rootNamespace": "Unity.Netcode.Editor.CodeGen",
+    "name": "Unity.Netcode.GameObjects.Editor.CodeGen",
+    "rootNamespace": "Unity.Netcode.GameObjects.Editor.CodeGen",
     "references": [
         "Unity.Netcode.Runtime",
         "Unity.Collections"

@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Netcode.Editor.Configuration
+namespace Unity.Netcode.GameObjects.Editor.Configuration
 {
     /// <summary>
     /// A <see cref="ScriptableSingleton{T}"/> of type <see cref="NetcodeForGameObjectsProjectSettings"/>.

@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace Unity.Netcode.Editor.Configuration
+namespace Unity.Netcode.GameObjects.Editor.Configuration
 {
     internal class NetcodeForGameObjectsEditorSettings
     {

@@ -5,7 +5,7 @@
 using Directory = UnityEngine.Windows.Directory;
 using File = UnityEngine.Windows.File;
 
-namespace Unity.Netcode.Editor.Configuration
+namespace Unity.Netcode.GameObjects.Editor.Configuration
 {
     internal static class NetcodeSettingsProvider
     {

@@ -2,7 +2,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Netcode.Editor.Configuration
+namespace Unity.Netcode.GameObjects.Editor.Configuration
 {
     /// <summary>
     /// Updates the default <see cref="NetworkPrefabsList"/> instance when prefabs are updated (created, moved, deleted) in the project.

@@ -2,7 +2,7 @@
 using UnityEditorInternal;
 using UnityEngine;
 
-namespace Unity.Netcode.Editor
+namespace Unity.Netcode.GameObjects.Editor
 {
     /// <summary>
     /// The custom editor for the <see cref="NetworkPrefabsList"/> <see cref="ScriptableObject"/>.

@@ -5,7 +5,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Netcode.Editor
+namespace Unity.Netcode.GameObjects.Editor
 {
     /// <summary>
     /// Internal use. Hides the script field for the given component.

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Unity.Netcode.Editor.Configuration;
+using Unity.Netcode.GameObjects.Editor.Configuration;
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Netcode.Editor
+namespace Unity.Netcode.GameObjects.Editor
 {
     /// <summary>
     /// The <see cref="CustomEditor"/> for <see cref="NetworkBehaviour"/>
@@ -321,20 +321,6 @@ private void OnEnable()
             CheckForNetworkObject((target as NetworkBehaviour).gameObject);
         }
 
-        /// <summary>
-        /// Recursively finds the root parent of a <see cref="Transform"/>
-        /// </summary>
-        /// <param name="transform">The current <see cref="Transform"/> we are inspecting for a parent</param>
-        /// <returns>the root parent for the first <see cref="Transform"/> passed into the method</returns>
-        public static Transform GetRootParentTransform(Transform transform)
-        {
-            if (transform.parent == null || transform.parent == transform)
-            {
-                return transform;
-            }
-            return GetRootParentTransform(transform.parent);
-        }
-
         /// <summary>
         /// Used to determine if a GameObject has one or more NetworkBehaviours but
         /// does not already have a NetworkObject component.  If not it will notify
@@ -358,7 +344,7 @@ public static void CheckForNetworkObject(GameObject gameObject, bool networkObje
             }
 
             // Now get the root parent transform to the current GameObject (or itself)
-            var rootTransform = GetRootParentTransform(gameObject.transform);
+            var rootTransform = gameObject.transform.root;
             if (!rootTransform.TryGetComponent<NetworkManager>(out var networkManager))
             {
                 networkManager = rootTransform.GetComponentInChildren<NetworkManager>();

@@ -2,15 +2,16 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Unity.Netcode.Editor.Configuration;
+using Unity.Netcode.Editor;
+using Unity.Netcode.GameObjects.Editor.Configuration;
 using Unity.Netcode.Logging;
 using UnityEditor;
 using UnityEngine;
 #if UNITY_6000_5_OR_NEWER
 using UnityEngine.Assemblies;
 #endif
 
-namespace Unity.Netcode.Editor
+namespace Unity.Netcode.GameObjects.Editor
 {
     /// <summary>
     /// This <see cref="CustomEditor"/> handles the translation between the <see cref="NetworkConfig"/> and

@@ -1,12 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
-using Unity.Netcode.Editor.Configuration;
+using Unity.Netcode.Editor;
+using Unity.Netcode.GameObjects.Editor.Configuration;
 using Unity.Netcode.Logging;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-namespace Unity.Netcode.Editor
+namespace Unity.Netcode.GameObjects.Editor
 {
 #if UNITY_EDITOR
     /// <summary>