From 6db8698e72cd034110174c2ecab7c8a04b8e98f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norbert=F0=9F=90=A7Nemec?= <Norbert.Nemec@microsoft.com>
Date: Tue, 27 Jun 2023 15:39:07 +0200
Subject: [PATCH] move code depending on UnityEditor into separate assembly to
 avoid conflict with VisualScripting

---
 src/MessagePack.UnityClient/.gitignore         |  3 +++
 .../Scripts/MessagePack/Unity/Editor.meta      |  8 ++++++++
 .../Editor/MessagePack.UnityEditor.asmdef      | 18 ++++++++++++++++++
 .../Editor/MessagePack.UnityEditor.asmdef.meta |  7 +++++++
 .../Unity/{ => Editor}/MessagePackWindow.cs    |  0
 .../{ => Editor}/MessagePackWindow.cs.meta     |  0
 6 files changed, 36 insertions(+)
 create mode 100644 src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor.meta
 create mode 100644 src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePack.UnityEditor.asmdef
 create mode 100644 src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePack.UnityEditor.asmdef.meta
 rename src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/{ => Editor}/MessagePackWindow.cs (100%)
 rename src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/{ => Editor}/MessagePackWindow.cs.meta (100%)

diff --git a/src/MessagePack.UnityClient/.gitignore b/src/MessagePack.UnityClient/.gitignore
index 7de09ed87..357eef0a7 100644
--- a/src/MessagePack.UnityClient/.gitignore
+++ b/src/MessagePack.UnityClient/.gitignore
@@ -5,3 +5,6 @@
 # Unity wants to see binaries inside its Assets directory.
 # We link them in with make_unity_symlink.bat, but we don't want to actually commit them into git.
 Assets/*.dll
+
+# Unity requires .meta files to be committed - unignore the setting from above
+!*.meta
\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor.meta b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor.meta
new file mode 100644
index 000000000..a5c85ab21
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d13abb3bfc6e564e8246ef749c2a1a4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePack.UnityEditor.asmdef b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePack.UnityEditor.asmdef
new file mode 100644
index 000000000..bf354da4b
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePack.UnityEditor.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "MessagePack.UnityEditor",
+    "rootNamespace": "",
+    "references": [
+        "MessagePack"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePack.UnityEditor.asmdef.meta b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePack.UnityEditor.asmdef.meta
new file mode 100644
index 000000000..fc6ec6fbd
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePack.UnityEditor.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ebcc2dbcca2c7f34ea1bbffd92c7e885
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/MessagePackWindow.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePackWindow.cs
similarity index 100%
rename from src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/MessagePackWindow.cs
rename to src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePackWindow.cs
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/MessagePackWindow.cs.meta b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePackWindow.cs.meta
similarity index 100%
rename from src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/MessagePackWindow.cs.meta
rename to src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Editor/MessagePackWindow.cs.meta