Use RegisterComponent* constraint Component

hadashiA · Jan 28, 2021 · 5091d39 · 5091d39
1 parent 03aca75
commit 5091d39
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Unity/ComponentRegistrationBuilder.cs b/VContainer/Assets/VContainer/Runtime/Unity/ComponentRegistrationBuilder.cs
@@ -12,7 +12,7 @@ public sealed class ComponentRegistrationBuilder : RegistrationBuilder
         string gameObjectName;
         Component prefab;
 
-        internal ComponentRegistrationBuilder(
+        ComponentRegistrationBuilder(
             Type implementationType,
             Lifetime lifetime,
             List<Type> interfaceTypes = null)

diff --git a/VContainer/Assets/VContainer/Runtime/Unity/ContainerBuilderUnityExtensions.cs b/VContainer/Assets/VContainer/Runtime/Unity/ContainerBuilderUnityExtensions.cs
@@ -34,15 +34,15 @@ public ComponentsBuilder(IContainerBuilder containerBuilder)
         public RegistrationBuilder AddInstance(MonoBehaviour component)
             => containerBuilder.RegisterComponent(component);
 
-        public RegistrationBuilder AddInHierarchy<T>() where T : MonoBehaviour
+        public RegistrationBuilder AddInHierarchy<T>() where T : Component
             => containerBuilder.RegisterComponentInHierarchy<T>();
 
         public ComponentRegistrationBuilder AddOnNewGameObject<T>(Lifetime lifetime, string newGameObjectName = null)
-            where T : MonoBehaviour
+            where T : Component
             => containerBuilder.RegisterComponentOnNewGameObject<T>(lifetime, newGameObjectName);
 
         public ComponentRegistrationBuilder AddInNewPrefab<T>(T prefab, Lifetime lifetime)
-            where T : MonoBehaviour
+            where T : Component
             => containerBuilder.RegisterComponentInNewPrefab(prefab, lifetime);
     }
 
@@ -115,7 +115,7 @@ public static ComponentRegistrationBuilder RegisterComponentOnNewGameObject<T>(
             this IContainerBuilder builder,
             Lifetime lifetime,
             string newGameObjectName = null)
-            where T : MonoBehaviour
+            where T : Component
         {
             var registrationBuilder = new ComponentRegistrationBuilder(
                 newGameObjectName,
@@ -129,7 +129,7 @@ public static ComponentRegistrationBuilder RegisterComponentInNewPrefab<T>(
             this IContainerBuilder builder,
             T prefab,
             Lifetime lifetime)
-            where T : MonoBehaviour
+            where T : Component
         {
             var registrationBuilder = new ComponentRegistrationBuilder(
                 prefab,

diff --git a/VContainer/Packages/manifest.json b/VContainer/Packages/manifest.json
@@ -3,7 +3,7 @@
     "com.unity.entities": "0.11.1-preview.4",
     "com.unity.ide.rider": "2.0.7",
     "com.unity.ide.visualstudio": "2.0.5",
-    "com.unity.test-framework": "1.1.19",
+    "com.unity.test-framework": "1.1.20",
     "com.unity.ugui": "1.0.0",
     "nuget.mono-cecil": "0.1.6-preview",
     "com.unity.modules.animation": "1.0.0",

diff --git a/VContainer/Packages/packages-lock.json b/VContainer/Packages/packages-lock.json
@@ -38,7 +38,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.5",
+      "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -144,11 +144,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.19",
+      "version": "1.1.20",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.5",
+        "com.unity.ext.nunit": "1.0.6",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },