chore: Wrap VRC dependencies and VRCAvatarDescriptors (#504)

* add version defines

* refactor: prefer BuildContext.ctor() overload taking GameObject

* wrap unit tests entirely with MA_VRCSDK3_AVATARS

* wrap unit tests smart with MA_VRCSDK3_AVATARS

* wrap runtime entirely with MA_VRCSDK3_AVATARS

* wrap VRC.SDKBase.IEditorOnly with MA_VRCSDK3_AVATARS

* wrap editor entirely with MA_VRCSDK3_AVATARS

* fix AvatarObjectReference.Get(Component)

* wrap editor smart with MA_VRCSDK3_AVATARS

* wrap BuildContext smart with MA_VRCSDK3_AVATARS

* wrap PluginDefinition smart with MA_VRCSDK3_AVATARS

* style: move conditional compiles one step outside

Editor/ActiveAnimationRetargeter.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using nadena.dev.modular_avatar.animation;
 using UnityEditor;
 using UnityEngine;
-using VRC.SDK3.Avatars.Components;
 using Object = UnityEngine.Object;
 
 namespace nadena.dev.modular_avatar.core.editor

Editor/Animation/AnimationDatabase.cs

@@ -7,7 +7,11 @@ using nadena.dev.modular_avatar.editor.ErrorReporting;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
+#endif
+
 using Object = UnityEngine.Object;
 
 namespace nadena.dev.modular_avatar.animation
@@ -110,6 +114,7 @@ namespace nadena.dev.modular_avatar.animation
 
             AnimationUtil.CloneAllControllers(context);
 
+#if MA_VRCSDK3_AVATARS
             var avatarDescriptor = context.AvatarDescriptor;
 
             foreach (var layer in avatarDescriptor.baseAnimationLayers)
@@ -136,6 +141,7 @@ namespace nadena.dev.modular_avatar.animation
                     });
                 }
             }
+#endif
         }
 
         /// <summary>

Editor/Animation/AnimationUtil.cs

@@ -6,7 +6,10 @@ using nadena.dev.ndmf;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
+#endif
 
 #endregion
 
@@ -47,12 +50,15 @@ namespace nadena.dev.modular_avatar.animation
             // Ensure all of the controllers on the avatar descriptor point to temporary assets.
             // This helps reduce the risk that we'll accidentally modify the original assets.
 
+#if MA_VRCSDK3_AVATARS
             context.AvatarDescriptor.baseAnimationLayers =
                 CloneLayers(context, context.AvatarDescriptor.baseAnimationLayers);
             context.AvatarDescriptor.specialAnimationLayers =
                 CloneLayers(context, context.AvatarDescriptor.specialAnimationLayers);
+#endif
         }
 
+#if MA_VRCSDK3_AVATARS
         private static VRCAvatarDescriptor.CustomAnimLayer[] CloneLayers(
             BuildContext context,
             VRCAvatarDescriptor.CustomAnimLayer[] layers
@@ -167,6 +173,7 @@ namespace nadena.dev.modular_avatar.animation
 
             return controller;
         }
+#endif
 
         public static bool IsProxyAnimation(this Motion m)
         {

Editor/Animation/AnimatorCombiner.cs

@@ -31,7 +31,11 @@ using nadena.dev.modular_avatar.core.editor;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
+#endif
+
 using Object = UnityEngine.Object;
 
 #endregion
@@ -275,6 +279,7 @@ namespace nadena.dev.modular_avatar.animation
 
         private void AdjustBehavior(StateMachineBehaviour behavior)
         {
+#if MA_VRCSDK3_AVATARS
             switch (behavior)
             {
                 case VRCAnimatorLayerControl layerControl:
@@ -285,6 +290,7 @@ namespace nadena.dev.modular_avatar.animation
                     break;
                 }
             }
+#endif
         }
 
         private static string MapPath(EditorCurveBinding binding, string basePath)

Editor/AnimatorMerger.cs

@@ -29,7 +29,11 @@ using nadena.dev.modular_avatar.editor.ErrorReporting;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
+#endif
+
 using Object = UnityEngine.Object;
 
 namespace nadena.dev.modular_avatar.core.editor
@@ -254,6 +258,7 @@ namespace nadena.dev.modular_avatar.core.editor
 
         private void AdjustBehavior(StateMachineBehaviour behavior)
         {
+#if MA_VRCSDK3_AVATARS
             switch (behavior)
             {
                 case VRCAnimatorLayerControl layerControl:
@@ -264,6 +269,7 @@ namespace nadena.dev.modular_avatar.core.editor
                     break;
                 }
             }
+#endif
         }
 
         private static string MapPath(EditorCurveBinding binding, string basePath)

Editor/BlendshapeSyncAnimationProcessor.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#if MA_VRCSDK3_AVATARS
+
+using System.Collections.Generic;
 using nadena.dev.modular_avatar.editor.ErrorReporting;
 using UnityEditor;
 using UnityEditor.Animations;
@@ -228,3 +230,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/BuildContext.cs

@@ -4,8 +4,12 @@ using nadena.dev.modular_avatar.animation;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
 using VRC.SDK3.Avatars.ScriptableObjects;
+#endif
+
 using Object = UnityEngine.Object;
 
 namespace nadena.dev.modular_avatar.core.editor
@@ -14,7 +18,9 @@ namespace nadena.dev.modular_avatar.core.editor
     {
         internal readonly nadena.dev.ndmf.BuildContext PluginBuildContext;
 
+#if MA_VRCSDK3_AVATARS
         internal VRCAvatarDescriptor AvatarDescriptor => PluginBuildContext.AvatarDescriptor;
+#endif
         internal GameObject AvatarRootObject => PluginBuildContext.AvatarRootObject;
         internal Transform AvatarRootTransform => PluginBuildContext.AvatarRootTransform;
 
@@ -28,12 +34,10 @@ namespace nadena.dev.modular_avatar.core.editor
 
         private bool SaveImmediate = false;
 
+#if MA_VRCSDK3_AVATARS
         internal readonly Dictionary<VRCExpressionsMenu, VRCExpressionsMenu> ClonedMenus
             = new Dictionary<VRCExpressionsMenu, VRCExpressionsMenu>();
 
-        public static implicit operator BuildContext(ndmf.BuildContext ctx) =>
-            ctx.Extension<ModularAvatarContext>().BuildContext;
-
         /// <summary>
         /// This dictionary overrides the _original contents_ of ModularAvatarMenuInstallers. Notably, this does not
         /// replace the source menu for the purposes of identifying any other MAMIs that might install to the same
@@ -41,16 +45,21 @@ namespace nadena.dev.modular_avatar.core.editor
         /// </summary>
         internal readonly Dictionary<ModularAvatarMenuInstaller, Action<VRCExpressionsMenu.Control>> PostProcessControls
             = new Dictionary<ModularAvatarMenuInstaller, Action<VRCExpressionsMenu.Control>>();
+#endif
+        public static implicit operator BuildContext(ndmf.BuildContext ctx) =>
+            ctx.Extension<ModularAvatarContext>().BuildContext;
 
         public BuildContext(nadena.dev.ndmf.BuildContext PluginBuildContext)
         {
             this.PluginBuildContext = PluginBuildContext;
         }
 
+#if MA_VRCSDK3_AVATARS
         public BuildContext(VRCAvatarDescriptor avatarDescriptor)
             : this(new ndmf.BuildContext(avatarDescriptor, null))
         {
         }
+#endif
 
         public BuildContext(GameObject avatarGameObject)
             : this(new ndmf.BuildContext(avatarGameObject, null))
@@ -108,6 +117,7 @@ namespace nadena.dev.modular_avatar.core.editor
             return merger.Finish();
         }
 
+#if MA_VRCSDK3_AVATARS
         public VRCExpressionsMenu CloneMenu(VRCExpressionsMenu menu)
         {
             if (menu == null) return null;
@@ -126,5 +136,6 @@ namespace nadena.dev.modular_avatar.core.editor
 
             return newMenu;
         }
+#endif
     }
 }

Editor/ErrorReporting/ComponentValidation.cs

@@ -1,6 +1,10 @@
 using System.Collections.Generic;
 using nadena.dev.modular_avatar.core;
+
+#if MA_VRCSDK3_AVATARS
 using nadena.dev.modular_avatar.core.menu;
+#endif
+
 using UnityEngine;
 
 namespace nadena.dev.modular_avatar.editor.ErrorReporting
@@ -20,10 +24,12 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting
                     return CheckInternal(bs);
                 case ModularAvatarBoneProxy bp:
                     return CheckInternal(bp);
+#if MA_VRCSDK3_AVATARS
                 case ModularAvatarMenuInstaller mi:
                     return CheckInternal(mi);
                 case ModularAvatarMergeAnimator obj:
                     return CheckInternal(obj);
+#endif
                 case ModularAvatarMergeArmature obj:
                     return CheckInternal(obj);
                 default:
@@ -134,6 +140,7 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting
             return null;
         }
 
+#if MA_VRCSDK3_AVATARS
         private static List<ErrorLog> CheckInternal(ModularAvatarMenuInstaller mi)
         {
             // TODO - check that target menu is in the avatar
@@ -160,6 +167,7 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting
 
             return null;
         }
+#endif
 
         private static List<ErrorLog> CheckInternal(ModularAvatarMergeArmature ma)
         {

Editor/FixupPasses/FixupExpressionsMenuPass.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -158,3 +160,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/AvatarParametersEditor.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -477,3 +479,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/MAAssetBundleEditor.cs

@@ -3,7 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.ScriptableObjects;
+#endif
+
 using Object = UnityEngine.Object;
 
 namespace nadena.dev.modular_avatar.core.editor
@@ -31,8 +35,10 @@ namespace nadena.dev.modular_avatar.core.editor
             typeof(Mesh),
             typeof(AnimationClip),
             typeof(RuntimeAnimatorController),
+#if MA_VRCSDK3_AVATARS
             typeof(VRCExpressionParameters),
             typeof(VRCExpressionsMenu),
+#endif
         };
 
         private Dictionary<UnityEngine.Object, AssetInfo> _assets;
@@ -60,10 +66,15 @@ namespace nadena.dev.modular_avatar.core.editor
 
             public void PopulateReferences(Dictionary<UnityEngine.Object, AssetInfo> assets)
             {
-                if (Asset is Mesh || Asset is AnimationClip || Asset is VRCExpressionsMenu ||
+                switch (Asset)
-                    Asset is VRCExpressionsMenu)
                 {
-                    return; // No child objects
+                    case Mesh _:
+                    case AnimationClip _:
+#if MA_VRCSDK3_AVATARS
+                    case VRCExpressionsMenu _:
+                    case VRCExpressionParameters _:
+#endif
+                        return; // No child objects
                 }
 
                 var so = new SerializedObject(Asset);

Editor/Inspector/Menu/AvMenuTreeView.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -232,3 +234,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/Menu/MAMenuItemInspector.cs

@@ -1,4 +1,6 @@
-using UnityEditor;
+#if MA_VRCSDK3_AVATARS
+
+using UnityEditor;
 using static nadena.dev.modular_avatar.core.editor.Localization;
 
 namespace nadena.dev.modular_avatar.core.editor
@@ -53,3 +55,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/Menu/MenuInstallTargetEditor.cs

@@ -1,4 +1,6 @@
-using UnityEditor;
+#if MA_VRCSDK3_AVATARS
+
+using UnityEditor;
 
 namespace nadena.dev.modular_avatar.core.editor
 {
@@ -14,3 +16,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/Menu/MenuInstallerEditor.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -586,3 +588,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/Menu/MenuItemGUI.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Linq;
 using System.Runtime.Serialization;
 using nadena.dev.modular_avatar.core.menu;
@@ -489,3 +491,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/Menu/MenuPreviewGUI.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using nadena.dev.modular_avatar.core.menu;
 using static nadena.dev.modular_avatar.core.editor.Localization;
@@ -274,3 +276,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/Menu/ParameterField.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
@@ -284,3 +286,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Inspector/MergeAnimationEditor.cs

@@ -1,4 +1,6 @@
-using UnityEditor;
+#if MA_VRCSDK3_AVATARS
+
+using UnityEditor;
 using static nadena.dev.modular_avatar.core.editor.Localization;
 
 namespace nadena.dev.modular_avatar.core.editor
@@ -46,3 +48,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Menu/MenuExtractor.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+#if MA_VRCSDK3_AVATARS
+
+using System.Linq;
 using UnityEditor;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
@@ -129,3 +131,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/Menu/VirtualMenu.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -478,3 +480,5 @@ namespace nadena.dev.modular_avatar.core.editor.menu
         }
     }
 }
+
+#endif

Editor/MenuInstallHook.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using nadena.dev.modular_avatar.core.editor.menu;
@@ -85,3 +87,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/MergeAnimatorProcessor.cs

@@ -22,6 +22,8 @@
  * SOFTWARE.
  */
 
+#if MA_VRCSDK3_AVATARS
+
 using System.Collections.Generic;
 using nadena.dev.modular_avatar.editor.ErrorReporting;
 using UnityEditor;
@@ -248,3 +250,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/MergeArmatureHook.cs

@@ -30,8 +30,12 @@ using nadena.dev.modular_avatar.editor.ErrorReporting;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Animations;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.Dynamics;
 using VRC.SDK3.Dynamics.PhysBone.Components;
+#endif
+
 using Object = UnityEngine.Object;
 
 namespace nadena.dev.modular_avatar.core.editor
@@ -71,6 +75,7 @@ namespace nadena.dev.modular_avatar.core.editor
 
             TopoProcessMergeArmatures(mergeArmatures);
 
+#if MA_VRCSDK3_AVATARS
             foreach (var c in avatarGameObject.transform.GetComponentsInChildren<VRCPhysBone>(true))
             {
                 if (c.rootTransform == null) c.rootTransform = c.transform;
@@ -88,6 +93,7 @@ namespace nadena.dev.modular_avatar.core.editor
                 if (c.rootTransform == null) c.rootTransform = c.transform;
                 RetainBoneReferences(c);
             }
+#endif
 
             foreach (var c in avatarGameObject.transform.GetComponentsInChildren<IConstraint>(true))
             {
@@ -176,7 +182,9 @@ namespace nadena.dev.modular_avatar.core.editor
                 mergedObjects.Clear();
                 thisPassAdded.Clear();
                 MergeArmature(config, target);
+#if MA_VRCSDK3_AVATARS
                 PruneDuplicatePhysBones();
+#endif
                 UnityEngine.Object.DestroyImmediate(config);
             });
         }
@@ -386,6 +394,7 @@ namespace nadena.dev.modular_avatar.core.editor
             return merged;
         }
 
+#if MA_VRCSDK3_AVATARS
         /**
          * Sometimes outfit authors copy the entire armature, including PhysBones components. If we merge these and
          * end up with multiple PB components referencing the same target, PB refuses to animate the bone. So detect
@@ -425,5 +434,6 @@ namespace nadena.dev.modular_avatar.core.editor
                 }
             }
         }
+#endif
     }
 }

Editor/MeshSettingsPass.cs

@@ -22,7 +22,7 @@ namespace nadena.dev.modular_avatar.core.editor
 
         public void OnPreprocessAvatar()
         {
-            foreach (var mesh in context.AvatarDescriptor.GetComponentsInChildren<Renderer>(true))
+            foreach (var mesh in context.AvatarRootObject.GetComponentsInChildren<Renderer>(true))
             {
                 ProcessMesh(mesh);
             }
@@ -94,7 +94,7 @@ namespace nadena.dev.modular_avatar.core.editor
 
         private void ProcessMesh(Renderer mesh)
         {
-            MergedSettings settings = MergeSettings(context.AvatarDescriptor.transform, mesh.transform);
+            MergedSettings settings = MergeSettings(context.AvatarRootTransform, mesh.transform);
 
             if (settings.SetAnchor)
             {

Editor/OptimizationPasses/GCGameObjectsPass.cs

@@ -2,7 +2,10 @@
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Dynamics.PhysBone.Components;
+#endif
 
 namespace nadena.dev.modular_avatar.core.editor
 {
@@ -56,10 +59,12 @@ namespace nadena.dev.modular_avatar.core.editor
                     {
                         case Transform t: break;
 
+#if MA_VRCSDK3_AVATARS
                         case VRCPhysBone pb:
                             MarkObject(obj);
                             MarkPhysBone(pb);
                             break;
+#endif
 
                         case AvatarTagComponent _:
                             // Tag components will not be retained at runtime, so pretend they're not there.
@@ -123,6 +128,7 @@ namespace nadena.dev.modular_avatar.core.editor
             }
         }
 
+#if MA_VRCSDK3_AVATARS
         private void MarkPhysBone(VRCPhysBone pb)
         {
             var rootTransform = pb.GetRootTransform();
@@ -137,6 +143,7 @@ namespace nadena.dev.modular_avatar.core.editor
             // Mark colliders, etc
             MarkAllReferencedObjects(pb);
         }
+#endif
 
         private void MarkAllReferencedObjects(Component component)
         {

Editor/ParameterPolicy.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#if MA_VRCSDK3_AVATARS
+
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using UnityEditor.Animations;
@@ -320,3 +322,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/PhysboneBlockerPass.cs

@@ -22,6 +22,8 @@
  * SOFTWARE.
  */
 
