update - wip

This is a "still messy" version that is working but needs more thought on the namespace collision fixes.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Editor/AssemblyInfo.cs

@@ -2,7 +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

com.unity.netcode.gameobjects/Editor/Configuration/NetcodeSettingsProvider.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using Unity.Netcode.Editor.Configuration;
 using UnityEditor;
 using UnityEngine;
 using Directory = UnityEngine.Windows.Directory;

com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabProcessor.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Unity.Netcode.Editor.Configuration;
 using UnityEditor;
 using UnityEngine;
 

com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Unity.Netcode.Editor;
 using Unity.Netcode.GameObjects.Editor.Configuration;
 using UnityEditor;
 using UnityEngine;

com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Netcode.Editor;
+using Unity.Netcode.Editor.Configuration;
 using Unity.Netcode.GameObjects.Editor.Configuration;
 using UnityEditor;
 using UnityEngine;

com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs

@@ -1,4 +1,5 @@
 using Unity.Netcode.Components;
+using Unity.Netcode.Editor;
 using UnityEditor;
 using UnityEngine;
 

com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs

@@ -14,7 +14,7 @@
 [assembly: InternalsVisibleTo("Unity.Netcode.TestHelpers.Runtime")]
 [assembly: InternalsVisibleTo("TestProject.Runtime.Tests")]
 #if UNITY_EDITOR
-[assembly: InternalsVisibleTo("Unity.Netcode.GameObjects.EditorTests")]
+[assembly: InternalsVisibleTo("Unity.Netcode.GameObjects.Editor.Tests")]
 [assembly: InternalsVisibleTo("TestProject.EditorTests")]
 [assembly: InternalsVisibleTo("Unity.Netcode.Editor.Tests")]
 [assembly: InternalsVisibleTo("TestProject.Editor.Tests")]

com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 using NUnit.Framework;
-using Unity.Netcode.Editor;
+using Unity.Netcode.GameObjects.Editor;
 using UnityEngine;
 using UnityEngine.TestTools;
 

com.unity.netcode.gameobjects/Tests/Editor/NetworkPrefabProcessorTests.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using Unity.Netcode.Editor.Configuration;
 using Unity.Netcode.GameObjects.Editor.Configuration;
 using UnityEditor;
 using UnityEngine;

com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef

@@ -1,5 +1,5 @@
 {
-    "name": "Unity.Netcode.Editor.Tests",
+    "name": "Unity.Netcode.GameObjects.Editor.Tests",
     "rootNamespace": "Unity.Netcode.GameObjects.EditorTests",
     "references": [
         "Unity.Collections",
@@ -13,7 +13,8 @@
         "Unity.Mathematics",
         "UnityEngine.TestRunner",
         "UnityEditor.TestRunner",
-        "Unity.Netcode.Runtime.Tests"
+        "Unity.Netcode.Runtime.Tests",
+        "Unity.Netcode.GameObjects.Editor"
     ],
     "includePlatforms": [
         "Editor"
@@ -45,9 +46,9 @@
             "define": "SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION"
         },
         {
-          "name": "Unity",
-          "expression": "6000.5.0a1",
-          "define": "SCENE_MANAGEMENT_SCENE_HANDLE_MUST_USE_ULONG"
+            "name": "Unity",
+            "expression": "6000.5.0a1",
+            "define": "SCENE_MANAGEMENT_SCENE_HANDLE_MUST_USE_ULONG"
         }
     ],
     "noEngineReferences": false