diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1b8b08636e..c084534fbd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,7 +2,7 @@ # Order is important; the last matching pattern takes the most precedence. Profiling/ @Unity-Technologies/multiplayer-tools -/com.unity.multiplayer.mlapi/Runtime/Transports/ @Unity-Technologies/server-team +/com.unity.netcode.gameobjects/Runtime/Transports/ @Unity-Technologies/server-team +/com.unity.netcode.gameobjects/Runtime/SceneManagement/ @NoelStephensUnity /com.unity.multiplayer.transport.utp/ @Unity-Technologies/server-team -/com.unity.multiplayer.mlapi/Runtime/SceneManagement/ @NoelStephensUnity -Documentation~/ @Briancoughlin @lkrell +Documentation~/ @Briancoughlin diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 20acfe0c4b..e6e8a9d86e 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -14,7 +14,7 @@ develop_nightly_trigger: # Run all relevant tasks when a pull request targeting the develop -# branch is created or updated. Currently only mlapi package tests are +# branch is created or updated. Currently only netcode package tests are # enabled, since the others are missing test coverage and will fail CI. pull_request_trigger: name: Pull Request Trigger on {{ test_editors.first }} (master, develop, & release branches) diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml index 207faa6557..d4231f53df 100644 --- a/.yamato/code-coverage.yml +++ b/.yamato/code-coverage.yml @@ -11,7 +11,7 @@ code_coverage_win_{{ project.name }}: - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - unity-downloader-cli -u trunk -c editor --wait --fast - - upm-ci package test -u .Editor --package-path com.unity.multiplayer.mlapi --enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Multiplayer.MLAPI.Editor,+Unity.Multiplayer.MLAPI.Runtime,+Unity.Multiplayer.MLAPI.Prototyping' + - upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime,+Unity.Netcode.Prototyping' artifacts: logs: paths: diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 79b92ebc81..103481d2ea 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -32,7 +32,7 @@ projects: path: testproject # Packages within a project that will be tested packages: - - name: com.unity.multiplayer.mlapi - path: com.unity.multiplayer.mlapi + - name: com.unity.netcode.gameobjects + path: com.unity.netcode.gameobjects - name: com.unity.multiplayer.transport.utp path: com.unity.multiplayer.transport.utp diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs deleted file mode 100644 index f6f99f447c..0000000000 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs +++ /dev/null @@ -1,448 +0,0 @@ -using System; -using System.Collections; -using UnityEngine; -using UnityEngine.TestTools; -using NUnit.Framework; -using Unity.Netcode; - -public struct TestStruct : INetworkSerializable -{ - public uint SomeInt; - public bool SomeBool; - - public void NetworkSerialize(NetworkSerializer serializer) - { - serializer.Serialize(ref SomeInt); - serializer.Serialize(ref SomeBool); - } -} - -public class TestClass : INetworkSerializable -{ - public uint SomeInt; - public bool SomeBool; - - public void NetworkSerialize(NetworkSerializer serializer) - { - serializer.Serialize(ref SomeInt); - serializer.Serialize(ref SomeBool); - } -} -public class NetworkVariableTest : NetworkBehaviour -{ - public readonly NetworkList TheList = new NetworkList( - new NetworkVariableSettings { WritePermission = NetworkVariablePermission.ServerOnly } - ); - - public readonly NetworkSet TheSet = new NetworkSet( - new NetworkVariableSettings { WritePermission = NetworkVariablePermission.ServerOnly } - ); - - public readonly NetworkDictionary TheDictionary = new NetworkDictionary( - new NetworkVariableSettings { WritePermission = NetworkVariablePermission.ServerOnly } - ); - - private void ListChanged(NetworkListEvent e) - { - ListDelegateTriggered = true; - } - private void SetChanged(NetworkSetEvent e) - { - SetDelegateTriggered = true; - } - private void DictionaryChanged(NetworkDictionaryEvent e) - { - DictionaryDelegateTriggered = true; - } - public void Awake() - { - TheList.OnListChanged += ListChanged; - TheSet.OnSetChanged += SetChanged; - TheDictionary.OnDictionaryChanged += DictionaryChanged; - } - - public readonly NetworkVariable TheStruct = new NetworkVariable(); - public readonly NetworkVariable TheClass = new NetworkVariable(new TestClass()); - - public bool ListDelegateTriggered; - public bool SetDelegateTriggered; - public bool DictionaryDelegateTriggered; -} - -namespace Unity.Netcode.RuntimeTests -{ - public class NetworkVariableTests : BaseMultiInstanceTest - { - protected override int NbClients => 1; - - private const uint k_TestUInt = 0xdeadbeef; - - private const int k_TestVal1 = 111; - private const int k_TestVal2 = 222; - private const int k_TestVal3 = 333; - - private const int k_TestKey1 = 0x0f0f; - private const int k_TestKey2 = 0xf0f0; - - private NetworkVariableTest m_ServerComp; - private NetworkVariableTest m_ClientComp; - - private readonly bool m_TestWithHost = false; - - [UnitySetUp] - public override IEnumerator Setup() - { - yield return StartSomeClientsAndServerWithPlayers(useHost: m_TestWithHost, nbClients: NbClients, - updatePlayerPrefab: playerPrefab => - { - var networkTransform = playerPrefab.AddComponent(); - }); - - // This is the *SERVER VERSION* of the *CLIENT PLAYER* - var serverClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper(); - - yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation( - x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId, - m_ServerNetworkManager, serverClientPlayerResult)); - - // This is the *CLIENT VERSION* of the *CLIENT PLAYER* - var clientClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper(); - yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation( - x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId, - m_ClientNetworkManagers[0], clientClientPlayerResult)); - - var serverSideClientPlayer = serverClientPlayerResult.Result; - var clientSideClientPlayer = clientClientPlayerResult.Result; - - m_ServerComp = serverSideClientPlayer.GetComponent(); - m_ClientComp = clientSideClientPlayer.GetComponent(); - - m_ServerComp.TheList.Clear(); - m_ServerComp.TheSet.Clear(); - m_ServerComp.TheDictionary.Clear(); - - if (m_ServerComp.TheList.Count > 0 || m_ServerComp.TheSet.Count > 0 || m_ServerComp.TheDictionary.Count > 0) - { - throw new Exception("at least one server network container not empty at start"); - } - if (m_ClientComp.TheList.Count > 0 || m_ClientComp.TheSet.Count > 0 || m_ClientComp.TheDictionary.Count > 0) - { - throw new Exception("at least one client network container not empty at start"); - } - } - - /// - /// Runs generalized tests on all predefined NetworkVariable types - /// - [UnityTest] - public IEnumerator AllNetworkVariableTypes() - { - // Create, instantiate, and host - // This would normally go in Setup, but since every other test but this one - // uses MultiInstanceHelper, and it does its own NetworkManager setup / teardown, - // for now we put this within this one test until we migrate it to MIH - Assert.IsTrue(NetworkManagerHelper.StartNetworkManager(out _)); - - Guid gameObjectId = NetworkManagerHelper.AddGameNetworkObject("NetworkVariableTestComponent"); - - var networkVariableTestComponent = NetworkManagerHelper.AddComponentToObject(gameObjectId); - - NetworkManagerHelper.SpawnNetworkObject(gameObjectId); - - // Start Testing - networkVariableTestComponent.EnableTesting = true; - - var testsAreComplete = networkVariableTestComponent.IsTestComplete(); - - // Wait for the NetworkVariable tests to complete - while (!testsAreComplete) - { - yield return new WaitForSeconds(0.003f); - testsAreComplete = networkVariableTestComponent.IsTestComplete(); - } - - // Stop Testing - networkVariableTestComponent.EnableTesting = false; - - Assert.IsTrue(networkVariableTestComponent.DidAllValuesChange()); - - // Disable this once we are done. - networkVariableTestComponent.gameObject.SetActive(false); - - Assert.IsTrue(testsAreComplete); - - // This would normally go in Teardown, but since every other test but this one - // uses MultiInstanceHelper, and it does its own NetworkManager setup / teardown, - // for now we put this within this one test until we migrate it to MIH - NetworkManagerHelper.ShutdownNetworkManager(); - } - - [UnityTest] - public IEnumerator NetworkListAdd() - { - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheList.Add(k_TestVal1); - m_ServerComp.TheList.Add(k_TestVal2); - }, - () => - { - return m_ServerComp.TheList.Count == 2 && - m_ClientComp.TheList.Count == 2 && - m_ServerComp.ListDelegateTriggered && - m_ClientComp.ListDelegateTriggered && - m_ServerComp.TheList[0] == k_TestVal1 && - m_ClientComp.TheList[0] == k_TestVal1 && - m_ServerComp.TheList[1] == k_TestVal2 && - m_ClientComp.TheList[1] == k_TestVal2; - } - ); - } - - [UnityTest] - public IEnumerator NetworkListRemove() - { - // first put some stuff in; re-use the add test - yield return NetworkListAdd(); - - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => m_ServerComp.TheList.RemoveAt(0), - () => - { - return m_ServerComp.TheList.Count == 1 && - m_ClientComp.TheList.Count == 1 && - m_ServerComp.ListDelegateTriggered && - m_ClientComp.ListDelegateTriggered && - m_ServerComp.TheList[0] == k_TestVal2 && - m_ClientComp.TheList[0] == k_TestVal2; - } - ); - } - - [UnityTest] - public IEnumerator NetworkListClear() - { - // first put some stuff in; re-use the add test - yield return NetworkListAdd(); - - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => m_ServerComp.TheList.Clear(), - () => - { - return - m_ServerComp.ListDelegateTriggered && - m_ClientComp.ListDelegateTriggered && - m_ServerComp.TheList.Count == 0 && - m_ClientComp.TheList.Count == 0; - } - ); - } - - [UnityTest] - public IEnumerator NetworkSetAdd() - { - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheSet.Add(k_TestVal1); - m_ServerComp.TheSet.Add(k_TestVal2); - }, - () => - { - return m_ServerComp.TheSet.Count == 2 && - m_ClientComp.TheSet.Count == 2 && - m_ServerComp.SetDelegateTriggered && - m_ClientComp.SetDelegateTriggered && - m_ServerComp.TheSet.Contains(k_TestVal1) && - m_ClientComp.TheSet.Contains(k_TestVal1) && - m_ServerComp.TheSet.Contains(k_TestVal2) && - m_ClientComp.TheSet.Contains(k_TestVal2); - } - ); - } - - [UnityTest] - public IEnumerator NetworkSetRemove() - { - // first put some stuff in; re-use the add test - yield return NetworkSetAdd(); - - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheSet.Remove(k_TestVal1); - }, - () => - { - return m_ServerComp.TheSet.Count == 1 && - m_ClientComp.TheSet.Count == 1 && - m_ServerComp.SetDelegateTriggered && - m_ClientComp.SetDelegateTriggered && - m_ServerComp.TheSet.Contains(k_TestVal2) && - m_ClientComp.TheSet.Contains(k_TestVal2); - } - ); - } - - [UnityTest] - public IEnumerator NetworkSetClear() - { - // first put some stuff in; re-use the add test - yield return NetworkSetAdd(); - - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheSet.Clear(); - }, - () => - { - return m_ServerComp.TheSet.Count == 0 && - m_ClientComp.TheSet.Count == 0 && - m_ServerComp.SetDelegateTriggered && - m_ClientComp.SetDelegateTriggered; - } - ); - } - - [UnityTest] - public IEnumerator NetworkDictionaryAdd() - { - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheDictionary.Add(k_TestKey1, k_TestVal1); - m_ServerComp.TheDictionary.Add(k_TestKey2, k_TestVal2); - }, - () => - { - return m_ServerComp.TheDictionary.Count == 2 && - m_ClientComp.TheDictionary.Count == 2 && - m_ServerComp.DictionaryDelegateTriggered && - m_ClientComp.DictionaryDelegateTriggered && - m_ServerComp.TheDictionary[k_TestKey1] == k_TestVal1 && - m_ClientComp.TheDictionary[k_TestKey1] == k_TestVal1 && - m_ServerComp.TheDictionary[k_TestKey2] == k_TestVal2 && - m_ClientComp.TheDictionary[k_TestKey2] == k_TestVal2; - } - ); - } - - /* Note, not adding coverage for RemovePair, because we plan to remove - * this in the next PR - */ - [UnityTest] - public IEnumerator NetworkDictionaryRemoveByKey() - { - // first put some stuff in; re-use the add test - yield return NetworkDictionaryAdd(); - - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheDictionary.Remove(k_TestKey2); - }, - () => - { - return m_ServerComp.TheDictionary.Count == 1 && - m_ClientComp.TheDictionary.Count == 1 && - m_ServerComp.DictionaryDelegateTriggered && - m_ClientComp.DictionaryDelegateTriggered && - m_ServerComp.TheDictionary[k_TestKey1] == k_TestVal1 && - m_ClientComp.TheDictionary[k_TestKey1] == k_TestVal1; - } - ); - } - - [UnityTest] - public IEnumerator NetworkDictionaryChangeValue() - { - // first put some stuff in; re-use the add test - yield return NetworkDictionaryAdd(); - - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheDictionary[k_TestKey1] = k_TestVal3; - }, - () => - { - return m_ServerComp.TheDictionary.Count == 2 && - m_ClientComp.TheDictionary.Count == 2 && - m_ServerComp.DictionaryDelegateTriggered && - m_ClientComp.DictionaryDelegateTriggered && - m_ServerComp.TheDictionary[k_TestKey1] == k_TestVal3 && - m_ClientComp.TheDictionary[k_TestKey1] == k_TestVal3; - } - ); - } - - [UnityTest] - public IEnumerator NetworkDictionaryClear() - { - // first put some stuff in; re-use the add test - yield return NetworkDictionaryAdd(); - - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheDictionary.Clear(); - }, - () => - { - return m_ServerComp.TheDictionary.Count == 0 && - m_ClientComp.TheDictionary.Count == 0 && - m_ServerComp.DictionaryDelegateTriggered && - m_ClientComp.DictionaryDelegateTriggered; - } - ); - } - - [UnityTest] - public IEnumerator TestNetworkVariableClass() - { - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheClass.Value.SomeBool = false; - m_ServerComp.TheClass.Value.SomeInt = k_TestUInt; - m_ServerComp.TheClass.SetDirty(true); - }, - () => - { - return - m_ClientComp.TheClass.Value.SomeBool == false && - m_ClientComp.TheClass.Value.SomeInt == k_TestUInt; - } - ); - } - - [UnityTest] - public IEnumerator TestNetworkVariableStruct() - { - yield return MultiInstanceHelpers.RunAndWaitForCondition( - () => - { - m_ServerComp.TheStruct.Value = - new TestStruct() { SomeInt = k_TestUInt, SomeBool = false }; - m_ServerComp.TheStruct.SetDirty(true); - }, - () => - { - return - m_ClientComp.TheStruct.Value.SomeBool == false && - m_ClientComp.TheStruct.Value.SomeInt == k_TestUInt; - } - ); - } - - - [UnityTearDown] - public override IEnumerator Teardown() - { - yield return base.Teardown(); - UnityEngine.Object.Destroy(m_PlayerPrefab); - } - } -} diff --git a/com.unity.multiplayer.mlapi/package.json b/com.unity.multiplayer.mlapi/package.json deleted file mode 100644 index 287d1e5aa8..0000000000 --- a/com.unity.multiplayer.mlapi/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "com.unity.multiplayer.mlapi", - "displayName": "MLAPI Networking Library", - "version": "0.2.0", - "unity": "2020.3", - "unityRelease": "0f1", - "description": "This the Core Unity Mid-level API that provides core SDK for multiplayer games within unity", - "keywords": [ - "unity" - ], - "type": "library", - "hideInEditor": false, - "dependencies": { - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.nuget.mono-cecil": "1.10.1-preview.1" - } -} diff --git a/com.unity.multiplayer.transport.utp/package.json b/com.unity.multiplayer.transport.utp/package.json index 7a2ff11620..07c09b1398 100644 --- a/com.unity.multiplayer.transport.utp/package.json +++ b/com.unity.multiplayer.transport.utp/package.json @@ -1,18 +1,12 @@ { "name": "com.unity.multiplayer.transport.utp", - "displayName": "Unity Transport for MLAPI", + "displayName": "Unity Transport for Netcode for GameObjects", + "description": "This package is plugging Unity Transport into Netcode for GameObjects, which is a network transport layer - the low-level interface for sending UDP data", "version": "0.0.1-preview.1", "unity": "2020.3", - "unityRelease": "0f1", - "description": "Unity Transport for MLAPI This the Core Unity Mid-level API that provides core SDK for multiplayer games within unity", - "keywords": [ - "unity" - ], "dependencies": { - "com.unity.multiplayer.mlapi": "0.0.1-preview.1", + "com.unity.netcode.gameobjects": "0.0.1-preview.1", "com.unity.transport": "0.4.1-preview.1", "com.unity.jobs":"0.2.10-preview.13" - }, - "type": "library", - "hideInEditor": false + } } diff --git a/com.unity.multiplayer.mlapi/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md similarity index 100% rename from com.unity.multiplayer.mlapi/CHANGELOG.md rename to com.unity.netcode.gameobjects/CHANGELOG.md diff --git a/com.unity.multiplayer.mlapi/CHANGELOG.md.meta b/com.unity.netcode.gameobjects/CHANGELOG.md.meta similarity index 100% rename from com.unity.multiplayer.mlapi/CHANGELOG.md.meta rename to com.unity.netcode.gameobjects/CHANGELOG.md.meta diff --git a/com.unity.multiplayer.mlapi/Documentation~/Manual.md b/com.unity.netcode.gameobjects/Documentation~/Manual.md similarity index 96% rename from com.unity.multiplayer.mlapi/Documentation~/Manual.md rename to com.unity.netcode.gameobjects/Documentation~/Manual.md index 66e933e997..68e48f6b59 100644 --- a/com.unity.multiplayer.mlapi/Documentation~/Manual.md +++ b/com.unity.netcode.gameobjects/Documentation~/Manual.md @@ -27,4 +27,4 @@ This version of Netcode for GameObjects is compatible with the following Unity v |March 10, 2021|Document created. Matches package version 0.1.0| |June 1, 2021|Update and add links for additional content. Matches patch version 0.1.0 and hotfixes.| |June 3, 2021|Update document to acknowledge Unity min version change. Matches package version 0.2.0| -|August 5, 2021|Update product/package name| +|August 5, 2021|Update product/package name| \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Editor.meta b/com.unity.netcode.gameobjects/Editor.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor.meta rename to com.unity.netcode.gameobjects/Editor.meta diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen.meta b/com.unity.netcode.gameobjects/Editor/CodeGen.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen.meta rename to com.unity.netcode.gameobjects/Editor/CodeGen.meta diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs rename to com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs.meta b/com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs.meta rename to com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs rename to com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs.meta b/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs.meta rename to com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorAssemblyResolver.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorAssemblyResolver.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorAssemblyResolver.cs rename to com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorAssemblyResolver.cs diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorAssemblyResolver.cs.meta b/com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorAssemblyResolver.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorAssemblyResolver.cs.meta rename to com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorAssemblyResolver.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporter.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorReflectionImporter.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporter.cs rename to com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorReflectionImporter.cs diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporter.cs.meta b/com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorReflectionImporter.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporter.cs.meta rename to com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorReflectionImporter.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs rename to com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs.meta b/com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs.meta rename to com.unity.netcode.gameobjects/Editor/CodeGen/PostProcessorReflectionImporterProvider.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/RuntimeAccessModifiersILPP.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs rename to com.unity.netcode.gameobjects/Editor/CodeGen/RuntimeAccessModifiersILPP.cs diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs.meta b/com.unity.netcode.gameobjects/Editor/CodeGen/RuntimeAccessModifiersILPP.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs.meta rename to com.unity.netcode.gameobjects/Editor/CodeGen/RuntimeAccessModifiersILPP.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef b/com.unity.netcode.gameobjects/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef rename to com.unity.netcode.gameobjects/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef.meta b/com.unity.netcode.gameobjects/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef.meta rename to com.unity.netcode.gameobjects/Editor/CodeGen/com.unity.netcode.editor.codegen.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Editor/DontShowInTransportDropdownAttribute.cs b/com.unity.netcode.gameobjects/Editor/DontShowInTransportDropdownAttribute.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/DontShowInTransportDropdownAttribute.cs rename to com.unity.netcode.gameobjects/Editor/DontShowInTransportDropdownAttribute.cs diff --git a/com.unity.multiplayer.mlapi/Editor/DontShowInTransportDropdownAttribute.cs.meta b/com.unity.netcode.gameobjects/Editor/DontShowInTransportDropdownAttribute.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/DontShowInTransportDropdownAttribute.cs.meta rename to com.unity.netcode.gameobjects/Editor/DontShowInTransportDropdownAttribute.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/NetcodeProfiler.cs b/com.unity.netcode.gameobjects/Editor/NetcodeProfiler.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetcodeProfiler.cs rename to com.unity.netcode.gameobjects/Editor/NetcodeProfiler.cs diff --git a/com.unity.multiplayer.mlapi/Editor/NetcodeProfiler.cs.meta b/com.unity.netcode.gameobjects/Editor/NetcodeProfiler.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetcodeProfiler.cs.meta rename to com.unity.netcode.gameobjects/Editor/NetcodeProfiler.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/NetcodeProfilerModule.cs b/com.unity.netcode.gameobjects/Editor/NetcodeProfilerModule.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetcodeProfilerModule.cs rename to com.unity.netcode.gameobjects/Editor/NetcodeProfilerModule.cs diff --git a/com.unity.multiplayer.mlapi/Editor/NetcodeProfilerModule.cs.meta b/com.unity.netcode.gameobjects/Editor/NetcodeProfilerModule.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetcodeProfilerModule.cs.meta rename to com.unity.netcode.gameobjects/Editor/NetcodeProfilerModule.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs rename to com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs.meta b/com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs.meta rename to com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs rename to com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs.meta b/com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs.meta rename to com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs rename to com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs.meta b/com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs.meta rename to com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs.meta diff --git a/com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef b/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef rename to com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef diff --git a/com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef.meta b/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Editor/com.unity.netcode.editor.asmdef.meta rename to com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/LICENSE.md b/com.unity.netcode.gameobjects/LICENSE.md similarity index 100% rename from com.unity.multiplayer.mlapi/LICENSE.md rename to com.unity.netcode.gameobjects/LICENSE.md diff --git a/com.unity.multiplayer.mlapi/LICENSE.md.meta b/com.unity.netcode.gameobjects/LICENSE.md.meta similarity index 100% rename from com.unity.multiplayer.mlapi/LICENSE.md.meta rename to com.unity.netcode.gameobjects/LICENSE.md.meta diff --git a/com.unity.multiplayer.mlapi/Prototyping.meta b/com.unity.netcode.gameobjects/Prototyping.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping.meta rename to com.unity.netcode.gameobjects/Prototyping.meta diff --git a/com.unity.multiplayer.mlapi/Prototyping/AssemblyInfo.cs b/com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/AssemblyInfo.cs rename to com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs diff --git a/com.unity.multiplayer.mlapi/Prototyping/AssemblyInfo.cs.meta b/com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/AssemblyInfo.cs.meta rename to com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs.meta diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs b/com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs rename to com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs.meta b/com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/NetworkAnimator.cs.meta rename to com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs.meta diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs b/com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs rename to com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs.meta b/com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs.meta rename to com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs.meta diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs b/com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs rename to com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs.meta b/com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/NetworkTransform.cs.meta rename to com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs.meta diff --git a/com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef b/com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef rename to com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef diff --git a/com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef.meta b/com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Prototyping/com.unity.netcode.prototyping.asmdef.meta rename to com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/README.md b/com.unity.netcode.gameobjects/README.md similarity index 100% rename from com.unity.multiplayer.mlapi/README.md rename to com.unity.netcode.gameobjects/README.md diff --git a/com.unity.multiplayer.mlapi/README.md.meta b/com.unity.netcode.gameobjects/README.md.meta similarity index 100% rename from com.unity.multiplayer.mlapi/README.md.meta rename to com.unity.netcode.gameobjects/README.md.meta diff --git a/com.unity.multiplayer.mlapi/Runtime.meta b/com.unity.netcode.gameobjects/Runtime.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime.meta rename to com.unity.netcode.gameobjects/Runtime.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs b/com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs rename to com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs.meta b/com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs.meta rename to com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Collections.meta b/com.unity.netcode.gameobjects/Runtime/Collections.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Collections.meta rename to com.unity.netcode.gameobjects/Runtime/Collections.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs b/com.unity.netcode.gameobjects/Runtime/Collections/FixedQueue.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs rename to com.unity.netcode.gameobjects/Runtime/Collections/FixedQueue.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs.meta b/com.unity.netcode.gameobjects/Runtime/Collections/FixedQueue.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Collections/FixedQueue.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Collections/FixedQueue.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration.meta b/com.unity.netcode.gameobjects/Runtime/Configuration.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration.meta rename to com.unity.netcode.gameobjects/Runtime/Configuration.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/HashSize.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs rename to com.unity.netcode.gameobjects/Runtime/Configuration/HashSize.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs.meta b/com.unity.netcode.gameobjects/Runtime/Configuration/HashSize.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration/HashSize.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Configuration/HashSize.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs rename to com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs.meta b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConstants.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs rename to com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConstants.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs.meta b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConstants.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConstants.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConstants.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefab.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs rename to com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefab.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs.meta b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefab.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefab.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Connection.meta b/com.unity.netcode.gameobjects/Runtime/Connection.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Connection.meta rename to com.unity.netcode.gameobjects/Runtime/Connection.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs rename to com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs.meta b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Connection/NetworkClient.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs b/com.unity.netcode.gameobjects/Runtime/Connection/PendingClient.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs rename to com.unity.netcode.gameobjects/Runtime/Connection/PendingClient.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs.meta b/com.unity.netcode.gameobjects/Runtime/Connection/PendingClient.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Connection/PendingClient.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Connection/PendingClient.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core.meta b/com.unity.netcode.gameobjects/Runtime/Core.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core.meta rename to com.unity.netcode.gameobjects/Runtime/Core.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/IndexAllocator.cs b/com.unity.netcode.gameobjects/Runtime/Core/IndexAllocator.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/IndexAllocator.cs rename to com.unity.netcode.gameobjects/Runtime/Core/IndexAllocator.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/IndexAllocator.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/IndexAllocator.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/IndexAllocator.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Core/IndexAllocator.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviourUpdater.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviourUpdater.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviourUpdater.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviourUpdater.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviourUpdater.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkUpdateLoop.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkUpdateLoop.cs rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkUpdateLoop.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/NetworkUpdateLoop.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs b/com.unity.netcode.gameobjects/Runtime/Core/SnapshotRTT.cs similarity index 99% rename from com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs rename to com.unity.netcode.gameobjects/Runtime/Core/SnapshotRTT.cs index 039dc9be47..207160f25a 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/SnapshotRTT.cs @@ -21,6 +21,7 @@ public struct Rtt public double LastSec; // latest ack'ed RTT public int SampleCount; // number of contributing samples } + public ConnectionRtt() { m_RttSendTimes = new double[NetworkConfig.RttWindowSize]; diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/SnapshotRTT.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/SnapshotRTT.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Core/SnapshotRTT.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs b/com.unity.netcode.gameobjects/Runtime/Core/SnapshotSystem.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs rename to com.unity.netcode.gameobjects/Runtime/Core/SnapshotSystem.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/SnapshotSystem.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Core/SnapshotSystem.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Core/SnapshotSystem.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions.meta b/com.unity.netcode.gameobjects/Runtime/Exceptions.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions.meta rename to com.unity.netcode.gameobjects/Runtime/Exceptions.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs b/com.unity.netcode.gameobjects/Runtime/Exceptions/InvalidParentException.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs rename to com.unity.netcode.gameobjects/Runtime/Exceptions/InvalidParentException.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs.meta b/com.unity.netcode.gameobjects/Runtime/Exceptions/InvalidParentException.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/InvalidParentException.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Exceptions/InvalidParentException.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs b/com.unity.netcode.gameobjects/Runtime/Exceptions/NetworkConfigurationException.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs rename to com.unity.netcode.gameobjects/Runtime/Exceptions/NetworkConfigurationException.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs.meta b/com.unity.netcode.gameobjects/Runtime/Exceptions/NetworkConfigurationException.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/NetworkConfigurationException.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Exceptions/NetworkConfigurationException.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs b/com.unity.netcode.gameobjects/Runtime/Exceptions/NotListeningException.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs rename to com.unity.netcode.gameobjects/Runtime/Exceptions/NotListeningException.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs.meta b/com.unity.netcode.gameobjects/Runtime/Exceptions/NotListeningException.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/NotListeningException.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Exceptions/NotListeningException.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs b/com.unity.netcode.gameobjects/Runtime/Exceptions/NotServerException.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs rename to com.unity.netcode.gameobjects/Runtime/Exceptions/NotServerException.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs.meta b/com.unity.netcode.gameobjects/Runtime/Exceptions/NotServerException.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/NotServerException.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Exceptions/NotServerException.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs b/com.unity.netcode.gameobjects/Runtime/Exceptions/SpawnStateException.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs rename to com.unity.netcode.gameobjects/Runtime/Exceptions/SpawnStateException.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs.meta b/com.unity.netcode.gameobjects/Runtime/Exceptions/SpawnStateException.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/SpawnStateException.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Exceptions/SpawnStateException.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs b/com.unity.netcode.gameobjects/Runtime/Exceptions/VisibilityChangeException.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs rename to com.unity.netcode.gameobjects/Runtime/Exceptions/VisibilityChangeException.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs.meta b/com.unity.netcode.gameobjects/Runtime/Exceptions/VisibilityChangeException.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Exceptions/VisibilityChangeException.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Exceptions/VisibilityChangeException.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Hashing.meta b/com.unity.netcode.gameobjects/Runtime/Hashing.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Hashing.meta rename to com.unity.netcode.gameobjects/Runtime/Hashing.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash.meta b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash.meta rename to com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/LICENSE b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/LICENSE rename to com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE diff --git a/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/LICENSE.meta b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/LICENSE.meta rename to com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs rename to com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs.meta b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Hashing/XXHash/XXHash.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Logging.meta b/com.unity.netcode.gameobjects/Runtime/Logging.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Logging.meta rename to com.unity.netcode.gameobjects/Runtime/Logging.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Logging/LogLevel.cs b/com.unity.netcode.gameobjects/Runtime/Logging/LogLevel.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Logging/LogLevel.cs rename to com.unity.netcode.gameobjects/Runtime/Logging/LogLevel.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Logging/LogLevel.cs.meta b/com.unity.netcode.gameobjects/Runtime/Logging/LogLevel.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Logging/LogLevel.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Logging/LogLevel.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs b/com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs rename to com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs.meta b/com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging.meta b/com.unity.netcode.gameobjects/Runtime/Messaging.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/CustomMessageManager.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/IInternalMessageHandler.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/IInternalMessageHandler.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/IInternalMessageHandler.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/IInternalMessageHandler.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/IInternalMessageHandler.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalCommandContext.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/InternalCommandContext.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/InternalCommandContext.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/InternalCommandContext.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalCommandContext.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/InternalCommandContext.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/InternalCommandContext.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/InternalCommandContext.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/InternalMessageHandler.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/InternalMessageHandler.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/InternalMessageHandler.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/InternalMessageHandler.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageBatcher.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageBatcher.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageBatcher.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageBatcher.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageBatcher.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageBatcher.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageBatcher.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageBatcher.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageFrameItem.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageFrameItem.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageFrameItem.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageFrameItem.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageFrameItem.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageFrameItem.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageFrameItem.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageFrameItem.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueContainer.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs similarity index 99% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs index e888028370..cfa5f11804 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs @@ -6,7 +6,7 @@ namespace Unity.Netcode /// /// Used by the MessageQueueContainer to hold queued messages /// - public class MessageQueueHistoryFrame + internal class MessageQueueHistoryFrame { public enum QueueFrameType { diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueHistoryFrame.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/MessageQueue/MessageQueueProcessor.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcAttributes.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcAttributes.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/RpcAttributes.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/RpcAttributes.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcAttributes.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcAttributes.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/RpcAttributes.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/RpcAttributes.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs similarity index 97% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs rename to com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs index bd0667ed5d..ae81a523bb 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs +++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs @@ -2,7 +2,7 @@ namespace Unity.Netcode { public interface IHasUpdateStage { - public NetworkUpdateStage UpdateStage + NetworkUpdateStage UpdateStage { get; set; diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkDictionary.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkDictionary.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkDictionary.cs rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkDictionary.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkDictionary.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkDictionary.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkDictionary.cs.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkDictionary.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkList.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkList.cs rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkList.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkList.cs.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkSet.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkSet.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkSet.cs rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkSet.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkSet.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkSet.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/Collections/NetworkSet.cs.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkSet.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/INetworkVariable.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/INetworkVariable.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/INetworkVariable.cs rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/INetworkVariable.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/INetworkVariable.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/INetworkVariable.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/INetworkVariable.cs.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/INetworkVariable.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariable.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariable.cs rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariable.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariable.cs.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariablePermission.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariablePermission.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariablePermission.cs rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariablePermission.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariablePermission.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariablePermission.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariablePermission.cs.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariablePermission.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariableSettings.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSettings.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariableSettings.cs rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSettings.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariableSettings.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSettings.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/NetworkVariable/NetworkVariableSettings.cs.meta rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSettings.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling.meta b/com.unity.netcode.gameobjects/Runtime/Profiling.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/IProfilableTransportProvider.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/IProfilableTransportProvider.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/IProfilableTransportProvider.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/IProfilableTransportProvider.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/IProfilableTransportProvider.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/IProfilableTransportProvider.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/IProfilableTransportProvider.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/IProfilableTransportProvider.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ITransportProfilerData.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ITransportProfilerData.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ITransportProfilerData.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ITransportProfilerData.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ITransportProfilerData.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/InternalMessageHandlerProfilingDecorator.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/NetworkProfiler.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/NetworkProfiler.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/NetworkProfiler.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/NetworkProfiler.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/NetworkProfiler.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/NetworkProfiler.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/NetworkProfiler.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/NetworkProfiler.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/PerformanceDataManager.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/PerformanceDataManager.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/PerformanceDataManager.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceDataManager.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/PerformanceDataManager.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/PerformanceTickData.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/PerformanceTickData.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/PerformanceTickData.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/PerformanceTickData.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/PerformanceTickData.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerConstants.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerConstants.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerConstants.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerConstants.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerConstants.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCounterUtility.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCounterUtility.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCounterUtility.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCounterUtility.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCounterValue.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCounterValue.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCounterValue.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCounterValue.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCountersInfo.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCountersInfo.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCountersInfo.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCountersInfo.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerCountersInfo.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerNotifier.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerNotifier.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerNotifier.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerNotifier.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerNotifier.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerStat.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerStat.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerStat.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStat.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerStat.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStatManager.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerStatManager.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStatManager.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerStatManager.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStatManager.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerStatManager.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerStatManager.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerStatManager.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerTickData.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerTickData.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerTickData.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerTickData.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerTickData.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerTickData.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerTickData.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilerTickData.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilingDataStore.cs b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilingDataStore.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilingDataStore.cs rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilingDataStore.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilingDataStore.cs.meta b/com.unity.netcode.gameobjects/Runtime/Profiling/ProfilingDataStore.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilingDataStore.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Profiling/ProfilingDataStore.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Reflection.meta b/com.unity.netcode.gameobjects/Runtime/Reflection.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Reflection.meta rename to com.unity.netcode.gameobjects/Runtime/Reflection.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Reflection/TypeExtensions.cs b/com.unity.netcode.gameobjects/Runtime/Reflection/TypeExtensions.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Reflection/TypeExtensions.cs rename to com.unity.netcode.gameobjects/Runtime/Reflection/TypeExtensions.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Reflection/TypeExtensions.cs.meta b/com.unity.netcode.gameobjects/Runtime/Reflection/TypeExtensions.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Reflection/TypeExtensions.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Reflection/TypeExtensions.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement.meta b/com.unity.netcode.gameobjects/Runtime/SceneManagement.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/SceneManagement.meta rename to com.unity.netcode.gameobjects/Runtime/SceneManagement.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs rename to com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs.meta b/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/SceneManagement/NetworkSceneManager.cs.meta rename to com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/SceneSwitchProgress.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneSwitchProgress.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/SceneManagement/SceneSwitchProgress.cs rename to com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneSwitchProgress.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/SceneManagement/SceneSwitchProgress.cs.meta b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneSwitchProgress.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/SceneManagement/SceneSwitchProgress.cs.meta rename to com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneSwitchProgress.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization.meta b/com.unity.netcode.gameobjects/Runtime/Serialization.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Arithmetic.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/Arithmetic.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Arithmetic.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/Arithmetic.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Arithmetic.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/Arithmetic.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Arithmetic.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/Arithmetic.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/AutoNetworkSerializable.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/AutoNetworkSerializable.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/AutoNetworkSerializable.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/AutoNetworkSerializable.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/AutoNetworkSerializable.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/AutoNetworkSerializable.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/AutoNetworkSerializable.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/AutoNetworkSerializable.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/INetworkSerializable.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/INetworkSerializable.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/INetworkSerializable.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/INetworkSerializable.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/INetworkSerializable.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/ByteBool.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures/ByteBool.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/ByteBool.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures/ByteBool.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/ByteBool.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures/ByteBool.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/ByteBool.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures/ByteBool.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/UIntFloat.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures/UIntFloat.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/UIntFloat.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures/UIntFloat.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/UIntFloat.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures/UIntFloat.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/MemoryStructures/UIntFloat.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/MemoryStructures/UIntFloat.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkBuffer.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkBuffer.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkBuffer.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/NetworkBuffer.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkBuffer.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkBuffer.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkBuffer.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/NetworkBuffer.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkReader.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/NetworkReader.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkReader.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkReader.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/NetworkReader.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkSerializer.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkSerializer.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkSerializer.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/NetworkSerializer.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkSerializer.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkSerializer.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkSerializer.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/NetworkSerializer.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkWriter.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/NetworkWriter.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkWriter.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/NetworkWriter.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkBufferPool.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkBufferPool.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkBufferPool.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkBufferPool.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkBufferPool.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkBufferPool.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkBufferPool.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkBufferPool.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkReaderPool.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkReaderPool.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkReaderPool.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkReaderPool.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkReaderPool.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkReaderPool.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkReaderPool.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkReaderPool.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkWriterPool.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkWriterPool.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkWriterPool.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkWriterPool.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkWriterPool.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkWriterPool.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/NetworkWriterPool.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/NetworkWriterPool.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkBuffer.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkReader.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkReader.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkReader.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkReader.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkReader.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkReader.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkReader.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkReader.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkWriter.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkWriter.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkWriter.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkWriter.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkWriter.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkWriter.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/Pooled/PooledNetworkWriter.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/Pooled/PooledNetworkWriter.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/SerializationManager.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/SerializationManager.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/SerializationManager.cs rename to com.unity.netcode.gameobjects/Runtime/Serialization/SerializationManager.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/SerializationManager.cs.meta b/com.unity.netcode.gameobjects/Runtime/Serialization/SerializationManager.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Serialization/SerializationManager.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Serialization/SerializationManager.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning.meta b/com.unity.netcode.gameobjects/Runtime/Spawning.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Spawning.meta rename to com.unity.netcode.gameobjects/Runtime/Spawning.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkPrefabHandler.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkPrefabHandler.cs rename to com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkPrefabHandler.cs.meta b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkPrefabHandler.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs rename to com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs.meta b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/ReleasedNetworkId.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/ReleasedNetworkId.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Spawning/ReleasedNetworkId.cs rename to com.unity.netcode.gameobjects/Runtime/Spawning/ReleasedNetworkId.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/ReleasedNetworkId.cs.meta b/com.unity.netcode.gameobjects/Runtime/Spawning/ReleasedNetworkId.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Spawning/ReleasedNetworkId.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Spawning/ReleasedNetworkId.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing.meta b/com.unity.netcode.gameobjects/Runtime/Timing.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Timing.meta rename to com.unity.netcode.gameobjects/Runtime/Timing.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTickSystem.cs b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTickSystem.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTickSystem.cs rename to com.unity.netcode.gameobjects/Runtime/Timing/NetworkTickSystem.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTickSystem.cs.meta b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTickSystem.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTickSystem.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Timing/NetworkTickSystem.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTime.cs b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTime.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTime.cs rename to com.unity.netcode.gameobjects/Runtime/Timing/NetworkTime.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTime.cs.meta b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTime.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTime.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Timing/NetworkTime.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs similarity index 99% rename from com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs rename to com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs index 4717730e39..e150da2ff0 100644 --- a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs +++ b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs @@ -9,13 +9,9 @@ namespace Unity.Netcode public class NetworkTimeSystem { private double m_TimeSec; - private double m_CurrentLocalTimeOffset; - private double m_DesiredLocalTimeOffset; - private double m_CurrentServerTimeOffset; - private double m_DesiredServerTimeOffset; /// @@ -39,13 +35,10 @@ public class NetworkTimeSystem /// Gets or sets the ratio at which the NetworkTimeSystem speeds up or slows down time. /// public double AdjustmentRatio { get; set; } - public double LocalTime => m_TimeSec + m_CurrentLocalTimeOffset; - public double ServerTime => m_TimeSec + m_CurrentServerTimeOffset; internal double LastSyncedServerTimeSec { get; private set; } - internal double LastSyncedRttSec { get; private set; } public NetworkTimeSystem(double localBufferSec, double serverBufferSec, double hardResetThresholdSec, double adjustmentRatio = 0.01d) diff --git a/com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs.meta b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Timing/NetworkTimeSystem.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports.meta b/com.unity.netcode.gameobjects/Runtime/Transports.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports.meta rename to com.unity.netcode.gameobjects/Runtime/Transports.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/MultiplexTransportAdapter.cs b/com.unity.netcode.gameobjects/Runtime/Transports/MultiplexTransportAdapter.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/MultiplexTransportAdapter.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/MultiplexTransportAdapter.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/MultiplexTransportAdapter.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/MultiplexTransportAdapter.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/MultiplexTransportAdapter.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/MultiplexTransportAdapter.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkDelivery.cs b/com.unity.netcode.gameobjects/Runtime/Transports/NetworkDelivery.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/NetworkDelivery.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/NetworkDelivery.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkDelivery.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/NetworkDelivery.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/NetworkDelivery.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/NetworkDelivery.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkEvent.cs b/com.unity.netcode.gameobjects/Runtime/Transports/NetworkEvent.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/NetworkEvent.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/NetworkEvent.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkEvent.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/NetworkEvent.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/NetworkEvent.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/NetworkEvent.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/NetworkTransport.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/NetworkTransport.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/NetworkTransport.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/NetworkTransport.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/NetworkTransport.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tasks.meta b/com.unity.netcode.gameobjects/Runtime/Transports/Tasks.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tasks.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/Tasks.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tasks/SocketTask.cs b/com.unity.netcode.gameobjects/Runtime/Transports/Tasks/SocketTask.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tasks/SocketTask.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/Tasks/SocketTask.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tasks/SocketTask.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/Tasks/SocketTask.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tasks/SocketTask.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/Tasks/SocketTask.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests.meta b/com.unity.netcode.gameobjects/Runtime/Transports/Tests.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tests.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/Tests.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor.meta b/com.unity.netcode.gameobjects/Runtime/Transports/Tests/Editor.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/Tests/Editor.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs b/com.unity.netcode.gameobjects/Runtime/Transports/Tests/Editor/TransportTest.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/Tests/Editor/TransportTest.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/Tests/Editor/TransportTest.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/TransportTest.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/Tests/Editor/TransportTest.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef b/com.unity.netcode.gameobjects/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef rename to com.unity.netcode.gameobjects/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/Tests/Editor/com.unity.netcode.transport.editortest.asmdef.meta b/com.unity.netcode.gameobjects/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.netcode.transport.editortest.asmdef.meta rename to com.unity.netcode.gameobjects/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.netcode.gameobjects/Runtime/Transports/TransportChannel.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/TransportChannel.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/TransportChannel.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/TransportChannel.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/TransportChannel.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/TransportChannel.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/TransportChannel.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET.meta b/com.unity.netcode.gameobjects/Runtime/Transports/UNET.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/ProfilerConstants.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/ProfilerConstants.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET/ProfilerConstants.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET/ProfilerConstants.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/ProfilerConstants.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/ProfilerConstants.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET/ProfilerConstants.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET/ProfilerConstants.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/RelayTransport.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET/RelayTransport.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/RelayTransport.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET/RelayTransport.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET/RelayTransport.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetChannel.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetChannel.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetChannel.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetChannel.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetChannel.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetChannel.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetChannel.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetChannel.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs diff --git a/com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs.meta b/com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/Transports/UNET/UNetTransport.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs.meta diff --git a/com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef b/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef rename to com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef diff --git a/com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef.meta b/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Runtime/com.unity.netcode.runtime.asmdef.meta rename to com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Tests.meta b/com.unity.netcode.gameobjects/Tests.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests.meta rename to com.unity.netcode.gameobjects/Tests.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor.meta b/com.unity.netcode.gameobjects/Tests/Editor.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor.meta rename to com.unity.netcode.gameobjects/Tests/Editor.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/ArithmeticTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/ArithmeticTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/ArithmeticTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/ArithmeticTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/ArithmeticTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/ArithmeticTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/ArithmeticTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/ArithmeticTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Build.meta b/com.unity.netcode.gameobjects/Tests/Editor/Build.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Build.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Build.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Build/BuildTestScene.unity b/com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTestScene.unity similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Build/BuildTestScene.unity rename to com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTestScene.unity diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Build/BuildTestScene.unity.meta b/com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTestScene.unity.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Build/BuildTestScene.unity.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTestScene.unity.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Build/BuildTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Build/BuildTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Build/BuildTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Build/BuildTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs b/com.unity.netcode.gameobjects/Tests/Editor/DummyMessageHandler.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs rename to com.unity.netcode.gameobjects/Tests/Editor/DummyMessageHandler.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/DummyMessageHandler.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/DummyMessageHandler.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/DummyMessageHandler.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/IndexAllocatorTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/IndexAllocatorTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/IndexAllocatorTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/IndexAllocatorTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/IndexAllocatorTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/IndexAllocatorTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/IndexAllocatorTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/IndexAllocatorTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/MessageBatcherTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/MessageBatcherTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/MessageBatcherTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/MessageBatcherTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/MessageBatcherTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/MessageBatcherTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/MessageBatcherTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/MessageBatcherTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/MessagePacker.cs b/com.unity.netcode.gameobjects/Tests/Editor/MessagePacker.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/MessagePacker.cs rename to com.unity.netcode.gameobjects/Tests/Editor/MessagePacker.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/MessagePacker.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/MessagePacker.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/MessagePacker.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/MessagePacker.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBufferTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkBufferTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkBufferTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkBufferTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkBufferTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/NetworkBufferTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkBufferTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkBufferTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerCustomMessageManagerTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerMessageHandlerTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerMessageHandlerTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerMessageHandlerTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerMessageHandlerTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerMessageHandlerTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerSceneManagerTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerSceneManagerTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerSceneManagerTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerSceneManagerTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerSceneManagerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerSceneManagerTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkManagerSceneManagerTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerSceneManagerTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkObjectTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkObjectTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkObjectTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkObjectTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkSerializerTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkSerializerTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkSerializerTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkSerializerTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/NetworkSerializerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/NetworkSerializerTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/NetworkSerializerTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/NetworkSerializerTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/ProfilerTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/ProfilerTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/ProfilerTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/ProfilerTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/ProfilerTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Profiling.meta b/com.unity.netcode.gameobjects/Tests/Editor/Profiling.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Profiling.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Profiling.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Profiling/InternalMessageHandlerProfilingDecoratorTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/SnapshotRttTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/SnapshotRttTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/SnapshotRttTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/SnapshotRttTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/SnapshotRttTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/SnapshotRttTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/SnapshotRttTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/SnapshotRttTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing.meta b/com.unity.netcode.gameobjects/Tests/Editor/Timing.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Timing.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/NetworkTimeTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Timing/NetworkTimeTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing/NetworkTimeTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/Timing/NetworkTimeTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/NetworkTimeTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/Timing/NetworkTimeTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing/NetworkTimeTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Timing/NetworkTimeTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs rename to com.unity.netcode.gameobjects/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/TimingTestHelper.cs b/com.unity.netcode.gameobjects/Tests/Editor/Timing/TimingTestHelper.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing/TimingTestHelper.cs rename to com.unity.netcode.gameobjects/Tests/Editor/Timing/TimingTestHelper.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/Timing/TimingTestHelper.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/Timing/TimingTestHelper.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/Timing/TimingTestHelper.cs.meta rename to com.unity.netcode.gameobjects/Tests/Editor/Timing/TimingTestHelper.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef b/com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef rename to com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef diff --git a/com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef.meta b/com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Editor/com.unity.netcode.editortests.asmdef.meta rename to com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime.meta b/com.unity.netcode.gameobjects/Tests/Runtime.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime.meta rename to com.unity.netcode.gameobjects/Tests/Runtime.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/BaseMultiInstanceTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/BaseMultiInstanceTest.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/BaseMultiInstanceTest.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/BaseMultiInstanceTest.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/BaseMultiInstanceTest.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/BaseMultiInstanceTest.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/BaseMultiInstanceTest.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/BaseMultiInstanceTest.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Components.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Components.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Components.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/BufferDataValidationComponent.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Components/BufferDataValidationComponent.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/BufferDataValidationComponent.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Components/BufferDataValidationComponent.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkUpdateStagesComponent.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkVariableTestComponent.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkVariableTestComponent.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkVariableTestComponent.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Components/NetworkVariableTestComponent.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash.meta b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta b/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Helpers.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Helpers.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Helpers.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkManagerHelper.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkManagerHelper.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkManagerHelper.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkManagerHelper.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkManagerHelper.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkManagerHelper.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkManagerHelper.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkManagerHelper.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkVariableHelper.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkVariableHelper.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkVariableHelper.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkVariableHelper.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkVariableHelper.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkVariableHelper.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Helpers/NetworkVariableHelper.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Helpers/NetworkVariableHelper.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Messaging.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Messaging.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/NamedMessageTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/NamedMessageTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/NamedMessageTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/NamedMessageTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/UnnamedMessageTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/UnnamedMessageTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/UnnamedMessageTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Messaging/UnnamedMessageTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstanceHelpers.cs b/com.unity.netcode.gameobjects/Tests/Runtime/MultiInstanceHelpers.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstanceHelpers.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/MultiInstanceHelpers.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstanceHelpers.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/MultiInstanceHelpers.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstanceHelpers.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/MultiInstanceHelpers.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkBehaviourUpdaterTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkBehaviourUpdaterTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkBehaviourUpdaterTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkBehaviourUpdaterTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSceneSerializationTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSceneManagerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkSceneManagerTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSceneManagerTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkSceneManagerTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSceneManagerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkSceneManagerTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSceneManagerTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkSceneManagerTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkShowHideTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkShowHideTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkShowHideTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkShowHideTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSpawnManagerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkSpawnManagerTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSpawnManagerTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkSpawnManagerTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSpawnManagerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkSpawnManagerTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkSpawnManagerTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkSpawnManagerTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs.meta similarity index 54% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs.meta index eeff764982..9103284456 100644 --- a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs.meta +++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 5b3f72de99484a1c9e835c1f0d349475 +guid: cf4ff0d6357bb4474a404b9ce52b22ad timeCreated: 1620872927 \ No newline at end of file diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkUpdateLoopTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkUpdateLoopTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkUpdateLoopTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkUpdateLoopTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkUpdateLoopTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVarBufferCopyTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVarBufferCopyTest.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVarBufferCopyTest.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVarBufferCopyTest.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs new file mode 100644 index 0000000000..660eb65c9a --- /dev/null +++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs @@ -0,0 +1,450 @@ +using System; +using System.Collections; +using UnityEngine; +using UnityEngine.TestTools; +using NUnit.Framework; + +namespace Unity.Netcode.RuntimeTests +{ + public struct TestStruct : INetworkSerializable + { + public uint SomeInt; + public bool SomeBool; + + public void NetworkSerialize(NetworkSerializer serializer) + { + serializer.Serialize(ref SomeInt); + serializer.Serialize(ref SomeBool); + } + } + + public class TestClass : INetworkSerializable + { + public uint SomeInt; + public bool SomeBool; + + public void NetworkSerialize(NetworkSerializer serializer) + { + serializer.Serialize(ref SomeInt); + serializer.Serialize(ref SomeBool); + } + } + + public class NetworkVariableTest : NetworkBehaviour + { + public readonly NetworkList TheList = new NetworkList( + new NetworkVariableSettings { WritePermission = NetworkVariablePermission.ServerOnly } + ); + + public readonly NetworkSet TheSet = new NetworkSet( + new NetworkVariableSettings { WritePermission = NetworkVariablePermission.ServerOnly } + ); + + public readonly NetworkDictionary TheDictionary = new NetworkDictionary( + new NetworkVariableSettings { WritePermission = NetworkVariablePermission.ServerOnly } + ); + + private void ListChanged(NetworkListEvent e) + { + ListDelegateTriggered = true; + } + private void SetChanged(NetworkSetEvent e) + { + SetDelegateTriggered = true; + } + private void DictionaryChanged(NetworkDictionaryEvent e) + { + DictionaryDelegateTriggered = true; + } + public void Awake() + { + TheList.OnListChanged += ListChanged; + TheSet.OnSetChanged += SetChanged; + TheDictionary.OnDictionaryChanged += DictionaryChanged; + } + + public readonly NetworkVariable TheStruct = new NetworkVariable(); + public readonly NetworkVariable TheClass = new NetworkVariable(new TestClass()); + + public bool ListDelegateTriggered; + public bool SetDelegateTriggered; + public bool DictionaryDelegateTriggered; + } + + namespace Unity.Netcode.RuntimeTests + { + public class NetworkVariableTests : BaseMultiInstanceTest + { + protected override int NbClients => 1; + + private const uint k_TestUInt = 0xdeadbeef; + + private const int k_TestVal1 = 111; + private const int k_TestVal2 = 222; + private const int k_TestVal3 = 333; + + private const int k_TestKey1 = 0x0f0f; + private const int k_TestKey2 = 0xf0f0; + + private NetworkVariableTest m_ServerComp; + private NetworkVariableTest m_ClientComp; + + private readonly bool m_TestWithHost = false; + + [UnitySetUp] + public override IEnumerator Setup() + { + yield return StartSomeClientsAndServerWithPlayers(useHost: m_TestWithHost, nbClients: NbClients, + updatePlayerPrefab: playerPrefab => + { + var networkTransform = playerPrefab.AddComponent(); + }); + + // This is the *SERVER VERSION* of the *CLIENT PLAYER* + var serverClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper(); + + yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation( + x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId, + m_ServerNetworkManager, serverClientPlayerResult)); + + // This is the *CLIENT VERSION* of the *CLIENT PLAYER* + var clientClientPlayerResult = new MultiInstanceHelpers.CoroutineResultWrapper(); + yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation( + x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId, + m_ClientNetworkManagers[0], clientClientPlayerResult)); + + var serverSideClientPlayer = serverClientPlayerResult.Result; + var clientSideClientPlayer = clientClientPlayerResult.Result; + + m_ServerComp = serverSideClientPlayer.GetComponent(); + m_ClientComp = clientSideClientPlayer.GetComponent(); + + m_ServerComp.TheList.Clear(); + m_ServerComp.TheSet.Clear(); + m_ServerComp.TheDictionary.Clear(); + + if (m_ServerComp.TheList.Count > 0 || m_ServerComp.TheSet.Count > 0 || m_ServerComp.TheDictionary.Count > 0) + { + throw new Exception("at least one server network container not empty at start"); + } + if (m_ClientComp.TheList.Count > 0 || m_ClientComp.TheSet.Count > 0 || m_ClientComp.TheDictionary.Count > 0) + { + throw new Exception("at least one client network container not empty at start"); + } + } + + /// + /// Runs generalized tests on all predefined NetworkVariable types + /// + [UnityTest] + public IEnumerator AllNetworkVariableTypes() + { + // Create, instantiate, and host + // This would normally go in Setup, but since every other test but this one + // uses MultiInstanceHelper, and it does its own NetworkManager setup / teardown, + // for now we put this within this one test until we migrate it to MIH + Assert.IsTrue(NetworkManagerHelper.StartNetworkManager(out _)); + + Guid gameObjectId = NetworkManagerHelper.AddGameNetworkObject("NetworkVariableTestComponent"); + + var networkVariableTestComponent = NetworkManagerHelper.AddComponentToObject(gameObjectId); + + NetworkManagerHelper.SpawnNetworkObject(gameObjectId); + + // Start Testing + networkVariableTestComponent.EnableTesting = true; + + var testsAreComplete = networkVariableTestComponent.IsTestComplete(); + + // Wait for the NetworkVariable tests to complete + while (!testsAreComplete) + { + yield return new WaitForSeconds(0.003f); + testsAreComplete = networkVariableTestComponent.IsTestComplete(); + } + + // Stop Testing + networkVariableTestComponent.EnableTesting = false; + + Assert.IsTrue(networkVariableTestComponent.DidAllValuesChange()); + + // Disable this once we are done. + networkVariableTestComponent.gameObject.SetActive(false); + + Assert.IsTrue(testsAreComplete); + + // This would normally go in Teardown, but since every other test but this one + // uses MultiInstanceHelper, and it does its own NetworkManager setup / teardown, + // for now we put this within this one test until we migrate it to MIH + NetworkManagerHelper.ShutdownNetworkManager(); + } + + [UnityTest] + public IEnumerator NetworkListAdd() + { + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheList.Add(k_TestVal1); + m_ServerComp.TheList.Add(k_TestVal2); + }, + () => + { + return m_ServerComp.TheList.Count == 2 && + m_ClientComp.TheList.Count == 2 && + m_ServerComp.ListDelegateTriggered && + m_ClientComp.ListDelegateTriggered && + m_ServerComp.TheList[0] == k_TestVal1 && + m_ClientComp.TheList[0] == k_TestVal1 && + m_ServerComp.TheList[1] == k_TestVal2 && + m_ClientComp.TheList[1] == k_TestVal2; + } + ); + } + + [UnityTest] + public IEnumerator NetworkListRemove() + { + // first put some stuff in; re-use the add test + yield return NetworkListAdd(); + + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => m_ServerComp.TheList.RemoveAt(0), + () => + { + return m_ServerComp.TheList.Count == 1 && + m_ClientComp.TheList.Count == 1 && + m_ServerComp.ListDelegateTriggered && + m_ClientComp.ListDelegateTriggered && + m_ServerComp.TheList[0] == k_TestVal2 && + m_ClientComp.TheList[0] == k_TestVal2; + } + ); + } + + [UnityTest] + public IEnumerator NetworkListClear() + { + // first put some stuff in; re-use the add test + yield return NetworkListAdd(); + + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => m_ServerComp.TheList.Clear(), + () => + { + return + m_ServerComp.ListDelegateTriggered && + m_ClientComp.ListDelegateTriggered && + m_ServerComp.TheList.Count == 0 && + m_ClientComp.TheList.Count == 0; + } + ); + } + + [UnityTest] + public IEnumerator NetworkSetAdd() + { + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheSet.Add(k_TestVal1); + m_ServerComp.TheSet.Add(k_TestVal2); + }, + () => + { + return m_ServerComp.TheSet.Count == 2 && + m_ClientComp.TheSet.Count == 2 && + m_ServerComp.SetDelegateTriggered && + m_ClientComp.SetDelegateTriggered && + m_ServerComp.TheSet.Contains(k_TestVal1) && + m_ClientComp.TheSet.Contains(k_TestVal1) && + m_ServerComp.TheSet.Contains(k_TestVal2) && + m_ClientComp.TheSet.Contains(k_TestVal2); + } + ); + } + + [UnityTest] + public IEnumerator NetworkSetRemove() + { + // first put some stuff in; re-use the add test + yield return NetworkSetAdd(); + + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheSet.Remove(k_TestVal1); + }, + () => + { + return m_ServerComp.TheSet.Count == 1 && + m_ClientComp.TheSet.Count == 1 && + m_ServerComp.SetDelegateTriggered && + m_ClientComp.SetDelegateTriggered && + m_ServerComp.TheSet.Contains(k_TestVal2) && + m_ClientComp.TheSet.Contains(k_TestVal2); + } + ); + } + + [UnityTest] + public IEnumerator NetworkSetClear() + { + // first put some stuff in; re-use the add test + yield return NetworkSetAdd(); + + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheSet.Clear(); + }, + () => + { + return m_ServerComp.TheSet.Count == 0 && + m_ClientComp.TheSet.Count == 0 && + m_ServerComp.SetDelegateTriggered && + m_ClientComp.SetDelegateTriggered; + } + ); + } + + [UnityTest] + public IEnumerator NetworkDictionaryAdd() + { + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheDictionary.Add(k_TestKey1, k_TestVal1); + m_ServerComp.TheDictionary.Add(k_TestKey2, k_TestVal2); + }, + () => + { + return m_ServerComp.TheDictionary.Count == 2 && + m_ClientComp.TheDictionary.Count == 2 && + m_ServerComp.DictionaryDelegateTriggered && + m_ClientComp.DictionaryDelegateTriggered && + m_ServerComp.TheDictionary[k_TestKey1] == k_TestVal1 && + m_ClientComp.TheDictionary[k_TestKey1] == k_TestVal1 && + m_ServerComp.TheDictionary[k_TestKey2] == k_TestVal2 && + m_ClientComp.TheDictionary[k_TestKey2] == k_TestVal2; + } + ); + } + + /* Note, not adding coverage for RemovePair, because we plan to remove + * this in the next PR + */ + [UnityTest] + public IEnumerator NetworkDictionaryRemoveByKey() + { + // first put some stuff in; re-use the add test + yield return NetworkDictionaryAdd(); + + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheDictionary.Remove(k_TestKey2); + }, + () => + { + return m_ServerComp.TheDictionary.Count == 1 && + m_ClientComp.TheDictionary.Count == 1 && + m_ServerComp.DictionaryDelegateTriggered && + m_ClientComp.DictionaryDelegateTriggered && + m_ServerComp.TheDictionary[k_TestKey1] == k_TestVal1 && + m_ClientComp.TheDictionary[k_TestKey1] == k_TestVal1; + } + ); + } + + [UnityTest] + public IEnumerator NetworkDictionaryChangeValue() + { + // first put some stuff in; re-use the add test + yield return NetworkDictionaryAdd(); + + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheDictionary[k_TestKey1] = k_TestVal3; + }, + () => + { + return m_ServerComp.TheDictionary.Count == 2 && + m_ClientComp.TheDictionary.Count == 2 && + m_ServerComp.DictionaryDelegateTriggered && + m_ClientComp.DictionaryDelegateTriggered && + m_ServerComp.TheDictionary[k_TestKey1] == k_TestVal3 && + m_ClientComp.TheDictionary[k_TestKey1] == k_TestVal3; + } + ); + } + + [UnityTest] + public IEnumerator NetworkDictionaryClear() + { + // first put some stuff in; re-use the add test + yield return NetworkDictionaryAdd(); + + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheDictionary.Clear(); + }, + () => + { + return m_ServerComp.TheDictionary.Count == 0 && + m_ClientComp.TheDictionary.Count == 0 && + m_ServerComp.DictionaryDelegateTriggered && + m_ClientComp.DictionaryDelegateTriggered; + } + ); + } + + [UnityTest] + public IEnumerator TestNetworkVariableClass() + { + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheClass.Value.SomeBool = false; + m_ServerComp.TheClass.Value.SomeInt = k_TestUInt; + m_ServerComp.TheClass.SetDirty(true); + }, + () => + { + return + m_ClientComp.TheClass.Value.SomeBool == false && + m_ClientComp.TheClass.Value.SomeInt == k_TestUInt; + } + ); + } + + [UnityTest] + public IEnumerator TestNetworkVariableStruct() + { + yield return MultiInstanceHelpers.RunAndWaitForCondition( + () => + { + m_ServerComp.TheStruct.Value = + new TestStruct() { SomeInt = k_TestUInt, SomeBool = false }; + m_ServerComp.TheStruct.SetDirty(true); + }, + () => + { + return + m_ClientComp.TheStruct.Value.SomeBool == false && + m_ClientComp.TheStruct.Value.SomeInt == k_TestUInt; + } + ); + } + + [UnityTearDown] + public override IEnumerator Teardown() + { + yield return base.Teardown(); + UnityEngine.Object.Destroy(m_PlayerPrefab); + } + } + } +} diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/NetworkVariableTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/BlueColMat.mat b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/BlueColMat.mat similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/BlueColMat.mat rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/BlueColMat.mat diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/GrayColMat.mat b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GrayColMat.mat similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/GrayColMat.mat rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GrayColMat.mat diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/GreenColMat.mat b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GreenColMat.mat similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/GreenColMat.mat rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GreenColMat.mat diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Profiling.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Profiling.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Profiling.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Profiling.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Profiling/NetworkVariableNameTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Profiling/NetworkVariableNameTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Profiling/NetworkVariableNameTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Profiling/NetworkVariableNameTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Profiling/NetworkVariableNameTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Profiling/NetworkVariableNameTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Profiling/NetworkVariableNameTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Profiling/NetworkVariableNameTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcPipelineTestComponent.cs b/com.unity.netcode.gameobjects/Tests/Runtime/RpcPipelineTestComponent.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/RpcPipelineTestComponent.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/RpcPipelineTestComponent.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcPipelineTestComponent.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/RpcPipelineTestComponent.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/RpcPipelineTestComponent.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/RpcPipelineTestComponent.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcQueueTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/RpcQueueTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/RpcQueueTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/RpcQueueTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcQueueTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/RpcQueueTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/RpcQueueTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/RpcQueueTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/RpcTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/RpcTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/RpcTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/RpcTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/RpcTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/RpcTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/RpcTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Timing.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Timing.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Timing.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/NetworkTimeSystemTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Timing/NetworkTimeSystemTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/NetworkTimeSystemTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Timing/NetworkTimeSystemTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/TimeMultiInstanceTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeMultiInstanceTest.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Timing/TimeMultiInstanceTest.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeMultiInstanceTest.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Timing/TimeMultiInstanceTest.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeMultiInstanceTest.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Timing/TimeMultiInstanceTest.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeMultiInstanceTest.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Transport.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Transport.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Transport.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransportTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransportTests.cs similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransportTests.cs rename to com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransportTests.cs diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransportTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransportTests.cs.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransportTests.cs.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransportTests.cs.meta diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef b/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef rename to com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef.meta b/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Tests/Runtime/com.unity.netcode.runtimetests.asmdef.meta rename to com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef.meta diff --git a/com.unity.multiplayer.mlapi/Third Party Notices.md b/com.unity.netcode.gameobjects/Third Party Notices.md similarity index 100% rename from com.unity.multiplayer.mlapi/Third Party Notices.md rename to com.unity.netcode.gameobjects/Third Party Notices.md diff --git a/com.unity.multiplayer.mlapi/Third Party Notices.md.meta b/com.unity.netcode.gameobjects/Third Party Notices.md.meta similarity index 100% rename from com.unity.multiplayer.mlapi/Third Party Notices.md.meta rename to com.unity.netcode.gameobjects/Third Party Notices.md.meta diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json new file mode 100644 index 0000000000..98c4b25d69 --- /dev/null +++ b/com.unity.netcode.gameobjects/package.json @@ -0,0 +1,12 @@ +{ + "name": "com.unity.netcode.gameobjects", + "displayName": "Netcode for GameObjects", + "description": "Netcode for GameObjects is a high-level netcode SDK that provides networking capabilities to GameObject/MonoBehaviour workflows within Unity and sits on top of underlying transport layer.", + "version": "0.2.0", + "unity": "2020.3", + "dependencies": { + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.nuget.mono-cecil": "1.10.1-preview.1" + } +} diff --git a/com.unity.multiplayer.mlapi/package.json.meta b/com.unity.netcode.gameobjects/package.json.meta similarity index 100% rename from com.unity.multiplayer.mlapi/package.json.meta rename to com.unity.netcode.gameobjects/package.json.meta diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index 4bc3118fdb..345ff22e9f 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -4,7 +4,7 @@ "com.unity.ide.rider": "3.0.5", "com.unity.ide.visualstudio": "2.0.8", "com.unity.ide.vscode": "1.2.3", - "com.unity.multiplayer.mlapi": "file:../../com.unity.multiplayer.mlapi", + "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", "com.unity.multiplayer.transport.utp": "file:../../com.unity.multiplayer.transport.utp", "com.unity.package-validation-suite": "0.19.2-preview", "com.unity.test-framework": "1.1.27", @@ -45,7 +45,7 @@ "com.unity.modules.xr": "1.0.0" }, "testables": [ - "com.unity.multiplayer.mlapi", + "com.unity.netcode.gameobjects", "com.unity.multiplayer.transport.utp" ] } diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index bc2860bfca..0c6b93e43a 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -75,24 +75,24 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.multiplayer.mlapi": { - "version": "file:../../com.unity.multiplayer.mlapi", + "com.unity.multiplayer.transport.utp": { + "version": "file:../../com.unity.multiplayer.transport.utp", "depth": 0, "source": "local", "dependencies": { - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.nuget.mono-cecil": "1.10.1-preview.1" + "com.unity.netcode.gameobjects": "0.0.1-preview.1", + "com.unity.transport": "0.4.1-preview.1", + "com.unity.jobs": "0.2.10-preview.13" } }, - "com.unity.multiplayer.transport.utp": { - "version": "file:../../com.unity.multiplayer.transport.utp", + "com.unity.netcode.gameobjects": { + "version": "file:../../com.unity.netcode.gameobjects", "depth": 0, "source": "local", "dependencies": { - "com.unity.multiplayer.mlapi": "0.0.1-preview.1", - "com.unity.transport": "0.4.1-preview.1", - "com.unity.jobs": "0.2.10-preview.13" + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.nuget.mono-cecil": "1.10.1-preview.1" } }, "com.unity.nuget.mono-cecil": {