+#if MA_VRCSDK3_AVATARS
+
 using System.Collections.Generic;
 using nadena.dev.modular_avatar.editor.ErrorReporting;
 using UnityEngine;
@@ -76,3 +78,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/PluginDefinition/PluginDefinition.cs

@@ -33,9 +33,11 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
             {
                 seq.Run(ClearEditorOnlyTags.Instance);
                 seq.Run(MeshSettingsPluginPass.Instance);
+#if MA_VRCSDK3_AVATARS
                 seq.Run(RenameParametersPluginPass.Instance);
                 seq.Run(MergeAnimatorPluginPass.Instance);
                 seq.Run(MenuInstallPluginPass.Instance);
+#endif
                 seq.WithRequiredExtension(typeof(AnimationServicesContext), _s2 =>
                 {
                     seq.Run(MergeArmaturePluginPass.Instance);
@@ -45,14 +47,18 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
                         ctx => new WorldFixedObjectProcessor().Process(ctx)
                     );
                     seq.Run(ReplaceObjectPluginPass.Instance);
+#if MA_VRCSDK3_AVATARS
                     seq.Run(BlendshapeSyncAnimationPluginPass.Instance);
+#endif
                 });
+#if MA_VRCSDK3_AVATARS
                 seq.Run(PhysbonesBlockerPluginPass.Instance);
                 seq.Run("Fixup Expressions Menu", ctx =>
                 {
                     var maContext = ctx.Extension<ModularAvatarContext>().BuildContext;
                     FixupExpressionsMenuPass.FixupExpressionsMenu(maContext);
                 });
+#endif
                 seq.Run("Rebind humanoid avatar", ctx =>
                 {
                     // workaround problem with avatar matching
@@ -142,6 +148,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
         }
     }
 
+#if MA_VRCSDK3_AVATARS
     class RenameParametersPluginPass : MAPass<RenameParametersPluginPass>
     {
         protected override void Execute(ndmf.BuildContext context)
@@ -165,6 +172,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
             new MenuInstallHook().OnPreprocessAvatar(context.AvatarRootObject, MAContext(context));
         }
     }
+#endif
 
     class MergeArmaturePluginPass : MAPass<MergeArmaturePluginPass>
     {
@@ -198,6 +206,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
         }
     }
 
+#if MA_VRCSDK3_AVATARS
     class BlendshapeSyncAnimationPluginPass : MAPass<BlendshapeSyncAnimationPluginPass>
     {
         protected override void Execute(ndmf.BuildContext context)
@@ -213,6 +222,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
             PhysboneBlockerPass.Process(context.AvatarRootObject);
         }
     }
+#endif
 
     class GCGameObjectsPluginPass : MAPass<GCGameObjectsPluginPass>
     {

Editor/PreventStripTagObjects.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -64,3 +66,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/RenameParametersHook.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -494,3 +496,5 @@ namespace nadena.dev.modular_avatar.core.editor
         }
     }
 }
+
+#endif

Editor/ReplaceObjectPass.cs

@@ -29,9 +29,9 @@ namespace nadena.dev.modular_avatar.core.editor
 
         public void Process()
         {
-            var avatarDescriptor = _buildContext.AvatarDescriptor;
+            var avatarRootTransform = _buildContext.AvatarRootTransform;
             var replacementComponents =
-                avatarDescriptor.GetComponentsInChildren<ModularAvatarReplaceObject>(true);
+                avatarRootTransform.GetComponentsInChildren<ModularAvatarReplaceObject>(true);
 
             if (replacementComponents.Length == 0) return;
 
@@ -43,7 +43,7 @@ namespace nadena.dev.modular_avatar.core.editor
 
             foreach (var component in replacementComponents)
             {
-                var targetObject = component.targetObject?.Get(_buildContext.AvatarDescriptor);
+                var targetObject = component.targetObject?.Get(avatarRootTransform);
 
                 if (targetObject == null)
                 {
@@ -154,7 +154,7 @@ namespace nadena.dev.modular_avatar.core.editor
         {
             Dictionary<UnityObject, List<Reference>> refIndex = new Dictionary<UnityObject, List<Reference>>();
 
-            IndexObject(_buildContext.AvatarDescriptor.gameObject);
+            IndexObject(_buildContext.AvatarRootObject);
 
             return refIndex;
 

Editor/Util.cs

@@ -28,7 +28,7 @@ using System.Reflection;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
-using VRC.SDKBase.Editor.BuildPipeline;
+
 using Object = UnityEngine.Object;
 
 namespace nadena.dev.modular_avatar.core.editor

Editor/VisibleHeadAccessoryProcessor.cs

@@ -2,7 +2,10 @@
 using nadena.dev.modular_avatar.editor.ErrorReporting;
 using UnityEngine;
 using UnityEngine.Animations;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Dynamics.PhysBone.Components;
+#endif
 
 namespace nadena.dev.modular_avatar.core.editor
 {
@@ -34,6 +37,7 @@ namespace nadena.dev.modular_avatar.core.editor
             var animator = _avatarTransform.GetComponent<Animator>();
             _headBone = animator != null ? animator.GetBoneTransform(HumanBodyBones.Head) : null;
 
+#if MA_VRCSDK3_AVATARS
             foreach (var physBone in _avatarTransform.GetComponentsInChildren<VRCPhysBone>(true))
             {
                 var boneRoot = physBone.rootTransform != null ? physBone.rootTransform : physBone.transform;
@@ -55,6 +59,7 @@ namespace nadena.dev.modular_avatar.core.editor
                     Traverse(child, ignored);
                 }
             }
+#endif
         }
 
         public void Process()

Editor/nadena.dev.modular-avatar.core.editor.asmdef

@@ -33,6 +33,11 @@
             "name": "com.anatawa12.avatar-optimizer",
             "expression": "(,1.5.0-rc.8)",
             "define": "LEGACY_AVATAR_OPTIMIZER"
+        },
+        {
+            "name": "com.vrchat.avatars",
+            "expression": "",
+            "define": "MA_VRCSDK3_AVATARS"
         }
     ],
     "noEngineReferences": false

Runtime/Activator.cs

@@ -1,7 +1,10 @@
 #if UNITY_EDITOR
 
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDKBase;
+#endif
 
 namespace nadena.dev.modular_avatar.core
 {

Runtime/AvatarTagComponent.cs

@@ -24,7 +24,10 @@
 
 using System;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDKBase;
+#endif
 
 namespace nadena.dev.modular_avatar.core
 {
@@ -55,4 +58,15 @@ namespace nadena.dev.modular_avatar.core
         {
         }
     }
+    
+#if !MA_VRCSDK3_AVATARS
+
+    /**
+     * Placeholder of VRC.SDKBase.IEditorOnly for environments without VRCSDK
+     */
+    interface IEditorOnly
+    {
+    }
+
+#endif
 }

Runtime/MAMoveIndependently.cs

@@ -3,7 +3,10 @@ using System.Collections.Generic;
 using nadena.dev.modular_avatar.core.armature_lock;
 using UnityEditor;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDKBase;
+#endif
 
 namespace nadena.dev.modular_avatar.core.ArmatureAwase
 {

Runtime/Menu/ModularAvatarMenuGroup.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.menu;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.menu;
 using UnityEngine;
 
 namespace nadena.dev.modular_avatar.core
@@ -20,3 +22,5 @@ namespace nadena.dev.modular_avatar.core
         }
     }
 }
