chore!: per-asmdef namespaces instead of per-folder

com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs

@@ -3,9 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using Unity.Multiplayer.Netcode.Hashing;
-using Unity.Multiplayer.Netcode.Messaging;
-using Unity.Multiplayer.Netcode.Serialization;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Cecil.Rocks;

com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs

@@ -3,9 +3,6 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Reflection;
-using Unity.Multiplayer.Netcode.Logging;
-using Unity.Multiplayer.Netcode.Messaging;
-using Unity.Multiplayer.Netcode.Serialization;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Cecil.Rocks;

com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs

@@ -52,7 +52,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)
                         case nameof(NetworkBehaviour):
                             ProcessNetworkBehaviour(typeDefinition);
                             break;
-                        case nameof(Messaging.__RpcParams):
+                        case nameof(__RpcParams):
                             typeDefinition.IsPublic = true;
                             break;
                     }

com.unity.multiplayer.mlapi/Editor/CodeGen/Unity.Multiplayer.MLAPI.Editor.CodeGen.asmdef

@@ -1,23 +1,19 @@
 {
-	"name": "Unity.Multiplayer.MLAPI.Editor.CodeGen",
-	"rootNamespace": "",
-	"references": [
-		"Unity.Multiplayer.MLAPI.Runtime"
-	],
-	"includePlatforms": [
-		"Editor"
-	],
-	"excludePlatforms": [],
-	"allowUnsafeCode": true,
-	"overrideReferences": true,
-	"precompiledReferences": [
-		"Mono.Cecil.dll",
-		"Mono.Cecil.Mdb.dll",
-		"Mono.Cecil.Pdb.dll",
-		"Mono.Cecil.Rocks.dll"
-	],
-	"autoReferenced": false,
-	"defineConstraints": [],
-	"versionDefines": [],
-	"noEngineReferences": false
+    "name": "Unity.Multiplayer.MLAPI.Editor.CodeGen",
+    "rootNamespace": "Unity.Multiplayer.Netcode.Editor.CodeGen",
+    "references": [
+        "Unity.Multiplayer.MLAPI.Runtime"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "allowUnsafeCode": true,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "Mono.Cecil.dll",
+        "Mono.Cecil.Mdb.dll",
+        "Mono.Cecil.Pdb.dll",
+        "Mono.Cecil.Rocks.dll"
+    ],
+	"autoReferenced": false
 }

com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs

@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
-using Unity.Multiplayer.Netcode.Profiling;
-using Unity.Multiplayer.Netcode.Serialization;
+using UnityEditor;
 using UnityEngine;
 
