From 58b2588f2d3321886227ef2efa094d0ececbff29 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Wed, 4 Aug 2021 15:19:09 +0900 Subject: [PATCH 1/2] Use GUID in asmdefs --- Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef | 11 ++++---- Assets/UniGLTF/Runtime/UniGLTF.asmdef | 9 ++++--- Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef | 21 ++++++++------- .../Tests/UniHumanoid.Editor.Tests.asmdef | 21 +++++++++------ .../Editor/UniHumanoid.Editor.asmdef | 9 ++++--- Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef | 5 ++-- .../Tests/VRM.Samples.Editor.Tests.asmdef | 27 ++++++++++--------- Assets/VRM.Samples/VRM.Samples.asmdef | 13 ++++----- Assets/VRM/Editor/VRM.Editor.asmdef | 19 ++++++------- Assets/VRM/Runtime/VRM.asmdef | 15 ++++++----- Assets/VRM/Tests/VRM.Tests.asmdef | 25 +++++++++-------- .../Runtime/VRM10.Samples.Runtime.asmdef | 13 ++++----- Assets/VRM10/Editor/VRM10.Editor.asmdef | 17 ++++++------ Assets/VRM10/Runtime/VRM10.asmdef | 19 ++++++------- .../VRM10.Tests.PlayMode.asmdef | 21 ++++++++------- Assets/VRM10/Tests/VRM10.Tests.asmdef | 26 ++++++++++-------- Assets/VRM10/vrmlib/Runtime/VrmLib.asmdef | 7 ++--- Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef | 18 ++++++++----- .../Editor/VRMShaders.GLTF.IO.Editor.asmdef | 7 ++--- .../Runtime/VRMShaders.GLTF.IO.Runtime.asmdef | 7 ++--- .../IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef | 17 +++++++----- .../VRMShaders.GLTF.UniUnlit.Editor.asmdef | 7 ++--- .../VRMShaders.GLTF.UniUnlit.Runtime.asmdef | 5 ++-- .../IO/Editor/VRMShaders.VRM.IO.Editor.asmdef | 7 ++--- .../Runtime/VRMShaders.VRM.IO.Runtime.asmdef | 5 ++-- Assets/VRMShaders/VRM/MToon | 2 +- .../VRMShaders.VRM10.Format.Runtime.asmdef | 5 ++-- .../VRMShaders.VRM10.MToon10.Editor.asmdef | 7 ++--- .../VRMShaders.VRM10.MToon10.Runtime.asmdef | 5 ++-- .../VRMShaders.VRM10.MToon10.Tests.asmdef | 19 ++++++++----- 30 files changed, 221 insertions(+), 168 deletions(-) diff --git a/Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef b/Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef index 7f7eecc29f..7d8718ed49 100644 --- a/Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef +++ b/Assets/UniGLTF/Editor/UniGLTF.Editor.asmdef @@ -1,11 +1,10 @@ { "name": "UniGLTF.Editor", "references": [ - "UniGLTF", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.IO.Editor" + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:7da8a75dcade2144aab699032d7d7987" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -14,5 +13,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/UniGLTF.asmdef b/Assets/UniGLTF/Runtime/UniGLTF.asmdef index 7431b096d1..7932fb6b15 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF.asmdef +++ b/Assets/UniGLTF/Runtime/UniGLTF.asmdef @@ -1,15 +1,16 @@ { "name": "UniGLTF", "references": [ - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.UniUnlit.Runtime" + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:60c8346e00a8ddd4cafc5a02eceeec57" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef index 74bed3e5d1..0afe38ab09 100644 --- a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef +++ b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef @@ -1,25 +1,28 @@ { "name": "UniGLTF.Tests", "references": [ - "UniGLTF", - "UniGLTF.Editor", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.IO.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:5f875fdc81c40184c8333b9d63c6ddd5", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:7da8a75dcade2144aab699032d7d7987", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, + "overrideReferences": true, "precompiledReferences": [ + "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ + "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" - ] + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef b/Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef index 621adc5da6..f8d849b6b4 100644 --- a/Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef +++ b/Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef @@ -1,19 +1,24 @@ { "name": "UniHumanoid.Editor.Tests", "references": [ - "VRM", - "UniHumanoid" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:05dd262a0c0a2f841b8252c8c3815582", + "GUID:b7aa47b240b57de44a4b2021c143c9bf", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef b/Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef index 5facd11205..01e7813599 100644 --- a/Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef +++ b/Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef @@ -1,10 +1,9 @@ { "name": "UniHumanoid.Editor", "references": [ - "VRM", - "UniHumanoid" + "GUID:05dd262a0c0a2f841b8252c8c3815582", + "GUID:b7aa47b240b57de44a4b2021c143c9bf" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -13,5 +12,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef b/Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef index 9f9eaf6e9c..b66a782907 100644 --- a/Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef +++ b/Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef @@ -1,12 +1,13 @@ { "name": "UniHumanoid", "references": [], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "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 bc514563e0..0d4908d27a 100644 --- a/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef +++ b/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef @@ -1,28 +1,31 @@ { "name": "VRM.Samples.Editor.Tests", "references": [ - "VRM", - "VRM.Samples", - "UniGLTF", - "UniVRM.Editor", - "VRM.Tests", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.IO.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:05dd262a0c0a2f841b8252c8c3815582", + "GUID:627491ce4646ac8469d7689ab146358b", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:f7b2dd4e5e1e7264089dc065c45db910", + "GUID:0eadcadee644f4e4cb96f0c11df10d89", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:7da8a75dcade2144aab699032d7d7987", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, + "overrideReferences": true, "precompiledReferences": [ + "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ + "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" - ] + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM.Samples/VRM.Samples.asmdef b/Assets/VRM.Samples/VRM.Samples.asmdef index 287107a430..1e14a7444c 100644 --- a/Assets/VRM.Samples/VRM.Samples.asmdef +++ b/Assets/VRM.Samples/VRM.Samples.asmdef @@ -1,17 +1,18 @@ { "name": "VRM.Samples", "references": [ - "VRM", - "UniHumanoid", - "UniGLTF", - "VRMShaders.GLTF.IO.Runtime" + "GUID:05dd262a0c0a2f841b8252c8c3815582", + "GUID:b7aa47b240b57de44a4b2021c143c9bf", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:da3e51d19d51a544fa14d43fee843098" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM/Editor/VRM.Editor.asmdef b/Assets/VRM/Editor/VRM.Editor.asmdef index 38a926c9d3..19d22acef6 100644 --- a/Assets/VRM/Editor/VRM.Editor.asmdef +++ b/Assets/VRM/Editor/VRM.Editor.asmdef @@ -1,15 +1,14 @@ { "name": "UniVRM.Editor", "references": [ - "VRM", - "UniHumanoid", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.IO.Editor", - "UniGLTF", - "UniGLTF.Editor", - "VRMShaders.VRM.IO.Runtime" + "GUID:05dd262a0c0a2f841b8252c8c3815582", + "GUID:b7aa47b240b57de44a4b2021c143c9bf", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:7da8a75dcade2144aab699032d7d7987", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:5f875fdc81c40184c8333b9d63c6ddd5", + "GUID:301b251fd9834274c9228e0532f444f7" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -18,5 +17,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM/Runtime/VRM.asmdef b/Assets/VRM/Runtime/VRM.asmdef index d5bac528be..053d4f4d53 100644 --- a/Assets/VRM/Runtime/VRM.asmdef +++ b/Assets/VRM/Runtime/VRM.asmdef @@ -1,18 +1,19 @@ { "name": "VRM", "references": [ - "UniHumanoid", - "UniGLTF", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.VRM.IO.Runtime", - "MToon" + "GUID:b7aa47b240b57de44a4b2021c143c9bf", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:301b251fd9834274c9228e0532f444f7", + "GUID:a9bc101fb0471f94a8f99fd242fdd934" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "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 426bb323fe..3f93fd7a9a 100644 --- a/Assets/VRM/Tests/VRM.Tests.asmdef +++ b/Assets/VRM/Tests/VRM.Tests.asmdef @@ -1,27 +1,30 @@ { "name": "VRM.Tests", "references": [ - "VRM", - "UniVRM.Editor", - "UniGLTF", - "UniGLTF.Editor", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.IO.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:05dd262a0c0a2f841b8252c8c3815582", + "GUID:f7b2dd4e5e1e7264089dc065c45db910", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:5f875fdc81c40184c8333b9d63c6ddd5", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:7da8a75dcade2144aab699032d7d7987", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, + "overrideReferences": true, "precompiledReferences": [ + "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ + "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" - ] + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef b/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef index 35c658461e..939d791306 100644 --- a/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef +++ b/Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef @@ -1,17 +1,18 @@ { "name": "VRM10.Samples.Runtime", "references": [ - "UniGLTF", - "VRMShaders.GLTF.IO.Runtime", - "VRM10", - "UniHumanoid" + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:e47c917724578cc43b5506c17a27e9a0", + "GUID:b7aa47b240b57de44a4b2021c143c9bf" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM10/Editor/VRM10.Editor.asmdef b/Assets/VRM10/Editor/VRM10.Editor.asmdef index 940e24a865..de8ec9fe74 100644 --- a/Assets/VRM10/Editor/VRM10.Editor.asmdef +++ b/Assets/VRM10/Editor/VRM10.Editor.asmdef @@ -1,14 +1,13 @@ { "name": "VRM10.Editor", "references": [ - "VRM10", - "VrmLib", - "UniGLTF.Editor", - "UniGLTF", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.IO.Editor" + "GUID:e47c917724578cc43b5506c17a27e9a0", + "GUID:2ef84b520212e174a94668c7a0862d3b", + "GUID:5f875fdc81c40184c8333b9d63c6ddd5", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:7da8a75dcade2144aab699032d7d7987" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -17,5 +16,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM10/Runtime/VRM10.asmdef b/Assets/VRM10/Runtime/VRM10.asmdef index 2edebf50b9..11a33ede94 100644 --- a/Assets/VRM10/Runtime/VRM10.asmdef +++ b/Assets/VRM10/Runtime/VRM10.asmdef @@ -1,20 +1,21 @@ { "name": "VRM10", "references": [ - "VrmLib", - "MToon", - "UniGLTF", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.VRM10.Format.Runtime", - "VRMShaders.VRM10.MToon10.Runtime", - "UniHumanoid" + "GUID:2ef84b520212e174a94668c7a0862d3b", + "GUID:a9bc101fb0471f94a8f99fd242fdd934", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:bce005214fa49654d93927908c15b1f2", + "GUID:0aaf403bd13871a44b7127aef2695ff8", + "GUID:b7aa47b240b57de44a4b2021c143c9bf" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "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 45befedcbd..fd2d017a0b 100644 --- a/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef +++ b/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef @@ -1,23 +1,26 @@ { "name": "VRM10.Tests.PlayMode", "references": [ - "VrmLib", - "VRM10", - "UniGLTF", - "VRMShaders.GLTF.IO.Runtime" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:2ef84b520212e174a94668c7a0862d3b", + "GUID:e47c917724578cc43b5506c17a27e9a0", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, + "overrideReferences": true, "precompiledReferences": [ + "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ + "UNITY_INCLUDE_TESTS", "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 c4d2bfea83..e05e5ffb58 100644 --- a/Assets/VRM10/Tests/VRM10.Tests.asmdef +++ b/Assets/VRM10/Tests/VRM10.Tests.asmdef @@ -1,24 +1,28 @@ { "name": "VRM10.Tests", "references": [ - "VrmLib", - "VRM10", - "UniGLTF", - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.IO.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:2ef84b520212e174a94668c7a0862d3b", + "GUID:e47c917724578cc43b5506c17a27e9a0", + "GUID:8d76e605759c3f64a957d63ef96ada7c", + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:7da8a75dcade2144aab699032d7d7987", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], "autoReferenced": false, "defineConstraints": [ + "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" - ] + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM10/vrmlib/Runtime/VrmLib.asmdef b/Assets/VRM10/vrmlib/Runtime/VrmLib.asmdef index 03a72f7e3c..d3ffc1a7f6 100644 --- a/Assets/VRM10/vrmlib/Runtime/VrmLib.asmdef +++ b/Assets/VRM10/vrmlib/Runtime/VrmLib.asmdef @@ -1,14 +1,15 @@ { "name": "VrmLib", "references": [ - "UniGLTF" + "GUID:8d76e605759c3f64a957d63ef96ada7c" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef b/Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef index 440c1809cf..e7e7325b89 100644 --- a/Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef +++ b/Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef @@ -1,20 +1,24 @@ { "name": "VrmLibTests", "references": [ - "VrmLib" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:2ef84b520212e174a94668c7a0862d3b", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], "autoReferenced": false, "defineConstraints": [ + "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" - ] + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef b/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef index 52326176ae..473e412703 100644 --- a/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef +++ b/Assets/VRMShaders/GLTF/IO/Editor/VRMShaders.GLTF.IO.Editor.asmdef @@ -1,9 +1,8 @@ { "name": "VRMShaders.GLTF.IO.Editor", "references": [ - "VRMShaders.GLTF.IO.Runtime" + "GUID:da3e51d19d51a544fa14d43fee843098" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -12,5 +11,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef index 722da26805..3b9bbeeb0e 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef +++ b/Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef @@ -1,14 +1,15 @@ { "name": "VRMShaders.GLTF.IO.Runtime", "references": [ - "VRMShaders.GLTF.UniUnlit.Runtime" + "GUID:60c8346e00a8ddd4cafc5a02eceeec57" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [] + "defineConstraints": [], + "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 c37464477f..c0f390a4de 100644 --- a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef +++ b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef @@ -1,23 +1,26 @@ { "name": "VRMShaders.GLTF.IO.Tests", "references": [ - "VRMShaders.GLTF.IO.Runtime", - "VRMShaders.GLTF.IO.Editor" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:da3e51d19d51a544fa14d43fee843098", + "GUID:7da8a75dcade2144aab699032d7d7987", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, + "overrideReferences": true, "precompiledReferences": [ + "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ + "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" - ] + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef b/Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef index 202ca5b459..dd6bc4e30c 100644 --- a/Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef +++ b/Assets/VRMShaders/GLTF/UniUnlit/Editor/VRMShaders.GLTF.UniUnlit.Editor.asmdef @@ -1,9 +1,8 @@ { "name": "VRMShaders.GLTF.UniUnlit.Editor", "references": [ - "VRMShaders.GLTF.UniUnlit.Runtime" + "GUID:60c8346e00a8ddd4cafc5a02eceeec57" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -12,5 +11,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef b/Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef index 7136ae37a5..b2fa1c3278 100644 --- a/Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef +++ b/Assets/VRMShaders/GLTF/UniUnlit/Runtime/VRMShaders.GLTF.UniUnlit.Runtime.asmdef @@ -1,12 +1,13 @@ { "name": "VRMShaders.GLTF.UniUnlit.Runtime", "references": [], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef b/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef index ec48913322..683e958e1b 100644 --- a/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef +++ b/Assets/VRMShaders/VRM/IO/Editor/VRMShaders.VRM.IO.Editor.asmdef @@ -1,9 +1,8 @@ { "name": "VRMShaders.VRM.IO.Editor", "references": [ - "VRMShaders.VRM.IO.Runtime" + "GUID:301b251fd9834274c9228e0532f444f7" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -12,5 +11,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef index 45a1aae835..1afe036ef0 100644 --- a/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef +++ b/Assets/VRMShaders/VRM/IO/Runtime/VRMShaders.VRM.IO.Runtime.asmdef @@ -1,12 +1,13 @@ { "name": "VRMShaders.VRM.IO.Runtime", "references": [], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/VRM/MToon b/Assets/VRMShaders/VRM/MToon index f9e84d2525..e7b15eed3b 160000 --- a/Assets/VRMShaders/VRM/MToon +++ b/Assets/VRMShaders/VRM/MToon @@ -1 +1 @@ -Subproject commit f9e84d2525e572c51372de1f1d23986ba2f2612c +Subproject commit e7b15eed3be9aec5400ec31f21ce664350368d3f diff --git a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef b/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef index 2bbedff64f..fd9a63aee7 100644 --- a/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef +++ b/Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef @@ -1,12 +1,13 @@ { "name": "VRMShaders.VRM10.Format.Runtime", "references": [], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef b/Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef index d578208145..f14e33bbc3 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef +++ b/Assets/VRMShaders/VRM10/MToon10/Editor/VRMShaders.VRM10.MToon10.Editor.asmdef @@ -1,9 +1,8 @@ { "name": "VRMShaders.VRM10.MToon10.Editor", "references": [ - "VRMShaders.VRM10.MToon10.Runtime" + "GUID:0aaf403bd13871a44b7127aef2695ff8" ], - "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -12,5 +11,7 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef b/Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef index 2cba401c19..25f4943971 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef +++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/VRMShaders.VRM10.MToon10.Runtime.asmdef @@ -1,12 +1,13 @@ { "name": "VRMShaders.VRM10.MToon10.Runtime", "references": [], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": false, "precompiledReferences": [], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef b/Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef index 369b3e9389..4245e99ce6 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef +++ b/Assets/VRMShaders/VRM10/MToon10/Tests/VRMShaders.VRM10.MToon10.Tests.asmdef @@ -1,18 +1,23 @@ { "name": "VRMShaders.VRM10.MToon10.Tests", "references": [ - "VRMShaders.VRM10.MToon10.Runtime" - ], - "optionalUnityReferences": [ - "TestAssemblies" + "GUID:0aaf403bd13871a44b7127aef2695ff8", + "GUID:27619889b8ba8c24980f49ee34dbb44a", + "GUID:0acc523941302664db1f4e527237feb3" ], "includePlatforms": [ "Editor" ], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], "autoReferenced": false, - "defineConstraints": [] + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file From 36e7d1ef98337b7d754d73f09c663b4dba7acd50 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Wed, 4 Aug 2021 23:35:48 +0900 Subject: [PATCH 2/2] remove duplicated --- Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef | 2 -- Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef | 2 -- Assets/VRM/Tests/VRM.Tests.asmdef | 2 -- Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef | 2 -- Assets/VRM10/Tests/VRM10.Tests.asmdef | 1 - Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef | 1 - Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef | 2 -- 7 files changed, 12 deletions(-) diff --git a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef index 0afe38ab09..e1ebdd1709 100644 --- a/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef +++ b/Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef @@ -15,12 +15,10 @@ "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" ], "versionDefines": [], 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 0d4908d27a..6d03985347 100644 --- a/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef +++ b/Assets/VRM.Samples/Editor/Tests/VRM.Samples.Editor.Tests.asmdef @@ -18,12 +18,10 @@ "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" ], "versionDefines": [], diff --git a/Assets/VRM/Tests/VRM.Tests.asmdef b/Assets/VRM/Tests/VRM.Tests.asmdef index 3f93fd7a9a..1c2d8cc9de 100644 --- a/Assets/VRM/Tests/VRM.Tests.asmdef +++ b/Assets/VRM/Tests/VRM.Tests.asmdef @@ -17,12 +17,10 @@ "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" ], "versionDefines": [], diff --git a/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef b/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef index fd2d017a0b..d88a96d496 100644 --- a/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef +++ b/Assets/VRM10/Tests.PlayMode/VRM10.Tests.PlayMode.asmdef @@ -13,12 +13,10 @@ "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" ], "versionDefines": [], diff --git a/Assets/VRM10/Tests/VRM10.Tests.asmdef b/Assets/VRM10/Tests/VRM10.Tests.asmdef index e05e5ffb58..c045e954b9 100644 --- a/Assets/VRM10/Tests/VRM10.Tests.asmdef +++ b/Assets/VRM10/Tests/VRM10.Tests.asmdef @@ -20,7 +20,6 @@ ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" ], "versionDefines": [], diff --git a/Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef b/Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef index e7e7325b89..9ccd6fb1b6 100644 --- a/Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef +++ b/Assets/VRM10/vrmlib/Tests/VrmLib.Tests.asmdef @@ -16,7 +16,6 @@ ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" ], "versionDefines": [], 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 c0f390a4de..ff809fae70 100644 --- a/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef +++ b/Assets/VRMShaders/GLTF/IO/Tests/VRMShaders.GLTF.IO.Tests.asmdef @@ -13,12 +13,10 @@ "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "nunit.framework.dll", "nunit.framework.dll" ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", "UNITY_INCLUDE_TESTS" ], "versionDefines": [],