+
+#endif

Runtime/Menu/ModularAvatarMenuInstaller.cs

@@ -1,4 +1,6 @@
-using UnityEngine;
+#if MA_VRCSDK3_AVATARS
+
+using UnityEngine;
 using VRC.SDK3.Avatars.ScriptableObjects;
 
 namespace nadena.dev.modular_avatar.core
@@ -30,3 +32,5 @@ namespace nadena.dev.modular_avatar.core
         }
     }
 }
+
+#endif

Runtime/Menu/VirtualMenuAPI.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -173,3 +175,5 @@ namespace nadena.dev.modular_avatar.core.menu
         public abstract void Visit(NodeContext context);
     }
 }
+
+#endif

Runtime/ModularAvatarMenuInstallTarget.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.menu;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.menu;
 using UnityEngine;
 
 namespace nadena.dev.modular_avatar.core
@@ -30,3 +32,5 @@ namespace nadena.dev.modular_avatar.core
         }
     }
 }
+
+#endif

Runtime/ModularAvatarMenuItem.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.menu;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.menu;
 using UnityEngine;
 using VRC.SDK3.Avatars.ScriptableObjects;
 
@@ -77,3 +79,5 @@ namespace nadena.dev.modular_avatar.core
         }
     }
 }
+
+#endif

Runtime/ModularAvatarMergeAnimator.cs

@@ -22,6 +22,8 @@
  * SOFTWARE.
  */
 
+#if MA_VRCSDK3_AVATARS
+
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
 
@@ -49,3 +51,5 @@ namespace nadena.dev.modular_avatar.core
         }
     }
 }
+
+#endif

Runtime/RuntimeUtil.cs

@@ -26,7 +26,11 @@ using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
+#endif
+
 #if UNITY_EDITOR
 using System.Reflection;
 #endif
@@ -77,6 +81,7 @@ namespace nadena.dev.modular_avatar.core
             return ndmf.runtime.RuntimeUtil.IsAvatarRoot(target);
         }
 
+#if MA_VRCSDK3_AVATARS
         public static VRCAvatarDescriptor FindAvatarInParents(Transform target)
         {
             while (target != null)
@@ -88,6 +93,7 @@ namespace nadena.dev.modular_avatar.core
 
             return null;
         }
+#endif
 
         public static Transform FindAvatarTransformInParents(Transform target)
         {

Runtime/nadena.dev.modular-avatar.core.asmdef

@@ -17,6 +17,12 @@
     ],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.vrchat.avatars",
+            "expression": "",
+            "define": "MA_VRCSDK3_AVATARS"
+        }
+    ],
     "noEngineReferences": false
 }

UnitTests~/ActiveAnimationRetargeterTests/ActiveAnimationRetargeterTests.cs

@@ -1,10 +1,11 @@
+#if MA_VRCSDK3_AVATARS
+
 using modular_avatar_tests;
 using nadena.dev.modular_avatar.animation;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor;
 using UnityEngine;
-using VRC.SDK3.Avatars.Components;
 
 public class ActiveAnimationRetargeterTests : TestBase
 {
@@ -12,10 +13,9 @@ public class ActiveAnimationRetargeterTests : TestBase
     public void SimpleRetarget()
     {
         var avatar = CreatePrefab("SimpleRetarget.prefab");
-        var descriptor = avatar.GetComponent<VRCAvatarDescriptor>();
 
         // initialize context
-        var buildContext = new BuildContext(descriptor);
+        var buildContext = new BuildContext(avatar);
         var pathMappings = buildContext.PluginBuildContext.ActivateExtensionContext<AnimationServicesContext>()
             .PathMappings;
 
@@ -42,3 +42,5 @@ public class ActiveAnimationRetargeterTests : TestBase
             pathMappings.GetObjectIdentifier(created), typeof(GameObject), "m_IsActive")));
     }
 }
+
+#endif

UnitTests~/AnimateAddedBones/AnimateAddedBones.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor;
 using UnityEngine;
@@ -31,3 +33,5 @@ namespace modular_avatar_tests.AnimateAddedBones
         }
     }
 }
+
+#endif

UnitTests~/Animation/MiscAnimationTests.cs

@@ -1,4 +1,6 @@
-using nadena.dev.ndmf;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.ndmf;
 using nadena.dev.modular_avatar.animation;
 using NUnit.Framework;
 using UnityEditor;