-namespace UnityEditor
+namespace Unity.Multiplayer.Netcode.Editor
 {
     public class MLAPIProfiler : EditorWindow
     {

com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Unity.Multiplayer.Netcode.Profiling;
 using Unity.Profiling;
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Multiplayer.Netcode
+namespace Unity.Multiplayer.Netcode.Editor
 {
     [InitializeOnLoad]
     internal static class MLAPIProfilerModule

com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Unity.Multiplayer.Netcode;
-using Unity.Multiplayer.Netcode.NetworkVariable;
 using UnityEngine;
+using UnityEditor;
 
-namespace UnityEditor
+namespace Unity.Multiplayer.Netcode.Editor
 {
     [CustomEditor(typeof(NetworkBehaviour), true)]
     [CanEditMultipleObjects]
-    public class NetworkBehaviourEditor : Editor
+    public class NetworkBehaviourEditor : UnityEditor.Editor
     {
         private bool m_Initialized;
         private readonly List<string> m_NetworkVariableNames = new List<string>();

com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs

@@ -3,8 +3,6 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEditorInternal;
-using Unity.Multiplayer.Netcode.Configuration;
-using Unity.Multiplayer.Netcode.Transports;
 
 namespace Unity.Multiplayer.Netcode.Editor
 {

com.unity.multiplayer.mlapi/Editor/com.unity.multiplayer.mlapi.editor.asmdef

@@ -1,19 +1,11 @@
 {
     "name": "Unity.Multiplayer.MLAPI.Editor",
-    "rootNamespace": "",
+    "rootNamespace": "Unity.Multiplayer.Netcode.Editor",
     "references": [
         "Unity.Multiplayer.MLAPI.Runtime",
         "Unity.Multiplayer.MLAPI.Prototyping"
     ],
     "includePlatforms": [
         "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": false,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
+    ]
 }

com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs

@@ -1,7 +1,5 @@
 using System.Linq;
 using System.Collections.Generic;
-using Unity.Multiplayer.Netcode.Messaging;
-using Unity.Multiplayer.Netcode.Serialization;
 using UnityEngine;
 
 namespace Unity.Multiplayer.Netcode.Prototyping

com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.AI;
-using Unity.Multiplayer.Netcode.Connection;
-using Unity.Multiplayer.Netcode.Messaging;
 
 namespace Unity.Multiplayer.Netcode.Prototyping
 {

com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs

@@ -1,7 +1,4 @@
 using System;
-using Unity.Multiplayer.Netcode.NetworkVariable;
-using Unity.Multiplayer.Netcode.Serialization;
-using Unity.Multiplayer.Netcode.Transports;
 using UnityEngine;
 
 namespace Unity.Multiplayer.Netcode.Prototyping

com.unity.multiplayer.mlapi/Prototyping/com.unity.multiplayer.mlapi.prototyping.asmdef

@@ -1,9 +1,7 @@
 {
     "name": "Unity.Multiplayer.MLAPI.Prototyping",
-    "rootNamespace": "MLAPI.Prototyping",
+    "rootNamespace": "Unity.Multiplayer.Netcode.Prototyping",
     "references": [
         "Unity.Multiplayer.MLAPI.Runtime"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": []
+    ]
 }

com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.Multiplayer.Netcode.Collections
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// Queue with a fixed size

com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs

@@ -1,4 +1,4 @@
-namespace Unity.Multiplayer.Netcode.Configuration
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// Represents the length of a var int encoded hash

com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs

@@ -2,12 +2,8 @@
 using System.Collections.Generic;
 using UnityEngine;
 using System.Linq;
-using Unity.Multiplayer.Netcode.Transports;
-using Unity.Multiplayer.Netcode.Hashing;
-using Unity.Multiplayer.Netcode.Serialization;
-using Unity.Multiplayer.Netcode.Serialization.Pooled;
 
-namespace Unity.Multiplayer.Netcode.Configuration
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// The configuration object used to start server, client and hosts

com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs

@@ -1,4 +1,4 @@
-namespace Unity.Multiplayer.Netcode.Configuration
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// A static class containing MLAPI constants

com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace Unity.Multiplayer.Netcode.Configuration
+namespace Unity.Multiplayer.Netcode
 {
     internal enum NetworkPrefabOverride
     {

com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Unity.Multiplayer.Netcode.Connection
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// A NetworkClient

com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs

@@ -1,4 +1,4 @@
-namespace Unity.Multiplayer.Netcode.Connection
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// A class representing a client that is currently in the process of connecting

com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs

@@ -4,14 +4,6 @@
 using System.Reflection;
 using System.Linq;
 using System.IO;
-using Unity.Multiplayer.Netcode.Logging;
-using Unity.Multiplayer.Netcode.Messaging;
-using Unity.Multiplayer.Netcode.NetworkVariable;
-using Unity.Multiplayer.Netcode.Profiling;
-using Unity.Multiplayer.Netcode.Reflection;
-using Unity.Multiplayer.Netcode.Serialization;
-using Unity.Multiplayer.Netcode.Serialization.Pooled;
-using Unity.Multiplayer.Netcode.Transports;
 
 namespace Unity.Multiplayer.Netcode
 {
@@ -633,7 +625,7 @@ internal static void HandleNetworkVariableDeltas(List<INetworkVariable> networkV
                         {
                             if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                             {
-                                NetworkLog.LogWarning($"Client wrote to {nameof(NetworkVariable)} without permission. => {(logInstance != null ? ($"{nameof(NetworkObjectId)}: {logInstance.NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {logInstance.NetworkObject.GetNetworkBehaviourOrderIndex(logInstance)} - VariableIndex: {i}") : string.Empty)}");
+                                NetworkLog.LogWarning($"Client wrote to {typeof(NetworkVariable<>).Name} without permission. => {(logInstance != null ? ($"{nameof(NetworkObjectId)}: {logInstance.NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {logInstance.NetworkObject.GetNetworkBehaviourOrderIndex(logInstance)} - VariableIndex: {i}") : string.Empty)}");
                                 NetworkLog.LogError($"[{networkVariableList[i].GetType().Name}]");
                             }
 
@@ -651,7 +643,7 @@ internal static void HandleNetworkVariableDeltas(List<INetworkVariable> networkV
 
                         if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
                         {
-                            NetworkLog.LogError($"Client wrote to {nameof(NetworkVariable)} without permission. No more variables can be read. This is critical. => {(logInstance != null ? ($"{nameof(NetworkObjectId)}: {logInstance.NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {logInstance.NetworkObject.GetNetworkBehaviourOrderIndex(logInstance)} - VariableIndex: {i}") : string.Empty)}");
+                            NetworkLog.LogError($"Client wrote to {typeof(NetworkVariable<>).Name} without permission. No more variables can be read. This is critical. => {(logInstance != null ? ($"{nameof(NetworkObjectId)}: {logInstance.NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {logInstance.NetworkObject.GetNetworkBehaviourOrderIndex(logInstance)} - VariableIndex: {i}") : string.Empty)}");
                             NetworkLog.LogError($"[{networkVariableList[i].GetType().Name}]");
                         }
 
@@ -723,7 +715,7 @@ internal static void HandleNetworkVariableUpdate(List<INetworkVariable> networkV
                         {
                             if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                             {
-                                NetworkLog.LogWarning($"Client wrote to {nameof(NetworkVariable)} without permission. => {(logInstance != null ? ($"{nameof(NetworkObjectId)}: {logInstance.NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {logInstance.NetworkObject.GetNetworkBehaviourOrderIndex(logInstance)} - VariableIndex: {i}") : string.Empty)}");
+                                NetworkLog.LogWarning($"Client wrote to {typeof(NetworkVariable<>).Name} without permission. => {(logInstance != null ? ($"{nameof(NetworkObjectId)}: {logInstance.NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {logInstance.NetworkObject.GetNetworkBehaviourOrderIndex(logInstance)} - VariableIndex: {i}") : string.Empty)}");
                             }
 
                             stream.Position += varSize;
@@ -739,7 +731,7 @@ internal static void HandleNetworkVariableUpdate(List<INetworkVariable> networkV
                         // - TwoTen
                         if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
                         {
-                            NetworkLog.LogError($"Client wrote to {nameof(NetworkVariable)} without permission. No more variables can be read. This is critical. => {(logInstance != null ? ($"{nameof(NetworkObjectId)}: {logInstance.NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {logInstance.NetworkObject.GetNetworkBehaviourOrderIndex(logInstance)} - VariableIndex: {i}") : string.Empty)}");
+                            NetworkLog.LogError($"Client wrote to {typeof(NetworkVariable<>).Name} without permission. No more variables can be read. This is critical. => {(logInstance != null ? ($"{nameof(NetworkObjectId)}: {logInstance.NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {logInstance.NetworkObject.GetNetworkBehaviourOrderIndex(logInstance)} - VariableIndex: {i}") : string.Empty)}");
                         }
 
                         return;

com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs

@@ -3,19 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using Unity.Multiplayer.Netcode.Logging;
-using Unity.Multiplayer.Netcode.Configuration;
-using Unity.Multiplayer.Netcode.Profiling;
-using Unity.Multiplayer.Netcode.Serialization;
-using Unity.Multiplayer.Netcode.Transports;
-using Unity.Multiplayer.Netcode.Connection;
-using Unity.Multiplayer.Netcode.Messaging;
-using Unity.Multiplayer.Netcode.SceneManagement;
-using Unity.Multiplayer.Netcode.Spawning;
-using Unity.Multiplayer.Netcode.Exceptions;
-using Unity.Multiplayer.Netcode.Serialization.Pooled;
-using Unity.Multiplayer.Netcode.Transports.Tasks;
-using Unity.Multiplayer.Netcode.Timing;
 using Unity.Profiling;
 using Debug = UnityEngine.Debug;
 

com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs

@@ -3,12 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using Unity.Multiplayer.Netcode.Exceptions;
-using Unity.Multiplayer.Netcode.Hashing;
-using Unity.Multiplayer.Netcode.Logging;
-using Unity.Multiplayer.Netcode.Messaging;
-using Unity.Multiplayer.Netcode.Transports;
-using Unity.Multiplayer.Netcode.Serialization;
 using UnityEngine;
 
 namespace Unity.Multiplayer.Netcode

com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs

@@ -1,12 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Unity.Multiplayer.Netcode.Messaging;
-using Unity.Multiplayer.Netcode.NetworkVariable;
-using Unity.Multiplayer.Netcode.Serialization;
-using Unity.Multiplayer.Netcode.Serialization.Pooled;
-using Unity.Multiplayer.Netcode.Timing;
-using Unity.Multiplayer.Netcode.Transports;
 using UnityEngine;
 
 namespace Unity.Multiplayer.Netcode

com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.Multiplayer.Netcode.Exceptions
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// Exception thrown when the new parent candidate of the NetworkObject is not valid

com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.Multiplayer.Netcode.Exceptions
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// Exception thrown when the operation can only be done on the server

com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.Multiplayer.Netcode.Exceptions
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// Exception thrown when the operation require NetworkManager to be listening.

com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.Multiplayer.Netcode.Exceptions
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// Exception thrown when the operation can only be done on the server

com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.Multiplayer.Netcode.Exceptions
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// Exception thrown when an object is not yet spawned

com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.Multiplayer.Netcode.Exceptions
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// Exception thrown when a visibility change fails

com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs

@@ -8,7 +8,7 @@
 using System.Text;
 using System.Runtime.CompilerServices;
 
-namespace Unity.Multiplayer.Netcode.Hashing
+namespace Unity.Multiplayer.Netcode
 {
     /// <summary>
     /// XXHash implementation.