From 6e90f430d5ac4ffc07c51fbcd21c87cef6605726 Mon Sep 17 00:00:00 2001 From: "M. Fatih MAR" Date: Tue, 7 Sep 2021 11:47:47 +0100 Subject: [PATCH] chore!: rename Prototyping asmdef to Components --- .yamato/code-coverage.yml | 2 +- .../{Prototyping.meta => Components.meta} | 2 +- .../{Prototyping => Components}/AssemblyInfo.cs | 0 .../{Prototyping => Components}/AssemblyInfo.cs.meta | 0 .../{Prototyping => Components}/NetworkAnimator.cs | 2 +- .../{Prototyping => Components}/NetworkAnimator.cs.meta | 0 .../{Prototyping => Components}/NetworkNavMeshAgent.cs | 2 +- .../NetworkNavMeshAgent.cs.meta | 0 .../{Prototyping => Components}/NetworkTransform.cs | 2 +- .../{Prototyping => Components}/NetworkTransform.cs.meta | 0 .../Components/com.unity.netcode.components.asmdef | 7 +++++++ .../com.unity.netcode.components.asmdef.meta} | 0 .../Editor/NetworkTransformEditor.cs | 2 +- .../Editor/com.unity.netcode.editor.asmdef | 2 +- .../Prototyping/com.unity.netcode.prototyping.asmdef | 7 ------- .../Runtime/NetworkTransform/NetworkTransformStateTests.cs | 2 +- .../Runtime/NetworkTransform/NetworkTransformTests.cs | 2 +- .../Tests/Runtime/com.unity.netcode.runtimetests.asmdef | 2 +- testproject/Assets/Scripts/testproject.asmdef | 2 +- .../Manual/NetworkAnimatorTests/AnimatedCubeController.cs | 2 +- .../Assets/Tests/Manual/testproject.manualtests.asmdef | 2 +- 21 files changed, 20 insertions(+), 20 deletions(-) rename com.unity.netcode.gameobjects/{Prototyping.meta => Components.meta} (77%) rename com.unity.netcode.gameobjects/{Prototyping => Components}/AssemblyInfo.cs (100%) rename com.unity.netcode.gameobjects/{Prototyping => Components}/AssemblyInfo.cs.meta (100%) rename com.unity.netcode.gameobjects/{Prototyping => Components}/NetworkAnimator.cs (99%) rename com.unity.netcode.gameobjects/{Prototyping => Components}/NetworkAnimator.cs.meta (100%) rename com.unity.netcode.gameobjects/{Prototyping => Components}/NetworkNavMeshAgent.cs (99%) rename com.unity.netcode.gameobjects/{Prototyping => Components}/NetworkNavMeshAgent.cs.meta (100%) rename com.unity.netcode.gameobjects/{Prototyping => Components}/NetworkTransform.cs (99%) rename com.unity.netcode.gameobjects/{Prototyping => Components}/NetworkTransform.cs.meta (100%) create mode 100644 com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef rename com.unity.netcode.gameobjects/{Prototyping/com.unity.netcode.prototyping.asmdef.meta => Components/com.unity.netcode.components.asmdef.meta} (100%) delete mode 100644 com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml index d4231f53df..8e09793593 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.netcode.gameobjects --enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime,+Unity.Netcode.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.Components' artifacts: logs: paths: diff --git a/com.unity.netcode.gameobjects/Prototyping.meta b/com.unity.netcode.gameobjects/Components.meta similarity index 77% rename from com.unity.netcode.gameobjects/Prototyping.meta rename to com.unity.netcode.gameobjects/Components.meta index a536014db1..d4eb0dae79 100644 --- a/com.unity.netcode.gameobjects/Prototyping.meta +++ b/com.unity.netcode.gameobjects/Components.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f9f645c043894b81ab326fe4703f4c8 +guid: 8b267eb841a574dc083ac248a95d4443 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs b/com.unity.netcode.gameobjects/Components/AssemblyInfo.cs similarity index 100% rename from com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs rename to com.unity.netcode.gameobjects/Components/AssemblyInfo.cs diff --git a/com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs.meta b/com.unity.netcode.gameobjects/Components/AssemblyInfo.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs.meta rename to com.unity.netcode.gameobjects/Components/AssemblyInfo.cs.meta diff --git a/com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs b/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs similarity index 99% rename from com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs rename to com.unity.netcode.gameobjects/Components/NetworkAnimator.cs index a13bb2d201..a1f16d86de 100644 --- a/com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs +++ b/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Netcode.Prototyping +namespace Unity.Netcode.Components { /// /// A prototype component for syncing animations diff --git a/com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs.meta b/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Prototyping/NetworkAnimator.cs.meta rename to com.unity.netcode.gameobjects/Components/NetworkAnimator.cs.meta diff --git a/com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs b/com.unity.netcode.gameobjects/Components/NetworkNavMeshAgent.cs similarity index 99% rename from com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs rename to com.unity.netcode.gameobjects/Components/NetworkNavMeshAgent.cs index 6163f4a965..7a2e040a6b 100644 --- a/com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs +++ b/com.unity.netcode.gameobjects/Components/NetworkNavMeshAgent.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.AI; -namespace Unity.Netcode.Prototyping +namespace Unity.Netcode.Components { /// /// A prototype component for syncing NavMeshAgents diff --git a/com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs.meta b/com.unity.netcode.gameobjects/Components/NetworkNavMeshAgent.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Prototyping/NetworkNavMeshAgent.cs.meta rename to com.unity.netcode.gameobjects/Components/NetworkNavMeshAgent.cs.meta diff --git a/com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs b/com.unity.netcode.gameobjects/Components/NetworkTransform.cs similarity index 99% rename from com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs rename to com.unity.netcode.gameobjects/Components/NetworkTransform.cs index ccfb9db003..214091cbb5 100644 --- a/com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs +++ b/com.unity.netcode.gameobjects/Components/NetworkTransform.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Netcode.Prototyping +namespace Unity.Netcode.Components { /// /// A prototype component for syncing transforms diff --git a/com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs.meta b/com.unity.netcode.gameobjects/Components/NetworkTransform.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Prototyping/NetworkTransform.cs.meta rename to com.unity.netcode.gameobjects/Components/NetworkTransform.cs.meta diff --git a/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef b/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef new file mode 100644 index 0000000000..6ebf224622 --- /dev/null +++ b/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef @@ -0,0 +1,7 @@ +{ + "name": "Unity.Netcode.Components", + "rootNamespace": "Unity.Netcode.Components", + "references": [ + "Unity.Netcode.Runtime" + ] +} \ No newline at end of file diff --git a/com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef.meta b/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef.meta similarity index 100% rename from com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef.meta rename to com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef.meta diff --git a/com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs index 519b2a6f38..c271ad22a7 100644 --- a/com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs +++ b/com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs @@ -1,6 +1,6 @@ -using Unity.Netcode.Prototyping; using UnityEditor; using UnityEngine; +using Unity.Netcode.Components; namespace Unity.Netcode.Editor { diff --git a/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef b/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef index fb5e80bc83..0b617f3ec6 100644 --- a/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef +++ b/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef @@ -3,7 +3,7 @@ "rootNamespace": "Unity.Netcode.Editor", "references": [ "Unity.Netcode.Runtime", - "Unity.Netcode.Prototyping" + "Unity.Netcode.Components" ], "includePlatforms": [ "Editor" diff --git a/com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef b/com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef deleted file mode 100644 index 0a93c26183..0000000000 --- a/com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "Unity.Netcode.Prototyping", - "rootNamespace": "Unity.Netcode.Prototyping", - "references": [ - "Unity.Netcode.Runtime" - ] -} \ No newline at end of file diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs index 3425059c56..77b8943c9a 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using Unity.Netcode.Prototyping; +using Unity.Netcode.Components; using UnityEngine; namespace Unity.Netcode.RuntimeTests diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs index 000f61323f..38a0ba9544 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs @@ -1,5 +1,5 @@ using System.Collections; -using Unity.Netcode.Prototyping; +using Unity.Netcode.Components; using NUnit.Framework; using UnityEngine.TestTools; diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef b/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef index 993f362322..26543c4e4e 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef +++ b/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef @@ -4,7 +4,7 @@ "references": [ "Unity.Netcode.Runtime", "Unity.Netcode.Editor", - "Unity.Netcode.Prototyping", + "Unity.Netcode.Components", "Unity.Collections", "UnityEngine.TestRunner", "Unity.Multiplayer.MetricTypes", diff --git a/testproject/Assets/Scripts/testproject.asmdef b/testproject/Assets/Scripts/testproject.asmdef index 1d062c1467..7dd825f751 100644 --- a/testproject/Assets/Scripts/testproject.asmdef +++ b/testproject/Assets/Scripts/testproject.asmdef @@ -3,6 +3,6 @@ "references": [ "Unity.Netcode.Runtime", "Unity.Netcode.Editor", - "Unity.Netcode.Prototyping" + "Unity.Netcode.Components" ] } \ No newline at end of file diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs index f24d57f625..706a83fad9 100644 --- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs +++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs @@ -1,5 +1,5 @@ using Unity.Netcode; -using Unity.Netcode.Prototyping; +using Unity.Netcode.Components; using UnityEngine; namespace Tests.Manual.NetworkAnimatorTests diff --git a/testproject/Assets/Tests/Manual/testproject.manualtests.asmdef b/testproject/Assets/Tests/Manual/testproject.manualtests.asmdef index 87b8fcd958..d47e2ed51a 100644 --- a/testproject/Assets/Tests/Manual/testproject.manualtests.asmdef +++ b/testproject/Assets/Tests/Manual/testproject.manualtests.asmdef @@ -5,6 +5,6 @@ "TestProject", "Unity.Netcode.Runtime", "Unity.Netcode.Editor", - "Unity.Netcode.Prototyping" + "Unity.Netcode.Components" ] }