From 117ebc858a7eeb97daec174872fa19a4ff2df2ba Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Wed, 4 Aug 2021 01:20:01 +0100 Subject: [PATCH 1/3] chore!: rename asmdefs, change top-level namespaces --- .editorconfig | 2 +- .../Editor/CodeGen/CodeGenHelpers.cs | 10 ++++---- .../Editor/CodeGen/NetworkBehaviourILPP.cs | 2 +- .../CodeGen/PostProcessorAssemblyResolver.cs | 2 +- .../PostProcessorReflectionImporter.cs | 2 +- ...PostProcessorReflectionImporterProvider.cs | 2 +- .../CodeGen/RuntimeAccessModifiersILPP.cs | 2 +- ...> com.unity.netcode.editor.codegen.asmdef} | 8 +++--- ....unity.netcode.editor.codegen.asmdef.meta} | 0 .../DontShowInTransportDropdownAttribute.cs | 2 +- .../Editor/MLAPIProfiler.cs | 2 +- .../Editor/MLAPIProfilerModule.cs | 2 +- .../Editor/NetworkBehaviourEditor.cs | 2 +- .../Editor/NetworkManagerEditor.cs | 2 +- .../Editor/NetworkObjectEditor.cs | 2 +- .../com.unity.multiplayer.mlapi.editor.asmdef | 11 -------- .../Editor/com.unity.netcode.editor.asmdef | 11 ++++++++ ...a => com.unity.netcode.editor.asmdef.meta} | 0 .../Prototyping/AssemblyInfo.cs | 9 +++---- .../Prototyping/NetworkAnimator.cs | 2 +- .../Prototyping/NetworkNavMeshAgent.cs | 2 +- .../Prototyping/NetworkTransform.cs | 2 +- ...unity.multiplayer.mlapi.prototyping.asmdef | 7 ------ .../com.unity.netcode.prototyping.asmdef | 7 ++++++ ...com.unity.netcode.prototyping.asmdef.meta} | 0 .../Runtime/AssemblyInfo.cs | 8 +++--- .../Runtime/Collections/FixedQueue.cs | 2 +- .../Runtime/Configuration/HashSize.cs | 2 +- .../Runtime/Configuration/NetworkConfig.cs | 2 +- .../Runtime/Configuration/NetworkConstants.cs | 2 +- .../Runtime/Configuration/NetworkPrefab.cs | 2 +- .../Runtime/Connection/NetworkClient.cs | 2 +- .../Runtime/Connection/PendingClient.cs | 2 +- .../Runtime/Core/IndexAllocator.cs | 2 +- .../Runtime/Core/NetworkBehaviour.cs | 2 +- .../Runtime/Core/NetworkBehaviourUpdater.cs | 2 +- .../Runtime/Core/NetworkManager.cs | 4 +-- .../Runtime/Core/NetworkObject.cs | 2 +- .../Runtime/Core/NetworkUpdateLoop.cs | 2 +- .../Runtime/Core/SnapshotRTT.cs | 2 +- .../Runtime/Core/SnapshotSystem.cs | 2 +- .../Exceptions/InvalidParentException.cs | 2 +- .../NetworkConfigurationException.cs | 2 +- .../Exceptions/NotListeningException.cs | 2 +- .../Runtime/Exceptions/NotServerException.cs | 2 +- .../Runtime/Exceptions/SpawnStateException.cs | 2 +- .../Exceptions/VisibilityChangeException.cs | 2 +- .../Runtime/Hashing/XXHash/XXHash.cs | 2 +- .../Runtime/Logging/LogLevel.cs | 2 +- .../Runtime/Logging/NetworkLog.cs | 2 +- .../Runtime/Messaging/CustomMessageManager.cs | 2 +- .../Messaging/IInternalMessageHandler.cs | 2 +- .../Messaging/InternalCommandContext.cs | 2 +- .../Messaging/InternalMessageHandler.cs | 2 +- .../Runtime/Messaging/MessageBatcher.cs | 2 +- .../MessageQueue/MessageFrameItem.cs | 2 +- .../MessageQueue/MessageQueueContainer.cs | 4 +-- .../MessageQueue/MessageQueueHistoryFrame.cs | 2 +- .../MessageQueue/MessageQueueProcessor.cs | 2 +- .../Runtime/Messaging/RpcAttributes.cs | 2 +- .../Runtime/Messaging/RpcParams.cs | 2 +- .../Collections/NetworkDictionary.cs | 2 +- .../Collections/NetworkList.cs | 2 +- .../NetworkVariable/Collections/NetworkSet.cs | 2 +- .../NetworkVariable/INetworkVariable.cs | 2 +- .../NetworkVariable/NetworkVariable.cs | 2 +- .../NetworkVariablePermission.cs | 2 +- .../NetworkVariableSettings.cs | 2 +- .../Profiling/IProfilableTransportProvider.cs | 2 +- .../Profiling/ITransportProfilerData.cs | 2 +- ...nternalMessageHandlerProfilingDecorator.cs | 2 +- .../Runtime/Profiling/NetworkProfiler.cs | 2 +- .../Profiling/PerformanceDataManager.cs | 2 +- .../Runtime/Profiling/PerformanceTickData.cs | 2 +- .../Runtime/Profiling/ProfilerConstants.cs | 2 +- .../Profiling/ProfilerCounterUtility.cs | 2 +- .../Runtime/Profiling/ProfilerCounterValue.cs | 2 +- .../Runtime/Profiling/ProfilerCountersInfo.cs | 2 +- .../Runtime/Profiling/ProfilerNotifier.cs | 2 +- .../Runtime/Profiling/ProfilerStat.cs | 2 +- .../Runtime/Profiling/ProfilerStatManager.cs | 2 +- .../Runtime/Profiling/ProfilerTickData.cs | 2 +- .../Runtime/Profiling/ProfilingDataStore.cs | 2 +- .../Runtime/Reflection/TypeExtensions.cs | 2 +- .../SceneManagement/NetworkSceneManager.cs | 2 +- .../SceneManagement/SceneSwitchProgress.cs | 2 +- .../Runtime/Serialization/Arithmetic.cs | 2 +- .../Serialization/AutoNetworkSerializable.cs | 2 +- .../Serialization/INetworkSerializable.cs | 2 +- .../MemoryStructures/ByteBool.cs | 2 +- .../MemoryStructures/UIntFloat.cs | 2 +- .../Runtime/Serialization/NetworkBuffer.cs | 4 +-- .../Runtime/Serialization/NetworkReader.cs | 2 +- .../Serialization/NetworkSerializer.cs | 2 +- .../Runtime/Serialization/NetworkWriter.cs | 2 +- .../Serialization/Pooled/NetworkBufferPool.cs | 2 +- .../Serialization/Pooled/NetworkReaderPool.cs | 2 +- .../Serialization/Pooled/NetworkWriterPool.cs | 2 +- .../Pooled/PooledNetworkBuffer.cs | 2 +- .../Pooled/PooledNetworkReader.cs | 2 +- .../Pooled/PooledNetworkWriter.cs | 2 +- .../Serialization/SerializationManager.cs | 2 +- .../Runtime/Spawning/NetworkPrefabHandler.cs | 2 +- .../Runtime/Spawning/NetworkSpawnManager.cs | 2 +- .../Runtime/Spawning/ReleasedNetworkId.cs | 2 +- .../Runtime/Timing/NetworkTickSystem.cs | 2 +- .../Runtime/Timing/NetworkTime.cs | 2 +- .../Runtime/Timing/NetworkTimeSystem.cs | 2 +- .../Transports/MultiplexTransportAdapter.cs | 2 +- .../Runtime/Transports/NetworkDelivery.cs | 2 +- .../Runtime/Transports/NetworkEvent.cs | 2 +- .../Runtime/Transports/NetworkTransport.cs | 4 +-- .../Runtime/Transports/Tasks/SocketTask.cs | 6 ++--- .../Transports/Tests/Editor/TransportTest.cs | 4 +-- ....unity.mulitplayer.mlapi.editortest.asmdef | 24 ------------------ ....unity.netcode.transport.editortest.asmdef | 12 +++++++++ ....netcode.transport.editortest.asmdef.meta} | 0 .../Runtime/Transports/TransportChannel.cs | 2 +- .../Transports/UNET/ProfilerConstants.cs | 2 +- .../Runtime/Transports/UNET/RelayTransport.cs | 4 +-- .../Runtime/Transports/UNET/UNetChannel.cs | 2 +- .../Runtime/Transports/UNET/UNetTransport.cs | 4 +-- ...com.unity.multiplayer.mlapi.runtime.asmdef | 5 ---- .../Runtime/com.unity.netcode.runtime.asmdef | 5 ++++ ... => com.unity.netcode.runtime.asmdef.meta} | 0 .../Tests/Editor/ArithmeticTests.cs | 2 +- .../Tests/Editor/DummyMessageHandler.cs | 2 +- .../Tests/Editor/IndexAllocatorTests.cs | 2 +- .../Tests/Editor/MessageBatcherTests.cs | 2 +- .../Tests/Editor/MessagePacker.cs | 2 +- .../Tests/Editor/NetworkBehaviourTests.cs | 2 +- .../Tests/Editor/NetworkBufferTests.cs | 2 +- ...NetworkManagerCustomMessageManagerTests.cs | 2 +- .../NetworkManagerMessageHandlerTests.cs | 4 +-- .../Editor/NetworkManagerSceneManagerTests.cs | 2 +- .../Tests/Editor/NetworkObjectTests.cs | 2 +- .../Tests/Editor/NetworkSerializerTests.cs | 2 +- .../Tests/Editor/ProfilerTests.cs | 2 +- ...alMessageHandlerProfilingDecoratorTests.cs | 2 +- .../Tests/Editor/SnapshotRttTests.cs | 2 +- .../Timing/ClientNetworkTimeSystemTests.cs | 2 +- .../Tests/Editor/Timing/NetworkTimeTests.cs | 2 +- .../Timing/ServerNetworkTimeSystemTests.cs | 2 +- .../Tests/Editor/Timing/TimingTestHelper.cs | 2 +- ...unity.multiplayer.mlapi.editortests.asmdef | 14 ----------- .../com.unity.netcode.editortests.asmdef | 14 +++++++++++ ...com.unity.netcode.editortests.asmdef.meta} | 0 .../Tests/Runtime/BaseMultiInstanceTest.cs | 6 ++--- .../BufferDataValidationComponent.cs | 2 +- .../NetworkUpdateStagesComponent.cs | 2 +- .../NetworkVariableTestComponent.cs | 2 +- .../Tests/Runtime/ConnectionApproval.cs | 2 +- .../NetworkObjectGlobalObjectIdHashTests.cs | 2 +- .../NetworkPrefabGlobalObjectIdHashTests.cs | 2 +- .../Runtime/Helpers/NetworkManagerHelper.cs | 4 +-- .../Runtime/Helpers/NetworkVariableHelper.cs | 2 +- .../Runtime/Messaging/NamedMessageTests.cs | 2 +- .../Runtime/Messaging/UnnamedMessageTests.cs | 2 +- .../Tests/Runtime/MultiInstanceHelpers.cs | 6 ++--- .../Runtime/NetworkBehaviourUpdaterTests.cs | 2 +- .../NetworkObjectDestroyTests.cs | 2 +- .../NetworkObjectOnSpawnTests.cs | 2 +- .../NetworkObjectSceneSerializationTests.cs | 2 +- .../Runtime/NetworkPrefabHandlerTests.cs | 2 +- .../Tests/Runtime/NetworkSceneManagerTests.cs | 2 +- .../Tests/Runtime/NetworkSpawnManagerTests.cs | 2 +- .../Tests/Runtime/NetworkTransformTests.cs | 6 ++--- .../Tests/Runtime/NetworkUpdateLoopTests.cs | 2 +- .../Tests/Runtime/NetworkVariableTests.cs | 2 +- .../NetworkObjectParentingTests.cs | 2 +- .../ObjectParenting/ReparentingCubeNetBhv.cs | 2 +- .../Profiling/NetworkVariableNameTests.cs | 2 +- .../Tests/Runtime/RpcPipelineTestComponent.cs | 2 +- .../Tests/Runtime/RpcQueueTests.cs | 2 +- .../Tests/Runtime/RpcTests.cs | 2 +- .../Runtime/Timing/NetworkTimeSystemTests.cs | 2 +- .../Runtime/Timing/TimeMultiInstanceTest.cs | 6 ++--- .../Tests/Runtime/Transport/SIPTransport.cs | 4 +-- .../Runtime/Transport/SIPTransportTests.cs | 2 +- ...nity.multiplayer.mlapi.runtimetests.asmdef | 16 ------------ .../com.unity.netcode.runtimetests.asmdef | 16 ++++++++++++ ...om.unity.netcode.runtimetests.asmdef.meta} | 0 .../Runtime/UTPTransport.cs | 4 +-- ...com.unity.multiplayer.transport.utp.asmdef | 13 ++-------- .../Tests/Editor/BasicUTPTest.cs | 2 +- ...ltiplayer.transport.utp.editortests.asmdef | 23 +++++------------ .../Tests/Runtime/DummyTestScript.cs | 2 +- ...tiplayer.transport.utp.runtimetests.asmdef | 18 +++---------- ...nableDisableSceneNetworkObjectComponent.cs | 2 +- .../Assets/Scripts/CommandLineHandler.cs | 4 +-- .../Assets/Scripts/ConnectionModeScript.cs | 2 +- .../Assets/Scripts/ExitButtonScript.cs | 2 +- testproject/Assets/Scripts/GrabbableBall.cs | 2 +- testproject/Assets/Scripts/PlayerMovement.cs | 2 +- testproject/Assets/Scripts/Raygun.cs | 2 +- testproject/Assets/Scripts/ScalingCube.cs | 2 +- .../ScriptsForAutomatedTesting.asmdef | 15 ++--------- testproject/Assets/Scripts/SyncTransform.cs | 2 +- testproject/Assets/Scripts/UIController.cs | 2 +- .../Assets/Scripts/UnityChanSpawner.cs | 2 +- testproject/Assets/Scripts/testproject.asmdef | 6 ++--- .../Editor/testproject.editortests.asmdef | 4 +-- .../HybridScripts/RpcQueueManualTests.cs | 2 +- .../AnimatedCubeController.cs | 4 +-- .../Tests/Manual/Scripts/BandwidthTest.cs | 2 +- .../Scripts/ConnectionApprovalComponent.cs | 2 +- .../Scripts/GenericNetworkObjectBehaviour.cs | 2 +- .../Scripts/ManualNetworkVariableTest.cs | 2 +- .../Tests/Manual/Scripts/NetworkManagerHud.cs | 4 +-- .../Tests/Manual/Scripts/NetworkPrefabPool.cs | 2 +- .../NetworkSceneManagerCallbackTests.cs | 2 +- .../Tests/Manual/Scripts/PlayerColor.cs | 2 +- .../Manual/Scripts/PlayerMovementManager.cs | 2 +- .../Tests/Manual/Scripts/RandomMovement.cs | 2 +- .../Tests/Manual/Scripts/StatsDisplay.cs | 2 +- .../Manual/Scripts/StatsInfoContainer.cs | 2 +- .../Manual/Scripts/SwitchSceneHandler.cs | 2 +- .../Manual/testproject.manualtests.asmdef | 6 ++--- ...dUpdateMessagesAreOnlyProcessedOnceTest.cs | 4 +-- .../Assets/Tests/Runtime/MessageOrdering.cs | 4 +-- .../Runtime/MultiClientConnectionApproval.cs | 4 +-- .../BaseMultiprocessTests.cs | 2 +- .../ExecuteStepInContext.cs | 2 +- .../ExecuteStepInContextTests.cs | 2 +- .../Helpers/BuildMultiprocessTestPlayer.cs | 2 +- .../CustomPrefabSpawnerForPerformanceTests.cs | 2 +- .../Helpers/GameObjectPool.cs | 2 +- .../Helpers/MultiprocessOrchestration.cs | 2 +- .../NetworkVariablePerformanceTests.cs | 2 +- .../MultiprocessRuntime/TestCoordinator.cs | 2 +- .../TestCoordinatorTests.cs | 2 +- ...ltiplayer.mlapi.multiprocessruntime.asmdef | 25 ------------------- .../Runtime/MultiprocessRuntime/doc.meta | 8 ------ .../Runtime/MultiprocessRuntime/readme.md | 2 +- .../testproject.multiprocesstests.asmdef | 11 ++++++++ ...testproject.multiprocesstests.asmdef.meta} | 0 .../Tests/Runtime/RpcINetworkSerializable.cs | 4 +-- .../Assets/Tests/Runtime/RpcTestsAutomated.cs | 4 +-- .../Assets/Tests/Runtime/SceneLoadingTest.cs | 2 +- .../Tests/Runtime/Support/SpawnRpcDespawn.cs | 2 +- .../Support/SpawnRpcDespawnInstanceHandler.cs | 2 +- .../Runtime/testproject.runtimetests.asmdef | 4 +-- 242 files changed, 352 insertions(+), 430 deletions(-) rename com.unity.multiplayer.mlapi/Editor/CodeGen/{Unity.Multiplayer.MLAPI.Editor.CodeGen.asmdef => com.unity.netcode.editor.codegen.asmdef} (61%) rename com.unity.multiplayer.mlapi/Editor/CodeGen/{Unity.Multiplayer.MLAPI.Editor.CodeGen.asmdef.meta => com.unity.netcode.editor.codegen.asmdef.meta} (100%) delete mode 100644 com.unity.multiplayer.mlapi/Editor/com.unity.multiplayer.mlapi.editor.asmdef create mode 100644 com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef rename com.unity.multiplayer.mlapi/Editor/{com.unity.multiplayer.mlapi.editor.asmdef.meta => com.unity.netcode.editor.asmdef.meta} (100%) delete mode 100644 com.unity.multiplayer.mlapi/Prototyping/com.unity.multiplayer.mlapi.prototyping.asmdef create mode 100644 com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef rename com.unity.multiplayer.mlapi/Prototyping/{com.unity.multiplayer.mlapi.prototyping.asmdef.meta => com.unity.netcode.prototyping.asmdef.meta} (100%) delete mode 100644 com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.mulitplayer.mlapi.editortest.asmdef create mode 100644 com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef rename com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/{com.unity.mulitplayer.mlapi.editortest.asmdef.meta => com.unity.netcode.transport.editortest.asmdef.meta} (100%) delete mode 100644 com.unity.multiplayer.mlapi/Runtime/com.unity.multiplayer.mlapi.runtime.asmdef create mode 100644 com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef rename com.unity.multiplayer.mlapi/Runtime/{com.unity.multiplayer.mlapi.runtime.asmdef.meta => com.unity.netcode.runtime.asmdef.meta} (100%) delete mode 100644 com.unity.multiplayer.mlapi/Tests/Editor/com.unity.multiplayer.mlapi.editortests.asmdef create mode 100644 com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef rename com.unity.multiplayer.mlapi/Tests/Editor/{com.unity.multiplayer.mlapi.editortests.asmdef.meta => com.unity.netcode.editortests.asmdef.meta} (100%) delete mode 100644 com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.multiplayer.mlapi.runtimetests.asmdef create mode 100644 com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef rename com.unity.multiplayer.mlapi/Tests/Runtime/{com.unity.multiplayer.mlapi.runtimetests.asmdef.meta => com.unity.netcode.runtimetests.asmdef.meta} (100%) delete mode 100644 testproject/Assets/Tests/Runtime/MultiprocessRuntime/com.unity.multiplayer.mlapi.multiprocessruntime.asmdef delete mode 100644 testproject/Assets/Tests/Runtime/MultiprocessRuntime/doc.meta create mode 100644 testproject/Assets/Tests/Runtime/MultiprocessRuntime/testproject.multiprocesstests.asmdef rename testproject/Assets/Tests/Runtime/MultiprocessRuntime/{com.unity.multiplayer.mlapi.multiprocessruntime.asmdef.meta => testproject.multiprocesstests.asmdef.meta} (100%) diff --git a/.editorconfig b/.editorconfig index 1165268cb7..606d45766b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -27,7 +27,7 @@ csharp_prefer_braces = true:error csharp_using_directive_placement = outside_namespace:error # naming rules -# namespace Unity.Multiplayer.Netcode { ... } +# namespace Unity.Netcode { ... } # public class NetworkObject { ... } # public void Spawn(...) { ... } dotnet_naming_symbols.usertypes_naming_symbols.applicable_kinds = namespace, class, struct, enum, property, method, field, event, delegate, local_function diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs index c513c0d556..3bf61d2523 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs @@ -10,11 +10,11 @@ using Unity.CompilationPipeline.Common.ILPostProcessing; using UnityEngine; -namespace Unity.Multiplayer.Netcode.Editor.CodeGen +namespace Unity.Netcode.Editor.CodeGen { internal static class CodeGenHelpers { - public const string RuntimeAssemblyName = "Unity.Multiplayer.MLAPI.Runtime"; + public const string RuntimeAssemblyName = "Unity.Netcode.Runtime"; public static readonly string NetworkBehaviour_FullName = typeof(NetworkBehaviour).FullName; public static readonly string ServerRpcAttribute_FullName = typeof(ServerRpcAttribute).FullName; @@ -278,10 +278,10 @@ public static AssemblyDefinition AssemblyDefinitionFor(ICompiledAssembly compile var assemblyDefinition = AssemblyDefinition.ReadAssembly(new MemoryStream(compiledAssembly.InMemoryAssembly.PeData), readerParameters); - //apparently, it will happen that when we ask to resolve a type that lives inside MLAPI.Runtime, and we - //are also postprocessing MLAPI.Runtime, type resolving will fail, because we do not actually try to resolve + //apparently, it will happen that when we ask to resolve a type that lives inside Unity.Netcode.Runtime, and we + //are also postprocessing Unity.Netcode.Runtime, type resolving will fail, because we do not actually try to resolve //inside the assembly we are processing. Let's make sure we do that, so that we can use postprocessor features inside - //MLAPI.Runtime itself as well. + //Unity.Netcode.Runtime itself as well. assemblyResolver.AddAssemblyDefinitionBeingOperatedOn(assemblyDefinition); return assemblyDefinition; diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs index a06e1aff2d..0b09d7e84a 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs @@ -13,7 +13,7 @@ using ParameterAttributes = Mono.Cecil.ParameterAttributes; using ILPPInterface = Unity.CompilationPipeline.Common.ILPostProcessing.ILPostProcessor; -namespace Unity.Multiplayer.Netcode.Editor.CodeGen +namespace Unity.Netcode.Editor.CodeGen { internal sealed class NetworkBehaviourILPP : ILPPInterface { diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorAssemblyResolver.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorAssemblyResolver.cs index 9ac44f788e..f0046f5b36 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorAssemblyResolver.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorAssemblyResolver.cs @@ -6,7 +6,7 @@ using Mono.Cecil; using Unity.CompilationPipeline.Common.ILPostProcessing; -namespace Unity.Multiplayer.Netcode.Editor.CodeGen +namespace Unity.Netcode.Editor.CodeGen { internal class PostProcessorAssemblyResolver : IAssemblyResolver { diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporter.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporter.cs index d4f450c9a4..f96ba3396c 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporter.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporter.cs @@ -2,7 +2,7 @@ using System.Reflection; using Mono.Cecil; -namespace Unity.Multiplayer.Netcode.Editor.CodeGen +namespace Unity.Netcode.Editor.CodeGen { internal class PostProcessorReflectionImporter : DefaultReflectionImporter { diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs index c265bc9ae0..81f80f04ed 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs @@ -1,6 +1,6 @@ using Mono.Cecil; -namespace Unity.Multiplayer.Netcode.Editor.CodeGen +namespace Unity.Netcode.Editor.CodeGen { internal class PostProcessorReflectionImporterProvider : IReflectionImporterProvider { diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs index 49d666d538..4a1b86f51a 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs @@ -6,7 +6,7 @@ using Unity.CompilationPipeline.Common.ILPostProcessing; using ILPPInterface = Unity.CompilationPipeline.Common.ILPostProcessing.ILPostProcessor; -namespace Unity.Multiplayer.Netcode.Editor.CodeGen +namespace Unity.Netcode.Editor.CodeGen { internal sealed class RuntimeAccessModifiersILPP : ILPPInterface { diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/Unity.Multiplayer.MLAPI.Editor.CodeGen.asmdef b/com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef similarity index 61% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/Unity.Multiplayer.MLAPI.Editor.CodeGen.asmdef rename to com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef index 3be80f6786..f9a56522d3 100644 --- a/com.unity.multiplayer.mlapi/Editor/CodeGen/Unity.Multiplayer.MLAPI.Editor.CodeGen.asmdef +++ b/com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef @@ -1,8 +1,8 @@ { - "name": "Unity.Multiplayer.MLAPI.Editor.CodeGen", - "rootNamespace": "Unity.Multiplayer.Netcode.Editor.CodeGen", + "name": "Unity.Netcode.Editor.CodeGen", + "rootNamespace": "Unity.Netcode.Editor.CodeGen", "references": [ - "Unity.Multiplayer.MLAPI.Runtime" + "Unity.Netcode.Runtime" ], "includePlatforms": [ "Editor" @@ -15,5 +15,5 @@ "Mono.Cecil.Pdb.dll", "Mono.Cecil.Rocks.dll" ], - "autoReferenced": false + "autoReferenced": false } \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/Unity.Multiplayer.MLAPI.Editor.CodeGen.asmdef.meta b/com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/Unity.Multiplayer.MLAPI.Editor.CodeGen.asmdef.meta rename to com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Editor/DontShowInTransportDropdownAttribute.cs b/com.unity.multiplayer.mlapi/Editor/DontShowInTransportDropdownAttribute.cs index d2461e8224..465ea27fc3 100644 --- a/com.unity.multiplayer.mlapi/Editor/DontShowInTransportDropdownAttribute.cs +++ b/com.unity.multiplayer.mlapi/Editor/DontShowInTransportDropdownAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode.Editor +namespace Unity.Netcode.Editor { public class DontShowInTransportDropdownAttribute : Attribute { diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs index a016b1c75b..0ce90849b9 100644 --- a/com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs +++ b/com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs @@ -3,7 +3,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Multiplayer.Netcode.Editor +namespace Unity.Netcode.Editor { public class MLAPIProfiler : EditorWindow { diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs index 40f8dbe8f6..6b321366da 100644 --- a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs +++ b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs @@ -4,7 +4,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Multiplayer.Netcode.Editor +namespace Unity.Netcode.Editor { [InitializeOnLoad] internal static class MLAPIProfilerModule diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs b/com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs index 0d33257bd8..c525d121d6 100644 --- a/com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs +++ b/com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEditor; -namespace Unity.Multiplayer.Netcode.Editor +namespace Unity.Netcode.Editor { [CustomEditor(typeof(NetworkBehaviour), true)] [CanEditMultipleObjects] diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs b/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs index 5b5610ce33..ec21badf76 100644 --- a/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs +++ b/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEditorInternal; -namespace Unity.Multiplayer.Netcode.Editor +namespace Unity.Netcode.Editor { [CustomEditor(typeof(NetworkManager), true)] [CanEditMultipleObjects] diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs b/com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs index f10dae8edb..d9e9d703e3 100644 --- a/com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs +++ b/com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEditor; -namespace Unity.Multiplayer.Netcode.Editor +namespace Unity.Netcode.Editor { [CustomEditor(typeof(NetworkObject), true)] [CanEditMultipleObjects] diff --git a/com.unity.multiplayer.mlapi/Editor/com.unity.multiplayer.mlapi.editor.asmdef b/com.unity.multiplayer.mlapi/Editor/com.unity.multiplayer.mlapi.editor.asmdef deleted file mode 100644 index 2b981d8a66..0000000000 --- a/com.unity.multiplayer.mlapi/Editor/com.unity.multiplayer.mlapi.editor.asmdef +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Unity.Multiplayer.MLAPI.Editor", - "rootNamespace": "Unity.Multiplayer.Netcode.Editor", - "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "Unity.Multiplayer.MLAPI.Prototyping" - ], - "includePlatforms": [ - "Editor" - ] -} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef b/com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef new file mode 100644 index 0000000000..fb5e80bc83 --- /dev/null +++ b/com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef @@ -0,0 +1,11 @@ +{ + "name": "Unity.Netcode.Editor", + "rootNamespace": "Unity.Netcode.Editor", + "references": [ + "Unity.Netcode.Runtime", + "Unity.Netcode.Prototyping" + ], + "includePlatforms": [ + "Editor" + ] +} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Editor/com.unity.multiplayer.mlapi.editor.asmdef.meta b/com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/com.unity.multiplayer.mlapi.editor.asmdef.meta rename to com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Prototyping/AssemblyInfo.cs b/com.unity.multiplayer.mlapi/Prototyping/AssemblyInfo.cs index d5631019e3..bad6d37805 100644 --- a/com.unity.multiplayer.mlapi/Prototyping/AssemblyInfo.cs +++ b/com.unity.multiplayer.mlapi/Prototyping/AssemblyInfo.cs @@ -1,11 +1,10 @@ using System.Runtime.CompilerServices; #if UNITY_EDITOR -[assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.EditorTests")] -[assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.RuntimeTests")] -[assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.Editor.CodeGen")] -[assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.Editor")] +[assembly: InternalsVisibleTo("Unity.Netcode.EditorTests")] +[assembly: InternalsVisibleTo("Unity.Netcode.RuntimeTests")] +[assembly: InternalsVisibleTo("Unity.Netcode.Editor.CodeGen")] +[assembly: InternalsVisibleTo("Unity.Netcode.Editor")] [assembly: InternalsVisibleTo("TestProject.EditorTests")] [assembly: InternalsVisibleTo("TestProject.RuntimeTests")] -[assembly: InternalsVisibleTo("TestProject.ManualTests")] #endif diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs b/com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs index 724b8ace1b..5a3df308df 100644 --- a/com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs +++ b/com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Multiplayer.Netcode.Prototyping +namespace Unity.Netcode.Prototyping { /// /// A prototype component for syncing animations diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs b/com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs index ede88adf9f..930234a57a 100644 --- a/com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs +++ b/com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.AI; -namespace Unity.Multiplayer.Netcode.Prototyping +namespace Unity.Netcode.Prototyping { /// /// A prototype component for syncing NavMeshAgents diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs b/com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs index e4ac288d73..a6b8a72a09 100644 --- a/com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs +++ b/com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Multiplayer.Netcode.Prototyping +namespace Unity.Netcode.Prototyping { /// /// A prototype component for syncing transforms diff --git a/com.unity.multiplayer.mlapi/Prototyping/com.unity.multiplayer.mlapi.prototyping.asmdef b/com.unity.multiplayer.mlapi/Prototyping/com.unity.multiplayer.mlapi.prototyping.asmdef deleted file mode 100644 index 3813d695be..0000000000 --- a/com.unity.multiplayer.mlapi/Prototyping/com.unity.multiplayer.mlapi.prototyping.asmdef +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "Unity.Multiplayer.MLAPI.Prototyping", - "rootNamespace": "Unity.Multiplayer.Netcode.Prototyping", - "references": [ - "Unity.Multiplayer.MLAPI.Runtime" - ] -} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef b/com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef new file mode 100644 index 0000000000..0a93c26183 --- /dev/null +++ b/com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef @@ -0,0 +1,7 @@ +{ + "name": "Unity.Netcode.Prototyping", + "rootNamespace": "Unity.Netcode.Prototyping", + "references": [ + "Unity.Netcode.Runtime" + ] +} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Prototyping/com.unity.multiplayer.mlapi.prototyping.asmdef.meta b/com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/com.unity.multiplayer.mlapi.prototyping.asmdef.meta rename to com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs b/com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs index 57c05e78cf..bad6d37805 100644 --- a/com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs +++ b/com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs @@ -1,10 +1,10 @@ using System.Runtime.CompilerServices; #if UNITY_EDITOR -[assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.EditorTests")] -[assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.RuntimeTests")] -[assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.Editor.CodeGen")] -[assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.Editor")] +[assembly: InternalsVisibleTo("Unity.Netcode.EditorTests")] +[assembly: InternalsVisibleTo("Unity.Netcode.RuntimeTests")] +[assembly: InternalsVisibleTo("Unity.Netcode.Editor.CodeGen")] +[assembly: InternalsVisibleTo("Unity.Netcode.Editor")] [assembly: InternalsVisibleTo("TestProject.EditorTests")] [assembly: InternalsVisibleTo("TestProject.RuntimeTests")] #endif diff --git a/com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs b/com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs index c3b870ccc4..1cbb4f1b34 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Queue with a fixed size diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs b/com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs index 66460ee914..7d76c9c48f 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Represents the length of a var int encoded hash diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs index 9d40aa957d..57d3af533b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs @@ -3,7 +3,7 @@ using UnityEngine; using System.Linq; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// The configuration object used to start server, client and hosts diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs index 04bccc7d92..2ef032e7cd 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A static class containing MLAPI constants diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs index b65a368ffe..cc22258ef0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal enum NetworkPrefabOverride { diff --git a/com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs b/com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs index 2350b09d64..38ae544952 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A NetworkClient diff --git a/com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs b/com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs index 42cfbed84d..5bbf392454 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A class representing a client that is currently in the process of connecting diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/IndexAllocator.cs b/com.unity.multiplayer.mlapi/Runtime/Core/IndexAllocator.cs index 9808e00bba..892fd6d139 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/IndexAllocator.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/IndexAllocator.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal struct IndexAllocatorEntry { diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs index fa26054c89..5ee2b7dd09 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs @@ -5,7 +5,7 @@ using System.Linq; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// The base class to override to write network code. Inherits MonoBehaviour diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs index 0981ddc4c9..d38209ad0f 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Unity.Profiling; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { public class NetworkBehaviourUpdater { diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs index 10a0027352..3a253bfa14 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs @@ -6,7 +6,7 @@ using Unity.Profiling; using Debug = UnityEngine.Debug; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// The main component of the library @@ -172,7 +172,7 @@ public ulong LocalClientId public ulong[] ConnectedClientsIds => ConnectedClientsList.Select(c => c.ClientId).ToArray(); /// - /// Gets a dictionary of the clients that have been accepted by the transport but are still pending by the MLAPI. This is only populated on the server. + /// Gets a dictionary of the clients that have been accepted by the transport but are still pending by the Netcode. This is only populated on the server. /// public readonly Dictionary PendingClients = new Dictionary(); diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs index 07b90ce835..661e350d48 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs @@ -5,7 +5,7 @@ using System.Runtime.CompilerServices; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A component used to identify that a GameObject in the network diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkUpdateLoop.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkUpdateLoop.cs index 583334c7ba..b9c52c1a43 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkUpdateLoop.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkUpdateLoop.cs @@ -4,7 +4,7 @@ using UnityEngine.LowLevel; using UnityEngine.PlayerLoop; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Defines the required interface of a network update system being executed by the network update loop. diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs b/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs index 7bc00d0a3b..58479e7e9b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal class ConnectionRtt { diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs b/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs index 38bf5af7af..f99186cba9 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs @@ -3,7 +3,7 @@ using System.IO; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { // Structure that acts as a key for a NetworkVariable // Allows telling which variable we're talking about. diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs b/com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs index 0249ac5875..66a3679f67 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Exception thrown when the new parent candidate of the NetworkObject is not valid diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs b/com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs index 63eb31033a..a710ac64e2 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Exception thrown when the operation can only be done on the server diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs b/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs index cc48fa5511..f345432cc0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Exception thrown when the operation require NetworkManager to be listening. diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs b/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs index 164cbc282b..036b6b3e4b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Exception thrown when the operation can only be done on the server diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs b/com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs index c4bc9558de..712ddef7fd 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Exception thrown when an object is not yet spawned diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs b/com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs index f933b25542..2a89cb3486 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Exception thrown when a visibility change fails diff --git a/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs b/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs index 6d2e238a43..cfcb9d642d 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs @@ -8,7 +8,7 @@ using System.Text; using System.Runtime.CompilerServices; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// XXHash implementation. diff --git a/com.unity.multiplayer.mlapi/Runtime/Logging/LogLevel.cs b/com.unity.multiplayer.mlapi/Runtime/Logging/LogLevel.cs index 48a6f6e4ba..7cfc1071e5 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Logging/LogLevel.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Logging/LogLevel.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Log level diff --git a/com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs b/com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs index c1c343c418..f07af19f91 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Helper class for logging diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs index 129b10a233..e8e10c5ae9 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// The manager class to manage custom messages, note that this is different from the NetworkManager custom messages. diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs index 91abe8c70d..276c7e78e7 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal interface IInternalMessageHandler { diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalCommandContext.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalCommandContext.cs index 88cf6afd9c..79a38489ee 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalCommandContext.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalCommandContext.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A context used for building an internal command. diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs index 55882750f6..59134a528d 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs @@ -4,7 +4,7 @@ using UnityEngine.Events; using UnityEngine.SceneManagement; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal class InternalMessageHandler : IInternalMessageHandler { diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageBatcher.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageBatcher.cs index f779aa2301..22df862b66 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageBatcher.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageBatcher.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal class MessageBatcher { diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageFrameItem.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageFrameItem.cs index e63131bd55..7d099b3d60 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageFrameItem.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageFrameItem.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// MessageFrameItem diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs index bdfcc569a5..08f9abbc90 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs @@ -3,7 +3,7 @@ using System.Linq; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// MessageQueueContainer @@ -207,7 +207,7 @@ public void AdvanceFrameHistory(MessageQueueHistoryFrame.QueueFrameType queueTyp if (!m_QueueHistory.ContainsKey(queueType)) { - Debug.LogError($"You must initialize the {nameof(MessageQueueContainer)} before using Unity.Multiplayer.Netcode!"); + Debug.LogError($"You must initialize the {nameof(MessageQueueContainer)} before using Unity.Netcode!"); return; } diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs index 1689d8f774..e888028370 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Used by the MessageQueueContainer to hold queued messages diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs index e45a6a84b9..923a8bde0f 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs @@ -2,7 +2,7 @@ using Unity.Profiling; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// MessageQueueProcessing diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcAttributes.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcAttributes.cs index 956c653c05..5d0a50178d 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcAttributes.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcAttributes.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// RPC delivery types diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs index 3c5b5c803d..bd0667ed5d 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { public interface IHasUpdateStage { diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkDictionary.cs b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkDictionary.cs index a496b8aabc..c09985ddaf 100644 --- a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkDictionary.cs +++ b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkDictionary.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Event based NetworkVariable container for syncing Dictionaries diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkList.cs b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkList.cs index 67a49b9d9d..ad9feda01d 100644 --- a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkList.cs +++ b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkList.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Event based NetworkVariable container for syncing Lists diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkSet.cs b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkSet.cs index d2e6240ca3..06dc63189f 100644 --- a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkSet.cs +++ b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkSet.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Event based NetworkVariable container for syncing Sets diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/INetworkVariable.cs b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/INetworkVariable.cs index db933b65ef..338aab906b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/INetworkVariable.cs +++ b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/INetworkVariable.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Interface for network value containers diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariable.cs b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariable.cs index 6924c52c1c..b1f303292e 100644 --- a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariable.cs +++ b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariable.cs @@ -3,7 +3,7 @@ using System.IO; using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A variable that can be synchronized over the network. diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariablePermission.cs b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariablePermission.cs index 48414ee4e7..3773bb9ba9 100644 --- a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariablePermission.cs +++ b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariablePermission.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Permission type diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariableSettings.cs b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariableSettings.cs index 6821a859ec..84ed8ac663 100644 --- a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariableSettings.cs +++ b/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariableSettings.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Delegate type for permission checking diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/IProfilableTransportProvider.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/IProfilableTransportProvider.cs index ceb99d7270..f554875a92 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/IProfilableTransportProvider.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/IProfilableTransportProvider.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { public interface IProfilableTransportProvider { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs index 1bc4d72b1f..76fc6d64a4 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { public interface ITransportProfilerData { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs index b176b93773..bf2873535a 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs @@ -1,7 +1,7 @@ using System.IO; using Unity.Profiling; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal class InternalMessageHandlerProfilingDecorator : IInternalMessageHandler { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/NetworkProfiler.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/NetworkProfiler.cs index 918b91e5a8..b49de8c92e 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/NetworkProfiler.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/NetworkProfiler.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// NetworkProfiler for profiling network traffic diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs index 3b1823809a..bd12f95681 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal static class PerformanceDataManager { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs index c1f83cd3e5..b21e54905e 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal class PerformanceTickData { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs index aec775f315..e9fddea6e0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal static class ProfilerConstants { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs index 2c4c18498c..734a18513d 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs @@ -3,7 +3,7 @@ using Unity.Profiling.LowLevel; #endif -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal struct ProfilerCounterUtility { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs index 197dbc42ca..a77b1d4bb2 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs @@ -8,7 +8,7 @@ using Unity.Collections.LowLevel.Unsafe; #endif -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { #if ENABLE_PROFILER [StructLayout(LayoutKind.Sequential)] diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs index c94bce84ea..4f587091cf 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs @@ -3,7 +3,7 @@ using Unity.Profiling; #endif -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal static class ProfilerCountersInfo { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs index 58e2463255..717cd3ed58 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal static class ProfilerNotifier { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs index 032c6f64b3..c26e950cc8 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal class ProfilerStat { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStatManager.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStatManager.cs index 6af35992e0..2442ea47ed 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStatManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStatManager.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal static class ProfilerStatManager { diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerTickData.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerTickData.cs index 46b450ce02..2813433739 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerTickData.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerTickData.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// The type of Tick diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilingDataStore.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilingDataStore.cs index e55fe1b54a..c2da091fc2 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilingDataStore.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilingDataStore.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal class ProfilingDataStore { diff --git a/com.unity.multiplayer.mlapi/Runtime/Reflection/TypeExtensions.cs b/com.unity.multiplayer.mlapi/Runtime/Reflection/TypeExtensions.cs index 4561c62a29..216e489e0a 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Reflection/TypeExtensions.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Reflection/TypeExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal static class TypeExtensions { diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs b/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs index 15c972acce..a2c98842fd 100644 --- a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.SceneManagement; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Main class for managing network scenes diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/SceneSwitchProgress.cs b/com.unity.multiplayer.mlapi/Runtime/SceneManagement/SceneSwitchProgress.cs index add897cf09..39b24e8bd6 100644 --- a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/SceneSwitchProgress.cs +++ b/com.unity.multiplayer.mlapi/Runtime/SceneManagement/SceneSwitchProgress.cs @@ -3,7 +3,7 @@ using UnityEngine; using AsyncOperation = UnityEngine.AsyncOperation; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Class for tracking scene switching progress by server and clients. diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Arithmetic.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/Arithmetic.cs index 996a135740..34d5430bea 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/Arithmetic.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/Arithmetic.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Arithmetic helper class diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/AutoNetworkSerializable.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/AutoNetworkSerializable.cs index 72edd5ff27..0e496ba57a 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/AutoNetworkSerializable.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/AutoNetworkSerializable.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// AutoBitWritable implements INetworkSerializable and automatically serializes fields using reflection diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/INetworkSerializable.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/INetworkSerializable.cs index c5251b7fdd..48ca46d27c 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/INetworkSerializable.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/INetworkSerializable.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { public interface INetworkSerializable { diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/ByteBool.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/ByteBool.cs index ba6411f2ed..54e46b97bd 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/ByteBool.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/ByteBool.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { [StructLayout(LayoutKind.Explicit)] internal struct ByteBool diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/UIntFloat.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/UIntFloat.cs index 397f210691..5878e3030e 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/UIntFloat.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/UIntFloat.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A struct with a explicit memory layout. The struct has 4 fields. float,uint,double and ulong. diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkBuffer.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkBuffer.cs index af8c842785..0d391dd5f9 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkBuffer.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkBuffer.cs @@ -1,8 +1,8 @@ using System; using System.IO; -using static Unity.Multiplayer.Netcode.Arithmetic; +using static Unity.Netcode.Arithmetic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A buffer that can be used at the bit level diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs index e038505649..98f6af1976 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs @@ -8,7 +8,7 @@ using System.Text; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A BinaryReader that can do bit wise manipulation when backed by a NetworkBuffer diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkSerializer.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkSerializer.cs index 272fdfb525..26637e9273 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkSerializer.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkSerializer.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { public sealed class NetworkSerializer { diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs index 13a6dd0964..cf04723473 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs @@ -8,7 +8,7 @@ using System.IO; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { // Improved version of NetworkWriter /// diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkBufferPool.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkBufferPool.cs index 6a3bf3bdbc..1e35b991b6 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkBufferPool.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkBufferPool.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Static class containing PooledNetworkBuffers diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkReaderPool.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkReaderPool.cs index b3e92e21f5..bccc477d74 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkReaderPool.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkReaderPool.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Static class containing PooledNetworkReaders diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkWriterPool.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkWriterPool.cs index dbaebd5fc2..ff753f3f03 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkWriterPool.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkWriterPool.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Static class containing PooledNetworkWriters diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs index a29db88996..1c744e76ae 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Disposable NetworkBuffer that returns back to the NetworkBufferPool when disposed diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkReader.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkReader.cs index 6e1ce75fd9..796b6e5072 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkReader.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkReader.cs @@ -2,7 +2,7 @@ using System.IO; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Disposable NetworkReader that returns the Reader to the NetworkReaderPool when disposed diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkWriter.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkWriter.cs index 964ee02f61..c199f99a39 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkWriter.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkWriter.cs @@ -2,7 +2,7 @@ using System.IO; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Disposable NetworkWriter that returns the Writer to the NetworkWriterPool when disposed diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/SerializationManager.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/SerializationManager.cs index d952e2a9c1..031d12a5dc 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Serialization/SerializationManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Serialization/SerializationManager.cs @@ -5,7 +5,7 @@ using System.Reflection; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Helper class to manage the MLAPI serialization. diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkPrefabHandler.cs b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkPrefabHandler.cs index 747a4cce0a..b15902ec57 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkPrefabHandler.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkPrefabHandler.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Interface for customizing, overriding, spawning, and destroying Network Prefabs diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs index 921839182c..d79cb28fff 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs @@ -4,7 +4,7 @@ using System.Linq; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Class that handles object spawning diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/ReleasedNetworkId.cs b/com.unity.multiplayer.mlapi/Runtime/Spawning/ReleasedNetworkId.cs index 0ce728df8d..a30dab2c8b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Spawning/ReleasedNetworkId.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Spawning/ReleasedNetworkId.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { internal struct ReleasedNetworkId { diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTickSystem.cs b/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTickSystem.cs index 67eabbf482..f7a20e659e 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTickSystem.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTickSystem.cs @@ -1,7 +1,7 @@ using System; using Unity.Profiling; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { public class NetworkTickSystem { diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTime.cs b/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTime.cs index 0d1a47bbdd..39e3920055 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTime.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTime.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.Assertions; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A struct to represent a point of time in a networked game. diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs b/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs index 93ab27356f..4717730e39 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// is a standalone system which can be used to run a network time simulation. diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/MultiplexTransportAdapter.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/MultiplexTransportAdapter.cs index 9eb3490b46..8c22fbd42a 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/MultiplexTransportAdapter.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/MultiplexTransportAdapter.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Multiplex transport adapter. diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkDelivery.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkDelivery.cs index fab18383b5..19a4d953ca 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkDelivery.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkDelivery.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Delivery methods diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkEvent.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkEvent.cs index ed50686cee..b940d80138 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkEvent.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkEvent.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Represents a netEvent when polling diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs index 8826d13a4a..0826cdcab0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { public enum NetworkChannel : byte { @@ -44,7 +44,7 @@ public abstract class NetworkTransport : MonoBehaviour public abstract ulong ServerClientId { get; } /// - /// Gets a value indicating whether this is supported in the current runtime context. + /// Gets a value indicating whether this is supported in the current runtime context. /// This is used by multiplex adapters. /// /// true if is supported; otherwise, false. diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tasks/SocketTask.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/Tasks/SocketTask.cs index bbbada5e30..0e0bc2b9b5 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/Tasks/SocketTask.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/Tasks/SocketTask.cs @@ -1,7 +1,7 @@ using System; using System.Net.Sockets; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// Represents one or more socket tasks. @@ -102,13 +102,13 @@ public class SocketTask { // Used for states /// - /// Gets or sets a value indicating whether this is done. + /// Gets or sets a value indicating whether this is done. /// /// true if is done; otherwise, false. public bool IsDone { get; set; } /// - /// Gets or sets a value indicating whether this is success. + /// Gets or sets a value indicating whether this is success. /// /// true if success; otherwise, false. public bool Success { get; set; } diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs index 29f39f1484..efa0085e37 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs @@ -1,8 +1,8 @@ using System; using NUnit.Framework; using UnityEngine; -using Unity.Multiplayer.Netcode; -using Unity.Multiplayer.Netcode.Transports.UNET; +using Unity.Netcode; +using Unity.Netcode.Transports.UNET; using UnityEngine.Networking; public class TransportTest : MonoBehaviour diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.mulitplayer.mlapi.editortest.asmdef b/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.mulitplayer.mlapi.editortest.asmdef deleted file mode 100644 index 22f77d05b3..0000000000 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.mulitplayer.mlapi.editortest.asmdef +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "Unity.Multiplayer.MLAPI.Transports.EditorTests", - "rootNamespace": "", - "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "UnityEngine.TestRunner", - "UnityEditor.TestRunner" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef b/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef new file mode 100644 index 0000000000..822310c7f2 --- /dev/null +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef @@ -0,0 +1,12 @@ +{ + "name": "Unity.Netcode.Transport.EditorTests", + "references": [ + "Unity.Netcode.Runtime" + ], + "optionalUnityReferences": [ + "TestAssemblies" + ], + "includePlatforms": [ + "Editor" + ] +} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.mulitplayer.mlapi.editortest.asmdef.meta b/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.mulitplayer.mlapi.editortest.asmdef.meta rename to com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/TransportChannel.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/TransportChannel.cs index e16bbeb908..c9cb65c07b 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/TransportChannel.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/TransportChannel.cs @@ -1,6 +1,6 @@ using System; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A transport channel used by the MLAPI diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/ProfilerConstants.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/ProfilerConstants.cs index d9793fdb17..010d6a9b25 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/ProfilerConstants.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/ProfilerConstants.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode.Transports.UNET +namespace Unity.Netcode.Transports.UNET { public static class ProfilerConstants { diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs index 28b5fe6d2e..02318b8400 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.Networking; -namespace Unity.Multiplayer.Netcode.Transports.UNET +namespace Unity.Netcode.Transports.UNET { public static class RelayTransport { @@ -519,7 +519,7 @@ private static NetworkEventType BaseReceive(NetworkEventType netEvent, int hostI { if ((NetworkError)error == NetworkError.CRCMismatch) { - Debug.LogError("[MLAPI.Relay] The MLAPI Relay detected a CRC mismatch. This could be due to the maxClients or other connectionConfig settings not being the same"); + Debug.LogError("[Netcode.Relay] The MLAPI Relay detected a CRC mismatch. This could be due to the maxClients or other connectionConfig settings not being the same"); } return NetworkEventType.DisconnectEvent; diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetChannel.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetChannel.cs index 0ae32665d8..a2d0a7f0f5 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetChannel.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetChannel.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.Networking; -namespace Unity.Multiplayer.Netcode.Transports.UNET +namespace Unity.Netcode.Transports.UNET { /// /// A transport channel used by the MLAPI diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs index 6653728ca6..cb3b69bb10 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.Networking; -namespace Unity.Multiplayer.Netcode.Transports.UNET +namespace Unity.Netcode.Transports.UNET { public class UNetTransport : NetworkTransport, ITransportProfilerData { @@ -311,7 +311,7 @@ public override SocketTasks StartServer() { if (NetworkLog.CurrentLogLevel <= LogLevel.Error) { - NetworkLog.LogError("Cannot create websocket host when using Unity.Multiplayer.Netcode relay"); + NetworkLog.LogError("Cannot create websocket host when using Unity.Netcode relay"); } } } diff --git a/com.unity.multiplayer.mlapi/Runtime/com.unity.multiplayer.mlapi.runtime.asmdef b/com.unity.multiplayer.mlapi/Runtime/com.unity.multiplayer.mlapi.runtime.asmdef deleted file mode 100644 index 796aebcd3f..0000000000 --- a/com.unity.multiplayer.mlapi/Runtime/com.unity.multiplayer.mlapi.runtime.asmdef +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "Unity.Multiplayer.MLAPI.Runtime", - "rootNamespace": "Unity.Multiplayer.Netcode", - "allowUnsafeCode": true -} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef b/com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef new file mode 100644 index 0000000000..b551a4872b --- /dev/null +++ b/com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef @@ -0,0 +1,5 @@ +{ + "name": "Unity.Netcode.Runtime", + "rootNamespace": "Unity.Netcode", + "allowUnsafeCode": true +} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Runtime/com.unity.multiplayer.mlapi.runtime.asmdef.meta b/com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/com.unity.multiplayer.mlapi.runtime.asmdef.meta rename to com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/ArithmeticTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/ArithmeticTests.cs index 456cbeef61..45baf5a1c4 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/ArithmeticTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/ArithmeticTests.cs @@ -1,6 +1,6 @@ using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class ArithmeticTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs b/com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs index 2a2937d0c3..f942afd8e3 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs @@ -1,7 +1,7 @@ using System.IO; using UnityEngine; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { internal class DummyMessageHandler : IInternalMessageHandler { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/IndexAllocatorTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/IndexAllocatorTests.cs index 35a01f5449..2a04a97f1a 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/IndexAllocatorTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/IndexAllocatorTests.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using UnityEngine; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class FixedAllocatorTest { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/MessageBatcherTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/MessageBatcherTests.cs index be05c4e277..53ffaa74f0 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/MessageBatcherTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/MessageBatcherTests.cs @@ -3,7 +3,7 @@ using System.Text; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class MessageBatcherTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/MessagePacker.cs b/com.unity.multiplayer.mlapi/Tests/Editor/MessagePacker.cs index cba2cb840e..a9ff025854 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/MessagePacker.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/MessagePacker.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { internal static class MessagePacker { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs index 7f4ca6bd62..60f10b23c4 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs @@ -2,7 +2,7 @@ using UnityEngine; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class NetworkBehaviourTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBufferTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBufferTests.cs index c3e33f19a7..7930176667 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBufferTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBufferTests.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using System.Text; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class NetworkBufferTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs index 87ad2863f4..2593688ef8 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.SceneManagement; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class NetworkManagerCustomMessageManagerTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs index ad461e4912..34150595dc 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using NUnit.Framework; -using Unity.Multiplayer.Netcode.Editor; +using Unity.Netcode.Editor; using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.TestTools; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class NetworkManagerMessageHandlerTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerSceneManagerTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerSceneManagerTests.cs index 4a168dbdc8..45daa164bb 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerSceneManagerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerSceneManagerTests.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.SceneManagement; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class NetworkManagerSceneManagerTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkObjectTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkObjectTests.cs index 5a0d0e314e..186da8377c 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkObjectTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkObjectTests.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class NetworkObjectTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkSerializerTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkSerializerTests.cs index 4af630aee9..4130df5e7e 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkSerializerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/NetworkSerializerTests.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using UnityEngine; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class NetworkSerializerTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs index f41de22a0b..916f540113 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class TestTransport : ITransportProfilerData { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs index 47776c13af..5d31ef725d 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class InternalMessageHandlerProfilingDecoratorTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/SnapshotRttTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/SnapshotRttTests.cs index 0f77b308dc..7b2fa23afb 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/SnapshotRttTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/SnapshotRttTests.cs @@ -1,6 +1,6 @@ using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class SnapshotRttTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs index 761c1315b6..8913ebc74a 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using UnityEngine; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { /// /// Tests for running a as a client. diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/NetworkTimeTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/Timing/NetworkTimeTests.cs index 94f4210179..5fac93a20a 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/NetworkTimeTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/Timing/NetworkTimeTests.cs @@ -5,7 +5,7 @@ using UnityEngine; using Random = System.Random; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class NetworkTimeTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs b/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs index cb016ca958..ea5fe00701 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using UnityEngine; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { public class ServerNetworkTimeSystemTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/TimingTestHelper.cs b/com.unity.multiplayer.mlapi/Tests/Editor/Timing/TimingTestHelper.cs index 33ca2f0b01..16c840ded1 100644 --- a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/TimingTestHelper.cs +++ b/com.unity.multiplayer.mlapi/Tests/Editor/Timing/TimingTestHelper.cs @@ -2,7 +2,7 @@ using UnityEngine; using Random = System.Random; -namespace Unity.Multiplayer.Netcode.EditorTests +namespace Unity.Netcode.EditorTests { /// /// Helper functions for timing related tests. Allows to get a set of time steps and simulate time advancing without the need of a full playmode test. diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.multiplayer.mlapi.editortests.asmdef b/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.multiplayer.mlapi.editortests.asmdef deleted file mode 100644 index 978c7eb092..0000000000 --- a/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.multiplayer.mlapi.editortests.asmdef +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Unity.Multiplayer.MLAPI.EditorTests", - "rootNamespace": "Unity.Multiplayer.Netcode.EditorTests", - "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "Unity.Multiplayer.MLAPI.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" - ], - "includePlatforms": [ - "Editor" - ] -} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef b/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef new file mode 100644 index 0000000000..35dcb1ce8d --- /dev/null +++ b/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef @@ -0,0 +1,14 @@ +{ + "name": "Unity.Netcode.EditorTests", + "rootNamespace": "Unity.Netcode.EditorTests", + "references": [ + "Unity.Netcode.Runtime", + "Unity.Netcode.Editor" + ], + "optionalUnityReferences": [ + "TestAssemblies" + ], + "includePlatforms": [ + "Editor" + ] +} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.multiplayer.mlapi.editortests.asmdef.meta b/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/com.unity.multiplayer.mlapi.editortests.asmdef.meta rename to com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/BaseMultiInstanceTest.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/BaseMultiInstanceTest.cs index 49d3a3309d..de17e9e94e 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/BaseMultiInstanceTest.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/BaseMultiInstanceTest.cs @@ -5,7 +5,7 @@ using UnityEngine.TestTools; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public abstract class BaseMultiInstanceTest { @@ -71,8 +71,8 @@ public IEnumerator StartSomeClientsAndServerWithPlayers(bool useHost, int nbClie * Normally we would only allow player prefabs to be set to a prefab. Not runtime created objects. * In order to prevent having a Resource folder full of a TON of prefabs that we have to maintain, * MultiInstanceHelper has a helper function that lets you mark a runtime created object to be - * treated as a prefab by the MLAPI. That's how we can get away with creating the player prefab - * at runtime without it being treated as a SceneObject or causing other conflicts with the MLAPI. + * treated as a prefab by the Netcode. That's how we can get away with creating the player prefab + * at runtime without it being treated as a SceneObject or causing other conflicts with the Netcode. */ // Make it a prefab MultiInstanceHelpers.MakeNetworkedObjectTestPrefab(networkObject); diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/BufferDataValidationComponent.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Components/BufferDataValidationComponent.cs index a4bd4b8af0..90f7c515b2 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/BufferDataValidationComponent.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Components/BufferDataValidationComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Used in conjunction with the RpcQueueTest to validate from 1 byte to (n) MaximumBufferSize diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs index cf78b88ac4..d592845c7a 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Used in conjunction with the RpcQueueTest to validate that Rpcs are being invoked at the proper NetworkUpdateStage diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkVariableTestComponent.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkVariableTestComponent.cs index 8527cb551f..639534455b 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkVariableTestComponent.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkVariableTestComponent.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// This provides coverage for all of the predefined NetworkVariable types diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs index 13b92b5cea..3b48766df3 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs @@ -5,7 +5,7 @@ using UnityEngine.TestTools; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class ConnectionApprovalTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs index f4280b40ee..a98de19567 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs @@ -8,7 +8,7 @@ using UnityEngine.SceneManagement; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkObjectGlobalObjectIdHashTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs index e4b90f5aa9..556be87c37 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs @@ -8,7 +8,7 @@ using UnityEngine.SceneManagement; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkPrefabGlobalObjectIdHashTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkManagerHelper.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkManagerHelper.cs index c913e86741..2501a93460 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkManagerHelper.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkManagerHelper.cs @@ -3,9 +3,9 @@ using UnityEngine; using UnityEngine.SceneManagement; using NUnit.Framework; -using Unity.Multiplayer.Netcode.Transports.UNET; +using Unity.Netcode.Transports.UNET; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Helper class to instantiate a NetworkManager diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkVariableHelper.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkVariableHelper.cs index 4285e20bce..b6d56486b3 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkVariableHelper.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkVariableHelper.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Will automatically register for the NetworkVariable OnValueChanged diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/NamedMessageTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/NamedMessageTests.cs index cd010a771a..c3e397b278 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/NamedMessageTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/NamedMessageTests.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NamedMessageTests : BaseMultiInstanceTest { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/UnnamedMessageTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/UnnamedMessageTests.cs index 91cc9ec87f..f7d27b62fa 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/UnnamedMessageTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/UnnamedMessageTests.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class UnnamedMessageTests : BaseMultiInstanceTest { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstanceHelpers.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstanceHelpers.cs index c6756de2c1..f3297b6ccd 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstanceHelpers.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstanceHelpers.cs @@ -7,7 +7,7 @@ using UnityEngine.SceneManagement; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Provides helpers for running multi instance tests. @@ -208,8 +208,8 @@ public class CoroutineResultWrapper /// Normally we would only allow player prefabs to be set to a prefab. Not runtime created objects. /// In order to prevent having a Resource folder full of a TON of prefabs that we have to maintain, /// MultiInstanceHelper has a helper function that lets you mark a runtime created object to be - /// treated as a prefab by the MLAPI. That's how we can get away with creating the player prefab - /// at runtime without it being treated as a SceneObject or causing other conflicts with the MLAPI. + /// treated as a prefab by the Netcode. That's how we can get away with creating the player prefab + /// at runtime without it being treated as a SceneObject or causing other conflicts with the Netcode. /// /// The networkObject to be treated as Prefab /// The GlobalObjectId to force diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkBehaviourUpdaterTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkBehaviourUpdaterTests.cs index 8453a792a2..6efcf68ed3 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkBehaviourUpdaterTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkBehaviourUpdaterTests.cs @@ -6,7 +6,7 @@ using UnityEngine.TestTools; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkBehaviourUpdaterTests : BaseMultiInstanceTest { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs index a2869d8cc2..2bc2c37d26 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs @@ -4,7 +4,7 @@ using UnityEngine.TestTools; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Tests calling destroy on spawned / unspawned s. Expected behavior: diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs index b707ac872a..37d262d516 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkObjectOnSpawnTests : BaseMultiInstanceTest { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs index b509516acb..d584379747 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs @@ -2,7 +2,7 @@ using UnityEngine; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkObjectSceneSerializationTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs index 124279c37d..0b8ab55ee3 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs @@ -3,7 +3,7 @@ using UnityEngine; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// The NetworkPrefabHandler unit tests validates: diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSceneManagerTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSceneManagerTests.cs index eb10bf08fc..4968fbb89f 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSceneManagerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSceneManagerTests.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkSceneManagerTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSpawnManagerTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSpawnManagerTests.cs index bf7f6a7620..621ba68f93 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSpawnManagerTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSpawnManagerTests.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkSpawnManagerTests : BaseMultiInstanceTest { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransformTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransformTests.cs index 5fe100a6d4..60960d57a1 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransformTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransformTests.cs @@ -1,13 +1,13 @@ using System; using System.Collections; using System.Text.RegularExpressions; -using Unity.Multiplayer.Netcode.Prototyping; +using Unity.Netcode.Prototyping; using NUnit.Framework; using UnityEngine; using UnityEngine.TestTools; -using static Unity.Multiplayer.Netcode.Prototyping.NetworkTransform; +using static Unity.Netcode.Prototyping.NetworkTransform; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { [TestFixture(true)] [TestFixture(false)] diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs index 58a03a8c2f..13e7d75ced 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs @@ -7,7 +7,7 @@ using UnityEngine.LowLevel; using UnityEngine.PlayerLoop; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkUpdateLoopTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs index 401efaa6b5..f64e97915c 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs @@ -4,7 +4,7 @@ using UnityEngine.TestTools; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkVariableTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs index ab1ec723fc..9f1386bae7 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs @@ -10,7 +10,7 @@ using UnityEngine.SceneManagement; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class NetworkObjectParentingTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs index cde772fddb..5b6a592b67 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs @@ -1,4 +1,4 @@ -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class ReparentingCubeNetBhv : NetworkBehaviour { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Profiling/NetworkVariableNameTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Profiling/NetworkVariableNameTests.cs index f8b253262d..82b9e559b1 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Profiling/NetworkVariableNameTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Profiling/NetworkVariableNameTests.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public sealed class NetworkVariableNameTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcPipelineTestComponent.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/RpcPipelineTestComponent.cs index e6c5ba567f..aac8709ae0 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcPipelineTestComponent.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/RpcPipelineTestComponent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Used in conjunction with the RpcQueueTest to validate: diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcQueueTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/RpcQueueTests.cs index 634b77d54c..0d1a9b12a3 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcQueueTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/RpcQueueTests.cs @@ -5,7 +5,7 @@ using UnityEngine.TestTools; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// The RpcQueue unit tests validate: diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/RpcTests.cs index 3ad39f1a27..50ca4f699e 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/RpcTests.cs @@ -4,7 +4,7 @@ using UnityEngine.TestTools; using Debug = UnityEngine.Debug; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { public class RpcTests : BaseMultiInstanceTest { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/NetworkTimeSystemTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/NetworkTimeSystemTests.cs index fd58f5cef9..caee7334f3 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/NetworkTimeSystemTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/NetworkTimeSystemTests.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Runtime tests to test the network time system with the Unity player loop. diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/TimeMultiInstanceTest.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/TimeMultiInstanceTest.cs index bfc3330b9f..98330b286d 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/TimeMultiInstanceTest.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/TimeMultiInstanceTest.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// Tests the times of two clients connecting to a server using the SIPTransport (returns 50ms RTT but has no latency simulation) @@ -112,8 +112,8 @@ private IEnumerator StartSomeClientsAndServerWithPlayersCustom(bool useHost, int * Normally we would only allow player prefabs to be set to a prefab. Not runtime created objects. * In order to prevent having a Resource folder full of a TON of prefabs that we have to maintain, * MultiInstanceHelper has a helper function that lets you mark a runtime created object to be - * treated as a prefab by the MLAPI. That's how we can get away with creating the player prefab - * at runtime without it being treated as a SceneObject or causing other conflicts with the MLAPI. + * treated as a prefab by the Netcode. That's how we can get away with creating the player prefab + * at runtime without it being treated as a SceneObject or causing other conflicts with the Netcode. */ // Make it a prefab MultiInstanceHelpers.MakeNetworkedObjectTestPrefab(networkObject); diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs index 9d73b5131d..909a061a89 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Unity.Multiplayer.Netcode.Editor; +using Unity.Netcode.Editor; using UnityEngine; -namespace Unity.Multiplayer.Netcode.RuntimeTests +namespace Unity.Netcode.RuntimeTests { /// /// SIPTransport (SIngleProcessTransport) diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransportTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransportTests.cs index cb1b0fa0f3..6d5f3246d0 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransportTests.cs +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransportTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using UnityEngine; -namespace Unity.Multiplayer.Netcode.RuntimeTests.Transport +namespace Unity.Netcode.RuntimeTests.Transport { public class SIPTransportTests { diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.multiplayer.mlapi.runtimetests.asmdef b/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.multiplayer.mlapi.runtimetests.asmdef deleted file mode 100644 index 40d517e866..0000000000 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.multiplayer.mlapi.runtimetests.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Unity.Multiplayer.MLAPI.RuntimeTests", - "rootNamespace": "Unity.Multiplayer.Netcode.RuntimeTests", - "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "Unity.Multiplayer.MLAPI.Editor", - "Unity.Multiplayer.MLAPI.Prototyping" - ], - "optionalUnityReferences": [ - "TestAssemblies" - ], - "defineConstraints": [ - "UNITY_INCLUDE_TESTS", - "UNITY_EDITOR" - ] -} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef b/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef new file mode 100644 index 0000000000..f835af1486 --- /dev/null +++ b/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef @@ -0,0 +1,16 @@ +{ + "name": "Unity.Netcode.RuntimeTests", + "rootNamespace": "Unity.Netcode.RuntimeTests", + "references": [ + "Unity.Netcode.Runtime", + "Unity.Netcode.Editor", + "Unity.Netcode.Prototyping" + ], + "optionalUnityReferences": [ + "TestAssemblies" + ], + "defineConstraints": [ + "UNITY_INCLUDE_TESTS", + "UNITY_EDITOR" + ] +} \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.multiplayer.mlapi.runtimetests.asmdef.meta b/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.multiplayer.mlapi.runtimetests.asmdef.meta rename to com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef.meta diff --git a/com.unity.multiplayer.transport.utp/Runtime/UTPTransport.cs b/com.unity.multiplayer.transport.utp/Runtime/UTPTransport.cs index 3da309ac5f..b525b8afa3 100644 --- a/com.unity.multiplayer.transport.utp/Runtime/UTPTransport.cs +++ b/com.unity.multiplayer.transport.utp/Runtime/UTPTransport.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using Unity.Burst; using Unity.Collections; @@ -13,7 +13,7 @@ using UnityEngine.Assertions; using NetworkEvent = Unity.Networking.Transport.NetworkEvent; -using NetcodeEvent = Unity.Multiplayer.Netcode.NetworkEvent; +using NetcodeEvent = Unity.Netcode.NetworkEvent; [StructLayout(LayoutKind.Explicit)] public unsafe struct RawNetworkMessage diff --git a/com.unity.multiplayer.transport.utp/Runtime/com.unity.multiplayer.transport.utp.asmdef b/com.unity.multiplayer.transport.utp/Runtime/com.unity.multiplayer.transport.utp.asmdef index 3671d6a15a..d40cfa55ab 100644 --- a/com.unity.multiplayer.transport.utp/Runtime/com.unity.multiplayer.transport.utp.asmdef +++ b/com.unity.multiplayer.transport.utp/Runtime/com.unity.multiplayer.transport.utp.asmdef @@ -1,20 +1,11 @@ { "name": "Unity.Multiplayer.Transport.UTP", - "rootNamespace": "", "references": [ "Unity.Collections", "Unity.Networking.Transport", "Unity.Jobs", "Unity.Burst", - "Unity.Multiplayer.MLAPI.Runtime" + "Unity.Netcode.Runtime" ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": true, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false + "allowUnsafeCode": true } \ No newline at end of file diff --git a/com.unity.multiplayer.transport.utp/Tests/Editor/BasicUTPTest.cs b/com.unity.multiplayer.transport.utp/Tests/Editor/BasicUTPTest.cs index 3d176663da..e2caac3363 100644 --- a/com.unity.multiplayer.transport.utp/Tests/Editor/BasicUTPTest.cs +++ b/com.unity.multiplayer.transport.utp/Tests/Editor/BasicUTPTest.cs @@ -1,7 +1,7 @@ using UnityEngine; using NUnit.Framework; -namespace Unity.Multiplayer.Netcode.UTP.EditorTests +namespace Unity.Netcode.UTP.EditorTests { public class BasicUTPTest : MonoBehaviour { diff --git a/com.unity.multiplayer.transport.utp/Tests/Editor/com.unity.multiplayer.transport.utp.editortests.asmdef b/com.unity.multiplayer.transport.utp/Tests/Editor/com.unity.multiplayer.transport.utp.editortests.asmdef index 406f3df974..5faffd6ef4 100644 --- a/com.unity.multiplayer.transport.utp/Tests/Editor/com.unity.multiplayer.transport.utp.editortests.asmdef +++ b/com.unity.multiplayer.transport.utp/Tests/Editor/com.unity.multiplayer.transport.utp.editortests.asmdef @@ -1,26 +1,15 @@ { "name": "Unity.Multiplayer.Transport.UTP.EditorTests", - "rootNamespace": "Unity.Multiplayer.Netcode.UTP.EditorTests", + "rootNamespace": "Unity.Netcode.UTP.EditorTests", "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "UnityEngine.TestRunner", - "UnityEditor.TestRunner", + "Unity.Netcode.Runtime", "Unity.Networking.Transport", "Unity.Multiplayer.Transport.UTP" ], + "optionalUnityReferences": [ + "TestAssemblies" + ], "includePlatforms": [ "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false + ] } \ No newline at end of file diff --git a/com.unity.multiplayer.transport.utp/Tests/Runtime/DummyTestScript.cs b/com.unity.multiplayer.transport.utp/Tests/Runtime/DummyTestScript.cs index a5ced74f88..d1a86747b6 100644 --- a/com.unity.multiplayer.transport.utp/Tests/Runtime/DummyTestScript.cs +++ b/com.unity.multiplayer.transport.utp/Tests/Runtime/DummyTestScript.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.UTP.RuntimeTests +namespace Unity.Netcode.UTP.RuntimeTests { public class DummyTestScript { diff --git a/com.unity.multiplayer.transport.utp/Tests/Runtime/com.unity.multiplayer.transport.utp.runtimetests.asmdef b/com.unity.multiplayer.transport.utp/Tests/Runtime/com.unity.multiplayer.transport.utp.runtimetests.asmdef index af5b83ac87..9c019de54b 100644 --- a/com.unity.multiplayer.transport.utp/Tests/Runtime/com.unity.multiplayer.transport.utp.runtimetests.asmdef +++ b/com.unity.multiplayer.transport.utp/Tests/Runtime/com.unity.multiplayer.transport.utp.runtimetests.asmdef @@ -1,24 +1,12 @@ { "name": "Unity.Multiplayer.Transport.UTP.RuntimeTests", - "rootNamespace": "Unity.Multiplayer.Netcode.UTP.RuntimeTests", + "rootNamespace": "Unity.Netcode.UTP.RuntimeTests", "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "UnityEngine.TestRunner", - "UnityEditor.TestRunner", - "Unity MLAPI Transport", + "Unity.Netcode.Runtime", "Unity.Networking.Transport" ], "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, "defineConstraints": [ "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false + ] } \ No newline at end of file diff --git a/testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObjectComponent.cs b/testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObjectComponent.cs index 27f308b611..9e96de0a12 100644 --- a/testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObjectComponent.cs +++ b/testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObjectComponent.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.UI; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; public class EnableDisableSceneNetworkObjectComponent : NetworkBehaviour { diff --git a/testproject/Assets/Scripts/CommandLineHandler.cs b/testproject/Assets/Scripts/CommandLineHandler.cs index b0138fe87e..4c5740b642 100644 --- a/testproject/Assets/Scripts/CommandLineHandler.cs +++ b/testproject/Assets/Scripts/CommandLineHandler.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; -using Unity.Multiplayer.Netcode; -using Unity.Multiplayer.Netcode.Transports.UNET; +using Unity.Netcode; +using Unity.Netcode.Transports.UNET; /// diff --git a/testproject/Assets/Scripts/ConnectionModeScript.cs b/testproject/Assets/Scripts/ConnectionModeScript.cs index 2a30b8adbf..4ab904676b 100644 --- a/testproject/Assets/Scripts/ConnectionModeScript.cs +++ b/testproject/Assets/Scripts/ConnectionModeScript.cs @@ -1,6 +1,6 @@ using System.Collections; using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; /// /// Used in tandem with the ConnectModeButtons prefab asset in test project diff --git a/testproject/Assets/Scripts/ExitButtonScript.cs b/testproject/Assets/Scripts/ExitButtonScript.cs index 8b1f37f1ad..d1cbe9c111 100644 --- a/testproject/Assets/Scripts/ExitButtonScript.cs +++ b/testproject/Assets/Scripts/ExitButtonScript.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.SceneManagement; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; public class ExitButtonScript : MonoBehaviour { diff --git a/testproject/Assets/Scripts/GrabbableBall.cs b/testproject/Assets/Scripts/GrabbableBall.cs index 70ff3db312..866f602ef3 100644 --- a/testproject/Assets/Scripts/GrabbableBall.cs +++ b/testproject/Assets/Scripts/GrabbableBall.cs @@ -1,5 +1,5 @@ using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; public class GrabbableBall : NetworkBehaviour { diff --git a/testproject/Assets/Scripts/PlayerMovement.cs b/testproject/Assets/Scripts/PlayerMovement.cs index efd893334b..77216d97b9 100644 --- a/testproject/Assets/Scripts/PlayerMovement.cs +++ b/testproject/Assets/Scripts/PlayerMovement.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using UnityEngine; public class PlayerMovement : NetworkBehaviour diff --git a/testproject/Assets/Scripts/Raygun.cs b/testproject/Assets/Scripts/Raygun.cs index f9c56f0a6d..fd1cbbc94c 100644 --- a/testproject/Assets/Scripts/Raygun.cs +++ b/testproject/Assets/Scripts/Raygun.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; public class Raygun : NetworkBehaviour { diff --git a/testproject/Assets/Scripts/ScalingCube.cs b/testproject/Assets/Scripts/ScalingCube.cs index 1b6309bd8f..dda38406a8 100644 --- a/testproject/Assets/Scripts/ScalingCube.cs +++ b/testproject/Assets/Scripts/ScalingCube.cs @@ -1,4 +1,4 @@ -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using UnityEngine; public class ScalingCube : MonoBehaviour diff --git a/testproject/Assets/Scripts/ScriptsForAutomatedTesting/ScriptsForAutomatedTesting.asmdef b/testproject/Assets/Scripts/ScriptsForAutomatedTesting/ScriptsForAutomatedTesting.asmdef index 4bae6efa89..9fe55e0fe3 100644 --- a/testproject/Assets/Scripts/ScriptsForAutomatedTesting/ScriptsForAutomatedTesting.asmdef +++ b/testproject/Assets/Scripts/ScriptsForAutomatedTesting/ScriptsForAutomatedTesting.asmdef @@ -1,17 +1,6 @@ { "name": "ScriptsForAutomatedTesting", - "rootNamespace": "", "references": [ - "GUID:753245531f1b64a6ea7491ec63a5947c", - "GUID:1491147abca9d7d4bb7105af628b223e" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false + "Unity.Netcode.Runtime" + ] } \ No newline at end of file diff --git a/testproject/Assets/Scripts/SyncTransform.cs b/testproject/Assets/Scripts/SyncTransform.cs index b97cd4b8c4..059b3a9369 100644 --- a/testproject/Assets/Scripts/SyncTransform.cs +++ b/testproject/Assets/Scripts/SyncTransform.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Unity.Multiplayer.Netcode +namespace Unity.Netcode { /// /// A component for syncing variables diff --git a/testproject/Assets/Scripts/UIController.cs b/testproject/Assets/Scripts/UIController.cs index 844dbe0433..8b71f5b856 100644 --- a/testproject/Assets/Scripts/UIController.cs +++ b/testproject/Assets/Scripts/UIController.cs @@ -1,5 +1,5 @@ using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; public class UIController : MonoBehaviour { diff --git a/testproject/Assets/Scripts/UnityChanSpawner.cs b/testproject/Assets/Scripts/UnityChanSpawner.cs index 74738e9fb7..6405aeb955 100644 --- a/testproject/Assets/Scripts/UnityChanSpawner.cs +++ b/testproject/Assets/Scripts/UnityChanSpawner.cs @@ -1,4 +1,4 @@ -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using UnityEngine; public class UnityChanSpawner : MonoBehaviour diff --git a/testproject/Assets/Scripts/testproject.asmdef b/testproject/Assets/Scripts/testproject.asmdef index a181237134..1d062c1467 100644 --- a/testproject/Assets/Scripts/testproject.asmdef +++ b/testproject/Assets/Scripts/testproject.asmdef @@ -1,8 +1,8 @@ { "name": "TestProject", "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "Unity.Multiplayer.MLAPI.Editor", - "Unity.Multiplayer.MLAPI.Prototyping" + "Unity.Netcode.Runtime", + "Unity.Netcode.Editor", + "Unity.Netcode.Prototyping" ] } \ No newline at end of file diff --git a/testproject/Assets/Tests/Editor/testproject.editortests.asmdef b/testproject/Assets/Tests/Editor/testproject.editortests.asmdef index 14fdc09bce..9495d3cc11 100644 --- a/testproject/Assets/Tests/Editor/testproject.editortests.asmdef +++ b/testproject/Assets/Tests/Editor/testproject.editortests.asmdef @@ -2,8 +2,8 @@ "name": "TestProject.EditorTests", "rootNamespace": "TestProject.EditorTests", "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "Unity.Multiplayer.MLAPI.Editor" + "Unity.Netcode.Runtime", + "Unity.Netcode.Editor" ], "optionalUnityReferences": [ "TestAssemblies" diff --git a/testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs b/testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs index 50322a4802..e587477aae 100644 --- a/testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs +++ b/testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs index a5973538b4..f24d57f625 100644 --- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs +++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs @@ -1,5 +1,5 @@ -using Unity.Multiplayer.Netcode; -using Unity.Multiplayer.Netcode.Prototyping; +using Unity.Netcode; +using Unity.Netcode.Prototyping; using UnityEngine; namespace Tests.Manual.NetworkAnimatorTests diff --git a/testproject/Assets/Tests/Manual/Scripts/BandwidthTest.cs b/testproject/Assets/Tests/Manual/Scripts/BandwidthTest.cs index 5304c82f9e..264414d1e9 100644 --- a/testproject/Assets/Tests/Manual/Scripts/BandwidthTest.cs +++ b/testproject/Assets/Tests/Manual/Scripts/BandwidthTest.cs @@ -1,5 +1,5 @@ using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs b/testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs index 8c20233ab2..8fd734007a 100644 --- a/testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs +++ b/testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs @@ -2,7 +2,7 @@ using System.Text; using UnityEngine; using UnityEngine.UI; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/Scripts/GenericNetworkObjectBehaviour.cs b/testproject/Assets/Tests/Manual/Scripts/GenericNetworkObjectBehaviour.cs index b2c133edcb..ba7f496c84 100644 --- a/testproject/Assets/Tests/Manual/Scripts/GenericNetworkObjectBehaviour.cs +++ b/testproject/Assets/Tests/Manual/Scripts/GenericNetworkObjectBehaviour.cs @@ -1,4 +1,4 @@ -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using UnityEngine; namespace TestProject.ManualTests diff --git a/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs b/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs index 9803b11c97..4ea73ddc77 100644 --- a/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs +++ b/testproject/Assets/Tests/Manual/Scripts/ManualNetworkVariableTest.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/Scripts/NetworkManagerHud.cs b/testproject/Assets/Tests/Manual/Scripts/NetworkManagerHud.cs index 2f3354f114..e24261c473 100644 --- a/testproject/Assets/Tests/Manual/Scripts/NetworkManagerHud.cs +++ b/testproject/Assets/Tests/Manual/Scripts/NetworkManagerHud.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -using Unity.Multiplayer.Netcode; -using Unity.Multiplayer.Netcode.Transports.UNET; +using Unity.Netcode; +using Unity.Netcode.Transports.UNET; using UnityEngine; namespace TestProject.ManualTests diff --git a/testproject/Assets/Tests/Manual/Scripts/NetworkPrefabPool.cs b/testproject/Assets/Tests/Manual/Scripts/NetworkPrefabPool.cs index 12fd9e752b..f6024665a2 100644 --- a/testproject/Assets/Tests/Manual/Scripts/NetworkPrefabPool.cs +++ b/testproject/Assets/Tests/Manual/Scripts/NetworkPrefabPool.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/Scripts/NetworkSceneManagerCallbackTests.cs b/testproject/Assets/Tests/Manual/Scripts/NetworkSceneManagerCallbackTests.cs index bd06336172..a4b04d458e 100644 --- a/testproject/Assets/Tests/Manual/Scripts/NetworkSceneManagerCallbackTests.cs +++ b/testproject/Assets/Tests/Manual/Scripts/NetworkSceneManagerCallbackTests.cs @@ -1,5 +1,5 @@ using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/Scripts/PlayerColor.cs b/testproject/Assets/Tests/Manual/Scripts/PlayerColor.cs index c24de583f3..457d4044c9 100644 --- a/testproject/Assets/Tests/Manual/Scripts/PlayerColor.cs +++ b/testproject/Assets/Tests/Manual/Scripts/PlayerColor.cs @@ -1,4 +1,4 @@ -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using System; using UnityEngine; diff --git a/testproject/Assets/Tests/Manual/Scripts/PlayerMovementManager.cs b/testproject/Assets/Tests/Manual/Scripts/PlayerMovementManager.cs index 136fdc4dbc..e762c07978 100644 --- a/testproject/Assets/Tests/Manual/Scripts/PlayerMovementManager.cs +++ b/testproject/Assets/Tests/Manual/Scripts/PlayerMovementManager.cs @@ -1,5 +1,5 @@ using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests diff --git a/testproject/Assets/Tests/Manual/Scripts/RandomMovement.cs b/testproject/Assets/Tests/Manual/Scripts/RandomMovement.cs index 56b04c3047..9c9a10adee 100644 --- a/testproject/Assets/Tests/Manual/Scripts/RandomMovement.cs +++ b/testproject/Assets/Tests/Manual/Scripts/RandomMovement.cs @@ -1,5 +1,5 @@ using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/Scripts/StatsDisplay.cs b/testproject/Assets/Tests/Manual/Scripts/StatsDisplay.cs index 2a252ec15a..100c370961 100644 --- a/testproject/Assets/Tests/Manual/Scripts/StatsDisplay.cs +++ b/testproject/Assets/Tests/Manual/Scripts/StatsDisplay.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/Scripts/StatsInfoContainer.cs b/testproject/Assets/Tests/Manual/Scripts/StatsInfoContainer.cs index d24a130ba5..0818c85834 100644 --- a/testproject/Assets/Tests/Manual/Scripts/StatsInfoContainer.cs +++ b/testproject/Assets/Tests/Manual/Scripts/StatsInfoContainer.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/Scripts/SwitchSceneHandler.cs b/testproject/Assets/Tests/Manual/Scripts/SwitchSceneHandler.cs index 2f01b311ef..e4d56c4ee6 100644 --- a/testproject/Assets/Tests/Manual/Scripts/SwitchSceneHandler.cs +++ b/testproject/Assets/Tests/Manual/Scripts/SwitchSceneHandler.cs @@ -1,6 +1,6 @@ using System.Collections; using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.ManualTests { diff --git a/testproject/Assets/Tests/Manual/testproject.manualtests.asmdef b/testproject/Assets/Tests/Manual/testproject.manualtests.asmdef index 593f1822b8..87b8fcd958 100644 --- a/testproject/Assets/Tests/Manual/testproject.manualtests.asmdef +++ b/testproject/Assets/Tests/Manual/testproject.manualtests.asmdef @@ -3,8 +3,8 @@ "rootNamespace": "TestProject.ManualTests", "references": [ "TestProject", - "Unity.Multiplayer.MLAPI.Runtime", - "Unity.Multiplayer.MLAPI.Editor", - "Unity.Multiplayer.MLAPI.Prototyping" + "Unity.Netcode.Runtime", + "Unity.Netcode.Editor", + "Unity.Netcode.Prototyping" ] } diff --git a/testproject/Assets/Tests/Runtime/FixedUpdateMessagesAreOnlyProcessedOnceTest.cs b/testproject/Assets/Tests/Runtime/FixedUpdateMessagesAreOnlyProcessedOnceTest.cs index 533d367d42..c79a0f7979 100644 --- a/testproject/Assets/Tests/Runtime/FixedUpdateMessagesAreOnlyProcessedOnceTest.cs +++ b/testproject/Assets/Tests/Runtime/FixedUpdateMessagesAreOnlyProcessedOnceTest.cs @@ -1,6 +1,6 @@ using System.Collections; -using Unity.Multiplayer.Netcode; -using Unity.Multiplayer.Netcode.RuntimeTests; +using Unity.Netcode; +using Unity.Netcode.RuntimeTests; using NUnit.Framework; using TestProject.RuntimeTests.Support; using UnityEngine; diff --git a/testproject/Assets/Tests/Runtime/MessageOrdering.cs b/testproject/Assets/Tests/Runtime/MessageOrdering.cs index b968bb0e34..124d31b9c0 100644 --- a/testproject/Assets/Tests/Runtime/MessageOrdering.cs +++ b/testproject/Assets/Tests/Runtime/MessageOrdering.cs @@ -1,6 +1,6 @@ using System.Collections; -using Unity.Multiplayer.Netcode; -using Unity.Multiplayer.Netcode.RuntimeTests; +using Unity.Netcode; +using Unity.Netcode.RuntimeTests; using NUnit.Framework; using TestProject.RuntimeTests.Support; using UnityEngine; diff --git a/testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs b/testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs index 868bfa179c..da85f8b9ab 100644 --- a/testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs +++ b/testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs @@ -4,8 +4,8 @@ using NUnit.Framework; using UnityEngine; using UnityEngine.TestTools; -using Unity.Multiplayer.Netcode.RuntimeTests; -using Unity.Multiplayer.Netcode; +using Unity.Netcode.RuntimeTests; +using Unity.Netcode; using Debug = UnityEngine.Debug; namespace TestProject.RuntimeTests diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/BaseMultiprocessTests.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/BaseMultiprocessTests.cs index a041f9c9d0..7fd4980bb4 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/BaseMultiprocessTests.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/BaseMultiprocessTests.cs @@ -6,7 +6,7 @@ using UnityEngine.TestTools; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.MultiprocessRuntimeTests +namespace Unity.Netcode.MultiprocessRuntimeTests { public class MultiprocessTestsAttribute : CategoryAttribute { diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/ExecuteStepInContext.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/ExecuteStepInContext.cs index 615a9f35fd..126e0dc381 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/ExecuteStepInContext.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/ExecuteStepInContext.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Linq; using System.Reflection; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using NUnit.Framework; using NUnit.Framework.Interfaces; using UnityEngine; diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/ExecuteStepInContextTests.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/ExecuteStepInContextTests.cs index 53e1e25533..0330d35c0c 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/ExecuteStepInContextTests.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/ExecuteStepInContextTests.cs @@ -6,7 +6,7 @@ using UnityEngine.TestTools; using static ExecuteStepInContext; -namespace Unity.Multiplayer.Netcode.MultiprocessRuntimeTests +namespace Unity.Netcode.MultiprocessRuntimeTests { /// /// Smoke tests for ExecuteStepInContext, to make sure it's working properly before being used in other tests diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/BuildMultiprocessTestPlayer.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/BuildMultiprocessTestPlayer.cs index 08289b47fd..8f344061aa 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/BuildMultiprocessTestPlayer.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/BuildMultiprocessTestPlayer.cs @@ -6,7 +6,7 @@ #endif using UnityEngine; -namespace Unity.Multiplayer.Netcode.MultiprocessRuntimeTests +namespace Unity.Netcode.MultiprocessRuntimeTests { /// /// This is needed as Unity throws "An abnormal situation has occurred: the PlayerLoop internal function has been called recursively. Please contact Customer Support with a sample project so that we can reproduce the problem and troubleshoot it." diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/CustomPrefabSpawnerForPerformanceTests.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/CustomPrefabSpawnerForPerformanceTests.cs index 1ad92132b1..41558e04dc 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/CustomPrefabSpawnerForPerformanceTests.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/CustomPrefabSpawnerForPerformanceTests.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Multiplayer.Netcode.MultiprocessRuntimeTests +namespace Unity.Netcode.MultiprocessRuntimeTests { public class CustomPrefabSpawnerForPerformanceTests : INetworkPrefabInstanceHandler, IDisposable where T : NetworkBehaviour { diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/GameObjectPool.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/GameObjectPool.cs index d942a7b7a2..41224a47c5 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/GameObjectPool.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/GameObjectPool.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.MultiprocessRuntimeTests +namespace Unity.Netcode.MultiprocessRuntimeTests { /// /// Have to implement our own pool here for compatibility with Unity 2020LTS diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/MultiprocessOrchestration.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/MultiprocessOrchestration.cs index 247c6ed846..3aca8b52b7 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/MultiprocessOrchestration.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/Helpers/MultiprocessOrchestration.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Diagnostics; using System.IO; -using Unity.Multiplayer.Netcode.MultiprocessRuntimeTests; +using Unity.Netcode.MultiprocessRuntimeTests; using System.Linq; using UnityEngine; using Debug = UnityEngine.Debug; diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/NetworkVariablePerformanceTests.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/NetworkVariablePerformanceTests.cs index f032f93815..dbf8e48e57 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/NetworkVariablePerformanceTests.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/NetworkVariablePerformanceTests.cs @@ -10,7 +10,7 @@ using static ExecuteStepInContext; using Object = UnityEngine.Object; -namespace Unity.Multiplayer.Netcode.MultiprocessRuntimeTests +namespace Unity.Netcode.MultiprocessRuntimeTests { public class NetworkVariablePerformanceTests : BaseMultiprocessTests { diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinator.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinator.cs index 0a8ae1e571..8664a7c3e1 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinator.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinator.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using NUnit.Framework; using UnityEngine; using Debug = UnityEngine.Debug; diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinatorTests.cs b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinatorTests.cs index 3760ca0d4f..1d10199fa5 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinatorTests.cs +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/TestCoordinatorTests.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.TestTools; -namespace Unity.Multiplayer.Netcode.MultiprocessRuntimeTests +namespace Unity.Netcode.MultiprocessRuntimeTests { [TestFixture(1)] [TestFixture(2)] diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/com.unity.multiplayer.mlapi.multiprocessruntime.asmdef b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/com.unity.multiplayer.mlapi.multiprocessruntime.asmdef deleted file mode 100644 index 43f80edd04..0000000000 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/com.unity.multiplayer.mlapi.multiprocessruntime.asmdef +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "Unity.Multiplayer.MLAPI.MultiprocessRuntime", - "rootNamespace": "", - "references": [ - "Unity.Multiplayer.MLAPI.Runtime", - "UnityEngine.TestRunner", - "UnityEditor.TestRunner", - "ScriptsForAutomatedTesting", - "Unity.PerformanceTesting", - "MultiprocessTestsHelpers" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/doc.meta b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/doc.meta deleted file mode 100644 index 9f17fffaab..0000000000 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/doc.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f8deeb8a7251246dd99384a899d4597c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/readme.md b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/readme.md index d48067c37b..ca9c451eb6 100644 --- a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/readme.md +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/readme.md @@ -80,7 +80,7 @@ using UnityEngine.Profiling; using UnityEngine.TestTools; using static ExecuteStepInContext; -namespace Unity.Multiplayer.Netcode.MultiprocessRuntimeTests +namespace Unity.Netcode.MultiprocessRuntimeTests { public class DemoProcessTest : BaseMultiprocessTests { diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/testproject.multiprocesstests.asmdef b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/testproject.multiprocesstests.asmdef new file mode 100644 index 0000000000..d7b8bc6159 --- /dev/null +++ b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/testproject.multiprocesstests.asmdef @@ -0,0 +1,11 @@ +{ + "name": "TestProject.MultiprocessTests", + "references": [ + "Unity.Netcode.Runtime", + "ScriptsForAutomatedTesting", + "Unity.PerformanceTesting" + ], + "optionalUnityReferences": [ + "TestAssemblies" + ] +} \ No newline at end of file diff --git a/testproject/Assets/Tests/Runtime/MultiprocessRuntime/com.unity.multiplayer.mlapi.multiprocessruntime.asmdef.meta b/testproject/Assets/Tests/Runtime/MultiprocessRuntime/testproject.multiprocesstests.asmdef.meta similarity index 100% rename from testproject/Assets/Tests/Runtime/MultiprocessRuntime/com.unity.multiplayer.mlapi.multiprocessruntime.asmdef.meta rename to testproject/Assets/Tests/Runtime/MultiprocessRuntime/testproject.multiprocesstests.asmdef.meta diff --git a/testproject/Assets/Tests/Runtime/RpcINetworkSerializable.cs b/testproject/Assets/Tests/Runtime/RpcINetworkSerializable.cs index a5d0a9465f..46e1484fc8 100644 --- a/testproject/Assets/Tests/Runtime/RpcINetworkSerializable.cs +++ b/testproject/Assets/Tests/Runtime/RpcINetworkSerializable.cs @@ -3,8 +3,8 @@ using NUnit.Framework; using UnityEngine; using UnityEngine.TestTools; -using Unity.Multiplayer.Netcode; -using Unity.Multiplayer.Netcode.RuntimeTests; +using Unity.Netcode; +using Unity.Netcode.RuntimeTests; namespace TestProject.RuntimeTests { diff --git a/testproject/Assets/Tests/Runtime/RpcTestsAutomated.cs b/testproject/Assets/Tests/Runtime/RpcTestsAutomated.cs index 5e929c8edd..31f71ec1b4 100644 --- a/testproject/Assets/Tests/Runtime/RpcTestsAutomated.cs +++ b/testproject/Assets/Tests/Runtime/RpcTestsAutomated.cs @@ -5,8 +5,8 @@ using UnityEngine; using UnityEngine.TestTools; using TestProject.ManualTests; -using Unity.Multiplayer.Netcode.RuntimeTests; -using Unity.Multiplayer.Netcode; +using Unity.Netcode.RuntimeTests; +using Unity.Netcode; using Debug = UnityEngine.Debug; namespace TestProject.RuntimeTests diff --git a/testproject/Assets/Tests/Runtime/SceneLoadingTest.cs b/testproject/Assets/Tests/Runtime/SceneLoadingTest.cs index d48d1c0d9e..cdb85177c1 100644 --- a/testproject/Assets/Tests/Runtime/SceneLoadingTest.cs +++ b/testproject/Assets/Tests/Runtime/SceneLoadingTest.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using UnityEngine.TestTools; using UnityEngine.SceneManagement; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; namespace TestProject.RuntimeTests { diff --git a/testproject/Assets/Tests/Runtime/Support/SpawnRpcDespawn.cs b/testproject/Assets/Tests/Runtime/Support/SpawnRpcDespawn.cs index 728682d4cb..0b7ac56369 100644 --- a/testproject/Assets/Tests/Runtime/Support/SpawnRpcDespawn.cs +++ b/testproject/Assets/Tests/Runtime/Support/SpawnRpcDespawn.cs @@ -1,5 +1,5 @@ using System; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using NUnit.Framework; using UnityEngine; diff --git a/testproject/Assets/Tests/Runtime/Support/SpawnRpcDespawnInstanceHandler.cs b/testproject/Assets/Tests/Runtime/Support/SpawnRpcDespawnInstanceHandler.cs index e8e9c1a120..5e2c5b2990 100644 --- a/testproject/Assets/Tests/Runtime/Support/SpawnRpcDespawnInstanceHandler.cs +++ b/testproject/Assets/Tests/Runtime/Support/SpawnRpcDespawnInstanceHandler.cs @@ -1,4 +1,4 @@ -using Unity.Multiplayer.Netcode; +using Unity.Netcode; using NUnit.Framework; using UnityEngine; diff --git a/testproject/Assets/Tests/Runtime/testproject.runtimetests.asmdef b/testproject/Assets/Tests/Runtime/testproject.runtimetests.asmdef index ec085f3662..4325f3c399 100644 --- a/testproject/Assets/Tests/Runtime/testproject.runtimetests.asmdef +++ b/testproject/Assets/Tests/Runtime/testproject.runtimetests.asmdef @@ -3,8 +3,8 @@ "rootNamespace": "TestProject.RuntimeTests", "references": [ "TestProject.ManualTests", - "Unity.Multiplayer.MLAPI.Runtime", - "Unity.Multiplayer.MLAPI.RuntimeTests" + "Unity.Netcode.Runtime", + "Unity.Netcode.RuntimeTests" ], "optionalUnityReferences": [ "TestAssemblies" From 251ec7df25e3567ccf3de16f4a81e2aed6588e0a Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Wed, 4 Aug 2021 03:09:07 +0100 Subject: [PATCH 2/3] include optional test assemblies --- .../com.unity.multiplayer.transport.utp.runtimetests.asmdef | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/com.unity.multiplayer.transport.utp/Tests/Runtime/com.unity.multiplayer.transport.utp.runtimetests.asmdef b/com.unity.multiplayer.transport.utp/Tests/Runtime/com.unity.multiplayer.transport.utp.runtimetests.asmdef index 9c019de54b..f52a330f4e 100644 --- a/com.unity.multiplayer.transport.utp/Tests/Runtime/com.unity.multiplayer.transport.utp.runtimetests.asmdef +++ b/com.unity.multiplayer.transport.utp/Tests/Runtime/com.unity.multiplayer.transport.utp.runtimetests.asmdef @@ -5,7 +5,9 @@ "Unity.Netcode.Runtime", "Unity.Networking.Transport" ], - "includePlatforms": [], + "optionalUnityReferences": [ + "TestAssemblies" + ], "defineConstraints": [ "UNITY_INCLUDE_TESTS" ] From 38bf2f5964586067093927b4f953a63103ac66ee Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Wed, 4 Aug 2021 03:58:07 +0100 Subject: [PATCH 3/3] fix compile errors & run standards.py over --- .../Runtime/Spawning/NetworkSpawnManager.cs | 2 +- .../Samples/PrefabPool/GenericPooledObjectBehaviour.cs | 7 +------ .../Samples/PrefabPool/NetworkPrefabHandlerObjectPool.cs | 2 +- .../PrefabPool/NetworkPrefabHandlerObjectPoolOverride.cs | 2 +- testproject/Assets/Scripts/NetworkObjectLabel.cs | 5 ++--- .../Assets/Tests/Manual/Scripts/NetworkManagerHud.cs | 6 +++--- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs index d79cb28fff..395df145b3 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs +++ b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs @@ -363,7 +363,7 @@ internal void SendSpawnCallForObject(ulong clientId, ulong ownerClientId, Networ clientIds, NetworkUpdateLoop.UpdateStage); if (context != null) { - using (var nonNullContext = (InternalCommandContext) context) + using (var nonNullContext = (InternalCommandContext)context) { WriteSpawnCallForObject(nonNullContext.NetworkWriter, clientId, networkObject); } diff --git a/testproject/Assets/Samples/PrefabPool/GenericPooledObjectBehaviour.cs b/testproject/Assets/Samples/PrefabPool/GenericPooledObjectBehaviour.cs index 3828a66dcd..ac2ccc929a 100644 --- a/testproject/Assets/Samples/PrefabPool/GenericPooledObjectBehaviour.cs +++ b/testproject/Assets/Samples/PrefabPool/GenericPooledObjectBehaviour.cs @@ -1,6 +1,5 @@ using UnityEngine; -using Unity.Multiplayer.Netcode; - +using Unity.Netcode; /// /// A general object used for pooling purposes @@ -30,8 +29,6 @@ private void Start() m_MeshRenderer = GetComponent(); } - - /// /// Handles disabling the MeshRenderer when the client despawns a NetworkObject /// @@ -59,7 +56,6 @@ public override void OnNetworkDespawn() base.OnNetworkDespawn(); } - /// /// Handles setting a delay before the newly spawned object is visible /// Note: this might get removed once the snapshot system is synchronizing @@ -170,7 +166,6 @@ private void Update() } - /// /// Host and Server Only: /// When triggered this will start the despawn process diff --git a/testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPool.cs b/testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPool.cs index eecba0456a..af69232035 100644 --- a/testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPool.cs +++ b/testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPool.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; public class NetworkPrefabHandlerObjectPool : NetworkBehaviour, INetworkPrefabInstanceHandler { diff --git a/testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPoolOverride.cs b/testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPoolOverride.cs index b2af5b2e5a..f2d0f32679 100644 --- a/testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPoolOverride.cs +++ b/testproject/Assets/Samples/PrefabPool/NetworkPrefabHandlerObjectPoolOverride.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; /// /// This is an example of using more than one Network Prefab override when using a custom handler diff --git a/testproject/Assets/Scripts/NetworkObjectLabel.cs b/testproject/Assets/Scripts/NetworkObjectLabel.cs index a341e8e43a..37fa9bd19b 100644 --- a/testproject/Assets/Scripts/NetworkObjectLabel.cs +++ b/testproject/Assets/Scripts/NetworkObjectLabel.cs @@ -1,9 +1,8 @@ using UnityEngine; -using Unity.Multiplayer.Netcode; +using Unity.Netcode; public class NetworkObjectLabel : NetworkBehaviour { - private TextMesh m_ObjectLabel; private MeshRenderer m_Renderer; @@ -14,7 +13,7 @@ private void OnEnable() m_Renderer = GetComponent(); } - if(m_Renderer != null) + if (m_Renderer != null) { m_Renderer.enabled = true; } diff --git a/testproject/Assets/Tests/Manual/Scripts/NetworkManagerHud.cs b/testproject/Assets/Tests/Manual/Scripts/NetworkManagerHud.cs index fab2b2feaa..2c5dafe31a 100644 --- a/testproject/Assets/Tests/Manual/Scripts/NetworkManagerHud.cs +++ b/testproject/Assets/Tests/Manual/Scripts/NetworkManagerHud.cs @@ -10,7 +10,7 @@ public class NetworkManagerHud : MonoBehaviour private void OnGUI() { GUILayout.BeginArea(new Rect(10, 10, 300, 300)); - + if (!NetworkManager.Singleton.IsClient && !NetworkManager.Singleton.IsServer) { StartButtons(); @@ -29,12 +29,12 @@ private static void StartButtons() { NetworkManager.Singleton.StartHost(); } - + if (GUILayout.Button("Client")) { NetworkManager.Singleton.StartClient(); } - + if (GUILayout.Button("Server")) { NetworkManager.Singleton.StartServer();