From bbb5b0384c04fd6b4b5d8d35838815a6a12e496e Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Thu, 8 Apr 2021 21:08:37 +0900
Subject: [PATCH] =?UTF-8?q?2018=E4=BB=95=E6=A7=98=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef             |  9 ++++-----
 .../Editor/Tests/VRM.Samples.Editor.Tests.asmdef      |  9 ++++-----
 Assets/VRM/Tests/VRM.Tests.asmdef                     |  9 ++++-----
 .../VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef  |  9 ++++-----
 Assets/VRM10/Tests/VRM10.Tests.asmdef                 | 11 +++++------
 .../GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef     | 11 +++++------
 6 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef
index e19102640..26d18d36e 100644
--- a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef
+++ b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef
@@ -3,11 +3,12 @@
     "references": [
         "UniGLTF",
         "UniGLTF.Editor",
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner",
         "VRMShaders.GLTF.IO.Runtime",
         "VRMShaders.GLTF.IO.Editor"
     ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
     "includePlatforms": [
         "Editor"
     ],
@@ -20,7 +21,5 @@
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
+    ]
 }
\ No newline at end of file
diff --git a/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef b/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef
index 31e323af4..ef57fbc84 100644
--- a/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef
+++ b/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef
@@ -7,11 +7,12 @@
         "UniGLTF",
         "UniVRM.Editor",
         "VRM.Tests",
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner",
         "VRMShaders.GLTF.IO.Runtime",
         "VRMShaders.GLTF.IO.Editor"
     ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
     "includePlatforms": [
         "Editor"
     ],
@@ -24,7 +25,5 @@
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
+    ]
 }
\ No newline at end of file
diff --git a/Assets/VRM/Tests/VRM.Tests.asmdef b/Assets/VRM/Tests/VRM.Tests.asmdef
index 104cbed42..f7e300683 100644
--- a/Assets/VRM/Tests/VRM.Tests.asmdef
+++ b/Assets/VRM/Tests/VRM.Tests.asmdef
@@ -5,11 +5,12 @@
         "UniGLTF",
         "MeshUtility",
         "MeshUtility.Editor",
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner",
         "VRMShaders.GLTF.IO.Runtime",
         "VRMShaders.GLTF.IO.Editor"
     ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
     "includePlatforms": [
         "Editor"
     ],
@@ -22,7 +23,5 @@
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
+    ]
 }
\ No newline at end of file
diff --git a/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef b/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef
index e3e9186fd..4a7b6f8ff 100644
--- a/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef
+++ b/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef
@@ -4,10 +4,11 @@
         "VrmLib",
         "VRM10",
         "UniGLTF",
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner",
         "VRMShaders.GLTF.IO.Runtime"
     ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
@@ -18,7 +19,5 @@
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
+    ]
 }
\ No newline at end of file
diff --git a/Assets/VRM10/Tests/VRM10.Tests.asmdef b/Assets/VRM10/Tests/VRM10.Tests.asmdef
index de5b82d71..edbcc5fca 100644
--- a/Assets/VRM10/Tests/VRM10.Tests.asmdef
+++ b/Assets/VRM10/Tests/VRM10.Tests.asmdef
@@ -3,9 +3,10 @@
     "references": [
         "VrmLib",
         "VRM10",
-        "UniGLTF",
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
+        "UniGLTF"
+    ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
     ],
     "includePlatforms": [
         "Editor"
@@ -20,7 +21,5 @@
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS",
         "UNITY_INCLUDE_TESTS"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
+    ]
 }
\ No newline at end of file
diff --git a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef
index eb41f813b..1c5c4e761 100644
--- a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef
+++ b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef
@@ -2,9 +2,10 @@
     "name": "VRMShaders.GLTF.IO.Tests",
     "references": [
         "VRMShaders.GLTF.IO.Runtime",
-        "VRMShaders.GLTF.IO.Editor",
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
+        "VRMShaders.GLTF.IO.Editor"
+    ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
     ],
     "includePlatforms": [
         "Editor"
@@ -18,7 +19,5 @@
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
+    ]
 }
\ No newline at end of file