@@ -25,3 +27,5 @@ namespace modular_avatar_tests
         }
     }
 }
+
+#endif

UnitTests~/Animation/TrackObjectRenamesContextTests.cs

@@ -4,7 +4,10 @@ using NUnit.Framework;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
+#endif
 
 namespace modular_avatar_tests
 {
@@ -92,6 +95,7 @@ namespace modular_avatar_tests
             Assert.AreEqual("a/b/c/d", toc.PathMappings.MapPath("a/b/c/d", true));
         }
 
+#if MA_VRCSDK3_AVATARS
         [Test]
         public void TestAnimatorControllerUpdates()
         {
@@ -143,5 +147,6 @@ namespace modular_avatar_tests
                 }
             }
         }
+#endif
     }
 }

UnitTests~/BlendshapeSyncTests/BlendshapeSyncIntegrationTest.cs

@@ -1,4 +1,6 @@
-using System.Collections.Immutable;
+#if MA_VRCSDK3_AVATARS
+
+using System.Collections.Immutable;
 using System.Linq;
 using modular_avatar_tests;
 using nadena.dev.modular_avatar.animation;
@@ -39,3 +41,5 @@ namespace modular_avatar_tests
         }
     }
 }
+
+#endif

UnitTests~/DirectBlendTreeParameters/DirectBlendTreeParameters.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor.Animations;
 
@@ -24,3 +26,5 @@ namespace modular_avatar_tests.DirectBlendTreeParameters
         }
     }
 }
+
+#endif

UnitTests~/DuplicatePBStripping/DuplicatePBStripping.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using VRC.SDK3.Dynamics.PhysBone.Components;
 
@@ -66,3 +68,5 @@ namespace modular_avatar_tests.DuplicatePBStripping
         }
     }
 }
+
+#endif

UnitTests~/EasySetupOutfit/ArmatureConfusionTest.cs

@@ -3,7 +3,11 @@ using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
+#endif
+
 using UnityObject = UnityEngine.Object;
 
 public class ArmatureConfusionTest : TestBase
@@ -24,7 +28,9 @@ public class ArmatureConfusionTest : TestBase
         var inner = CreatePrefab("shapell.fbx");
 
         var outerAnimator = outer.GetComponent<Animator>();
+#if MA_VRCSDK3_AVATARS
         outer.AddComponent<VRCAvatarDescriptor>();
+#endif
 
         inner.gameObject.name = "inner";
         inner.transform.parent = outer.transform;

UnitTests~/ExpressionMenuFixupTests/ExpressionMenuFixupTests.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using VRC.SDK3.Avatars.Components;
 
@@ -36,3 +38,5 @@ namespace modular_avatar_tests
         }
     }
 }
+
+#endif

UnitTests~/GameObjectGC/GameObjectGC.cs

