From f18cb09fd14220ffad1a8291671d4f36b6daa41d Mon Sep 17 00:00:00 2001
From: esnya <esnya@nekometer.com>
Date: Mon, 30 Aug 2021 15:53:52 +0900
Subject: [PATCH] :bug: fix: Fix namespace of InariUdonVaridator

---
 Assets/InariUdon/Editor/DocumentGenerator.cs  |  2 ++
 .../InariUdon/Editor/InariUdonEditor.asmdef   | 23 -------------------
 Assets/InariUdon/InariUdonRuntime.asmdef      |  8 ++++---
 ...UdonEditor.asmdef.meta => Validation.meta} |  5 ++--
 .../InariUdonValidator.cs                     |  2 +-
 .../InariUdonValidator.cs.meta                |  0
 6 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 Assets/InariUdon/Editor/InariUdonEditor.asmdef
 rename Assets/InariUdon/{Editor/InariUdonEditor.asmdef.meta => Validation.meta} (57%)
 rename Assets/InariUdon/{Editor => Validation}/InariUdonValidator.cs (98%)
 rename Assets/InariUdon/{Editor => Validation}/InariUdonValidator.cs.meta (100%)

diff --git a/Assets/InariUdon/Editor/DocumentGenerator.cs b/Assets/InariUdon/Editor/DocumentGenerator.cs
index 103ea0d..9ce740c 100644
--- a/Assets/InariUdon/Editor/DocumentGenerator.cs
+++ b/Assets/InariUdon/Editor/DocumentGenerator.cs
@@ -1,3 +1,4 @@
+#if !COMPILER_UDONSHARP && UNITY_EDITOR
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -103,3 +104,4 @@ private static void GenerateDocuments()
         }
     }
 }
+#endif
diff --git a/Assets/InariUdon/Editor/InariUdonEditor.asmdef b/Assets/InariUdon/Editor/InariUdonEditor.asmdef
deleted file mode 100644
index 4611e3c..0000000
--- a/Assets/InariUdon/Editor/InariUdonEditor.asmdef
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "InariUdonEditor",
-    "references": [
-        "VRC.Udon",
-        "VRC.Udon.Serialization.OdinSerializer",
-        "UdonSharp.Runtime",
-        "UdonSharp.Editor",
-        "UdonToolkitRuntime",
-        "UdonToolkitEditor",
-        "Unity.TextMeshPro",
-        "InariUdonRuntime"
-    ],
-    "optionalUnityReferences": [],
-    "includePlatforms": [
-        "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": []
-}
\ No newline at end of file
diff --git a/Assets/InariUdon/InariUdonRuntime.asmdef b/Assets/InariUdon/InariUdonRuntime.asmdef
index 3135a61..601d832 100644
--- a/Assets/InariUdon/InariUdonRuntime.asmdef
+++ b/Assets/InariUdon/InariUdonRuntime.asmdef
@@ -7,14 +7,16 @@
         "UdonSharp.Editor",
         "UdonToolkitRuntime",
         "UdonToolkitEditor",
-        "Unity.TextMeshPro"
+        "Unity.TextMeshPro",
+        "InariUdonEditor"
     ],
-    "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/InariUdon/Editor/InariUdonEditor.asmdef.meta b/Assets/InariUdon/Validation.meta
similarity index 57%
rename from Assets/InariUdon/Editor/InariUdonEditor.asmdef.meta
rename to Assets/InariUdon/Validation.meta
index 2c7a8e5..59e4d43 100644
--- a/Assets/InariUdon/Editor/InariUdonEditor.asmdef.meta
+++ b/Assets/InariUdon/Validation.meta
@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: bf22ee11cd7cf9942942a2550de50d91
-AssemblyDefinitionImporter:
+guid: 4fb79a135c848ea46b7c96ed4ae07e0c
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Assets/InariUdon/Editor/InariUdonValidator.cs b/Assets/InariUdon/Validation/InariUdonValidator.cs
similarity index 98%
rename from Assets/InariUdon/Editor/InariUdonValidator.cs
rename to Assets/InariUdon/Validation/InariUdonValidator.cs
index e715848..718ce9d 100644
--- a/Assets/InariUdon/Editor/InariUdonValidator.cs
+++ b/Assets/InariUdon/Validation/InariUdonValidator.cs
@@ -8,7 +8,7 @@
 using UnityEditor;
 #endif
 
-namespace InariUdon.Editor
+namespace InariUdon.Validation
 {
     public class InariUdonValidator
     {
diff --git a/Assets/InariUdon/Editor/InariUdonValidator.cs.meta b/Assets/InariUdon/Validation/InariUdonValidator.cs.meta
similarity index 100%
rename from Assets/InariUdon/Editor/InariUdonValidator.cs.meta
rename to Assets/InariUdon/Validation/InariUdonValidator.cs.meta