Skip to content

chore!: rename Prototyping asmdef to Components #1145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xFA11 merged 3 commits into from
Sep 7, 2021
Merged

chore!: rename Prototyping asmdef to Components #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e90f43
chore!: rename Prototyping asmdef to Components
0xFA11 Sep 7, 2021
7f7f725
Merge branch 'develop' into chore/components-asmdef
0xFA11 Sep 7, 2021
45c0ff8
Merge branch 'develop' into chore/components-asmdef
0xFA11 Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yamato/code-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...nity.netcode.gameobjects/Prototyping.meta → ...unity.netcode.gameobjects/Components.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...e.gameobjects/Prototyping/AssemblyInfo.cs → ...de.gameobjects/Components/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
0 ...eobjects/Prototyping/AssemblyInfo.cs.meta → ...meobjects/Components/AssemblyInfo.cs.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ameobjects/Prototyping/NetworkAnimator.cs → ...gameobjects/Components/NetworkAnimator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;

namespace Unity.Netcode.Prototyping
namespace Unity.Netcode.Components
Copy link
Copy Markdown
Contributor

@mattwalsh-unity mattwalsh-unity Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does having this namespace buy us anything? I like moving things out of the Prototyping folder. But like, we have a number of things that are in folders (e.g. NetworkVariable) that are not in a NetworkVariable different namespace.

Copy link
Copy Markdown
Contributor Author

@0xFA11 0xFA11 Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to inline some parts of our Slack conversation here too:

I think the difference is NetworkTransform, NetworkAnimator etc are going to be bespoke Unity-tailored components
Components is more like "bespoke network components to use in Unity world"
So, I wouldn't say NetworkVariable will be kicked out of Runtime/Core in the future, we'll probably keep it in the core long term

{
/// <summary>
/// A prototype component for syncing animations
Expand Down
0 ...jects/Prototyping/NetworkAnimator.cs.meta → ...bjects/Components/NetworkAnimator.cs.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...bjects/Prototyping/NetworkNavMeshAgent.cs → ...objects/Components/NetworkNavMeshAgent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEngine;
using UnityEngine.AI;

namespace Unity.Netcode.Prototyping
namespace Unity.Netcode.Components
{
/// <summary>
/// A prototype component for syncing NavMeshAgents
Expand Down
0 ...s/Prototyping/NetworkNavMeshAgent.cs.meta → ...ts/Components/NetworkNavMeshAgent.cs.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...meobjects/Prototyping/NetworkTransform.cs → ...ameobjects/Components/NetworkTransform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using UnityEngine;

namespace Unity.Netcode.Prototyping
namespace Unity.Netcode.Components
{
/// <summary>
/// A prototype component for syncing transforms
Expand Down
0 ...ects/Prototyping/NetworkTransform.cs.meta → ...jects/Components/NetworkTransform.cs.meta
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "Unity.Netcode.Components",
"rootNamespace": "Unity.Netcode.Components",
"references": [
"Unity.Netcode.Runtime"
]
}
0 ...com.unity.netcode.prototyping.asmdef.meta → .../com.unity.netcode.components.asmdef.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Unity.Netcode.Prototyping;
using UnityEditor;
using UnityEngine;
using Unity.Netcode.Components;

namespace Unity.Netcode.Editor
{
Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"rootNamespace": "Unity.Netcode.Editor",
"references": [
"Unity.Netcode.Runtime",
"Unity.Netcode.Prototyping"
"Unity.Netcode.Components"
],
"includePlatforms": [
"Editor"
Expand Down
7 changes: 0 additions & 7 deletions com.unity.netcode.gameobjects/Prototyping/com.unity.netcode.prototyping.asmdef
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using NUnit.Framework;
using Unity.Netcode.Prototyping;
using Unity.Netcode.Components;
using UnityEngine;

namespace Unity.Netcode.RuntimeTests
Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Collections;
using Unity.Netcode.Prototyping;
using Unity.Netcode.Components;
using NUnit.Framework;
using UnityEngine.TestTools;

Expand Down
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"references": [
"Unity.Netcode.Runtime",
"Unity.Netcode.Editor",
"Unity.Netcode.Prototyping",
"Unity.Netcode.Components",
"Unity.Collections",
"UnityEngine.TestRunner",
"Unity.Multiplayer.MetricTypes",
Expand Down
2 changes: 1 addition & 1 deletion testproject/Assets/Scripts/testproject.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"references": [
"Unity.Netcode.Runtime",
"Unity.Netcode.Editor",
"Unity.Netcode.Prototyping"
"Unity.Netcode.Components"
]
}
2 changes: 1 addition & 1 deletion testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Unity.Netcode;
using Unity.Netcode.Prototyping;
using Unity.Netcode.Components;
using UnityEngine;

namespace Tests.Manual.NetworkAnimatorTests
Expand Down
2 changes: 1 addition & 1 deletion testproject/Assets/Tests/Manual/testproject.manualtests.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"TestProject",
"Unity.Netcode.Runtime",
"Unity.Netcode.Editor",
"Unity.Netcode.Prototyping"
"Unity.Netcode.Components"
]
}