@@ -3,7 +3,6 @@ using modular_avatar_tests;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEngine;
-using VRC.SDK3.Avatars.Components;
 
 public class GameObjectGC : TestBase
 {
@@ -11,9 +10,9 @@ public class GameObjectGC : TestBase
     public void FakeHumanoidHandling()
     {
         var fake_humanoid = CreatePrefab("FakeHumanoid.prefab");
-        var avdesc = fake_humanoid.GetComponent<VRCAvatarDescriptor>();
+        var context = new BuildContext(fake_humanoid);
 
-        new GCGameObjectsPass(new BuildContext(avdesc), fake_humanoid).OnPreprocessAvatar();
+        new GCGameObjectsPass(context, fake_humanoid).OnPreprocessAvatar();
         AvatarProcessor.ProcessAvatar(fake_humanoid);
 
         var animator = fake_humanoid.GetComponent<Animator>();
@@ -26,13 +25,13 @@ public class GameObjectGC : TestBase
     public void RetainEndBones()
     {
         var fake_humanoid = CreatePrefab("FakeHumanoid.prefab");
-        var avdesc = fake_humanoid.GetComponent<VRCAvatarDescriptor>();
+        var context = new BuildContext(fake_humanoid);
 
         var bone1 = CreateChild(fake_humanoid, "bone1");
         var bone2 = CreateChild(bone1, "bone2.end");
         var bone3 = CreateChild(fake_humanoid, "bone2");
 
-        new GCGameObjectsPass(new BuildContext(avdesc), fake_humanoid).OnPreprocessAvatar();
+        new GCGameObjectsPass(context, fake_humanoid).OnPreprocessAvatar();
         AvatarProcessor.ProcessAvatar(fake_humanoid);
 
         Assert.True(bone1 != null);
@@ -44,17 +43,17 @@ public class GameObjectGC : TestBase
     public void RetainArmatureHack()
     {
         var fake_humanoid = CreatePrefab("FakeHumanoid.prefab");
-        var avdesc = fake_humanoid.GetComponent<VRCAvatarDescriptor>();
+        var context = new BuildContext(fake_humanoid);
 
         var armature = new GameObject();
         armature.name = "Armature";
         armature.transform.parent = fake_humanoid.transform;
         armature.transform.SetSiblingIndex(0);
         
-        new GCGameObjectsPass(new BuildContext(avdesc), fake_humanoid).OnPreprocessAvatar();
+        new GCGameObjectsPass(context, fake_humanoid).OnPreprocessAvatar();
         AvatarProcessor.ProcessAvatar(fake_humanoid);
 
         Assert.AreEqual(2,
-            avdesc.GetComponentsInChildren<Transform>().Count(t => t.gameObject.name == "Armature"));
+            context.AvatarRootObject.GetComponentsInChildren<Transform>().Count(t => t.gameObject.name == "Armature"));
     }
 }

UnitTests~/MergeArmatureTests/MultiLevelMergeTest.cs

@@ -4,7 +4,6 @@ using nadena.dev.modular_avatar.core;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEngine;
-using VRC.SDK3.Avatars.Components;
 
 namespace modular_avatar_tests.MergeArmatureTests
 {
@@ -53,7 +52,7 @@ namespace modular_avatar_tests.MergeArmatureTests
             m2_leaf3.AddComponent<TestComponentB>();
 
             nadena.dev.ndmf.BuildContext context =
-                new nadena.dev.ndmf.BuildContext(root.GetComponent<VRCAvatarDescriptor>(), null);
+                new nadena.dev.ndmf.BuildContext(root, null);
             context.ActivateExtensionContext<ModularAvatarContext>();
             context.ActivateExtensionContext<AnimationServicesContext>();
             new MergeArmatureHook().OnPreprocessAvatar(context, root);
@@ -81,7 +80,7 @@ namespace modular_avatar_tests.MergeArmatureTests
             ma.mangleNames = false;
 
             nadena.dev.ndmf.BuildContext context =
-                new nadena.dev.ndmf.BuildContext(root.GetComponent<VRCAvatarDescriptor>(), null);
+                new nadena.dev.ndmf.BuildContext(root, null);
             context.ActivateExtensionContext<ModularAvatarContext>();
             context.ActivateExtensionContext<AnimationServicesContext>();
             new MergeArmatureHook().OnPreprocessAvatar(context, root);
@@ -105,7 +104,7 @@ namespace modular_avatar_tests.MergeArmatureTests
             ma.mergeTarget.referencePath = RuntimeUtil.AvatarRootPath(armature);
 
             nadena.dev.ndmf.BuildContext context =
-                new nadena.dev.ndmf.BuildContext(root.GetComponent<VRCAvatarDescriptor>(), null);
+                new nadena.dev.ndmf.BuildContext(root, null);
             context.ActivateExtensionContext<ModularAvatarContext>();
             context.ActivateExtensionContext<AnimationServicesContext>();
             new MergeArmatureHook().OnPreprocessAvatar(context, root);

UnitTests~/MeshSettingsTests/MeshSettingsTests.cs

@@ -1,7 +1,6 @@
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEngine;
-using VRC.SDK3.Avatars.Components;
 
 namespace modular_avatar_tests
 {
@@ -13,7 +12,7 @@ namespace modular_avatar_tests
         public void TestProbeAnchor()
         {
             var prefab = CreatePrefab(PREFAB_NAME);
-            var context = new BuildContext(prefab.GetComponent<VRCAvatarDescriptor>());
+            var context = new BuildContext(prefab);
             new MeshSettingsPass(context).OnPreprocessAvatar();
 
             var root = prefab.transform.Find("RendererRoot");
@@ -33,7 +32,7 @@ namespace modular_avatar_tests
         public void TestProbeAnchorOverrides()
         {
             var prefab = CreatePrefab(PREFAB_NAME);
-            var context = new BuildContext(prefab.GetComponent<VRCAvatarDescriptor>());
+            var context = new BuildContext(prefab);
             new MeshSettingsPass(context).OnPreprocessAvatar();
 
             var noninherit = prefab.transform.Find("ProbeTargetRenderers/NonInherited").GetComponent<MeshRenderer>();
@@ -47,7 +46,7 @@ namespace modular_avatar_tests
         public void TestSetBounds()
         {
             var prefab = CreatePrefab(PREFAB_NAME);
-            var context = new BuildContext(prefab.GetComponent<VRCAvatarDescriptor>());
+            var context = new BuildContext(prefab);
             new MeshSettingsPass(context).OnPreprocessAvatar();
 
             var target = prefab.transform.Find("ProbeTarget");

UnitTests~/MiscAnimationTests/MiscAnimationTests.cs

@@ -1,4 +1,6 @@
-using modular_avatar_tests;
+#if MA_VRCSDK3_AVATARS
+
+using modular_avatar_tests;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor;
@@ -20,3 +22,5 @@ public class MiscAnimationTests : TestBase
         Assert.False(new SerializedObject(hq_off.motion).FindProperty("m_UseHighQualityCurve").boolValue);
     }
 }
+
+#endif

UnitTests~/NullSubparameterTest.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
@@ -22,3 +24,5 @@ namespace modular_avatar_tests
         }
     }
 }
+
+#endif

UnitTests~/RenameParametersTests/RenameParametersTests.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using VRC.SDK3.Avatars.Components;
@@ -62,3 +64,5 @@ namespace modular_avatar_tests.RenameParametersTests
         }
     }
 }
+
+#endif

UnitTests~/ReplaceObject/ReplaceObjectTests.cs

@@ -5,7 +5,6 @@ using nadena.dev.modular_avatar.core.editor;
 using nadena.dev.modular_avatar.editor.ErrorReporting;
 using NUnit.Framework;
 using UnityEngine;
-using VRC.SDK3.Avatars.Components;
 
 namespace modular_avatar_tests.ReplaceObject
 {
@@ -15,8 +14,7 @@ namespace modular_avatar_tests.ReplaceObject
 
         void Process(GameObject root)
         {
-            var avDesc = root.GetComponent<VRCAvatarDescriptor>();
+            var buildContext = new nadena.dev.ndmf.BuildContext(root, null);
-            var buildContext = new nadena.dev.ndmf.BuildContext(avDesc, null);
             pathMappings = buildContext.ActivateExtensionContext<AnimationServicesContext>().PathMappings;
             new ReplaceObjectPass(buildContext).Process();
         }

UnitTests~/RetargetMeshesTest.cs

@@ -2,7 +2,6 @@
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEngine;
-using VRC.SDK3.Avatars.Components;
 
 namespace modular_avatar_tests
 {
@@ -21,8 +20,7 @@ namespace modular_avatar_tests
             skinnedMeshRenderer.rootBone = b.transform;
             Debug.Assert(skinnedMeshRenderer.bones.Length == 0);
 
-            var build_context =
+            var build_context = new nadena.dev.ndmf.BuildContext(root, null);
-                new nadena.dev.ndmf.BuildContext(root.GetComponent<VRCAvatarDescriptor>(), null);
             var torc = new AnimationServicesContext();
             torc.OnActivate(build_context);
 
@@ -48,8 +46,7 @@ namespace modular_avatar_tests
             skinnedMeshRenderer.rootBone = b.transform;
             Debug.Assert(skinnedMeshRenderer.bones.Length == 0);
 
-            var build_context =
+            var build_context = new nadena.dev.ndmf.BuildContext(root, null);
-                new nadena.dev.ndmf.BuildContext(root.GetComponent<VRCAvatarDescriptor>(), null);
             var torc = new AnimationServicesContext();
             torc.OnActivate(build_context);
 

UnitTests~/SerializationTests/SerializationTests.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+#if MA_VRCSDK3_AVATARS
+
+using System.Linq;
 using modular_avatar_tests;
 using nadena.dev.ndmf.runtime;
 using nadena.dev.modular_avatar.core;
@@ -65,3 +67,5 @@ namespace _ModularAvatar.EditModeTests.SerializationTests
         }
     }
 }
+
+#endif

UnitTests~/SimpleArmatureToggle/SimpleArmatureToggle.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor;
@@ -30,3 +32,5 @@ namespace modular_avatar_tests.SimpleArmatureToggle
         }
     }
 }
+
+#endif

UnitTests~/SyncedLayerHandling/SyncedLayerHandling.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using VRC.SDK3.Avatars.Components;
 
@@ -95,3 +97,5 @@ namespace modular_avatar_tests.SyncedLayerHandling
         }
     }
 }
+
+#endif

UnitTests~/TestBase.cs

@@ -7,7 +7,10 @@ using NUnit.Framework;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
+
+#if MA_VRCSDK3_AVATARS
 using VRC.SDK3.Avatars.Components;
+#endif
 
 namespace modular_avatar_tests
 {
@@ -95,6 +98,7 @@ namespace modular_avatar_tests
             return obj;
         }
 
+#if MA_VRCSDK3_AVATARS
         protected static AnimationClip findFxClip(GameObject prefab, string layerName)
         {
             var motion = findFxMotion(prefab, layerName) as AnimationClip;
@@ -110,6 +114,7 @@ namespace modular_avatar_tests
 
             return state.motion;
         }
+#endif
 
         protected static AnimatorState FindStateInLayer(AnimatorControllerLayer layer, string stateName)
         {
@@ -121,6 +126,7 @@ namespace modular_avatar_tests
             return null;
         }
 
+#if MA_VRCSDK3_AVATARS
         protected static AnimatorControllerLayer findFxLayer(GameObject prefab, string layerName)
         {
             var fx = prefab.GetComponent<VRCAvatarDescriptor>().baseAnimationLayers
@@ -135,5 +141,6 @@ namespace modular_avatar_tests
             Assert.NotNull(layer);
             return layer;
         }
+#endif
     }
 }

UnitTests~/Tests.asmdef

@@ -25,6 +25,12 @@
   "defineConstraints": [
     "UNITY_INCLUDE_TESTS"
   ],
-  "versionDefines": [],
+  "versionDefines": [
+    {
+      "name": "com.vrchat.avatars",
+      "expression": "",
+      "define": "MA_VRCSDK3_AVATARS"
+    }
+  ],
   "noEngineReferences": false
 }

UnitTests~/TransformMappingThroughSwitchedObject/TransformMappingThroughSwitchedObject.cs

@@ -1,4 +1,6 @@
-using nadena.dev.modular_avatar.core.editor;
+#if MA_VRCSDK3_AVATARS
+
+using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEditor;
 using UnityEngine;
@@ -25,3 +27,5 @@ namespace modular_avatar_tests.TransformMappingThroughSwitchedObject
         }
     }
 }
+
+#endif

UnitTests~/VirtualMenuTests/VirtualMenuTests.cs

@@ -1,4 +1,6 @@
-using System;
+#if MA_VRCSDK3_AVATARS
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using nadena.dev.modular_avatar.core;
@@ -768,3 +770,5 @@ namespace modular_avatar_tests.VirtualMenuTests
         }
     }
 }
+
+#endif

UnitTests~/WorldFixedObjectTest/WorldFixedObjectTest.cs

@@ -3,7 +3,6 @@ using nadena.dev.modular_avatar.animation;
 using nadena.dev.modular_avatar.core.editor;
 using NUnit.Framework;
 using UnityEngine.Animations;
-using VRC.SDK3.Avatars.Components;
 
 public class WorldFixedObjectTest : TestBase
 {
@@ -11,12 +10,11 @@ public class WorldFixedObjectTest : TestBase
     public void SimpleTest()
     {
         var avatar = CreatePrefab("Simple.prefab");
-        var descriptor = avatar.GetComponent<VRCAvatarDescriptor>();
 
         var fixedObject = avatar.transform.Find("FixedObject");
 
         // initialize context
-        var buildContext = new BuildContext(descriptor);
+        var buildContext = new BuildContext(avatar);
         buildContext.PluginBuildContext.ActivateExtensionContext<AnimationServicesContext>();
 
         new WorldFixedObjectProcessor().Process(buildContext);
@@ -37,13 +35,12 @@ public class WorldFixedObjectTest : TestBase
     public void NestedTest()
     {
         var avatar = CreatePrefab("Nested.prefab");
-        var descriptor = avatar.GetComponent<VRCAvatarDescriptor>();
 
         var fixedObject = avatar.transform.Find("FixedObject");
         var nestedFixed = avatar.transform.Find("FixedObject/NestedFixed");
 
         // initialize context
-        var buildContext = new BuildContext(descriptor);
+        var buildContext = new BuildContext(avatar);
         buildContext.PluginBuildContext.ActivateExtensionContext<AnimationServicesContext>();
 
         new WorldFixedObjectProcessor().Process(buildContext);