From 0bb5c8d293ebf45e4447de3a2a9cb34090935862 Mon Sep 17 00:00:00 2001
From: naninunenoy <naninuneno0411@gmail.com>
Date: Wed, 16 Dec 2020 22:49:18 +0900
Subject: [PATCH 1/4] upgrade to 2020.2

---
 .../InspectorWindowWrapper.cs                          |  4 ++--
 Packages/manifest.json                                 |  6 +++---
 Packages/packages-lock.json                            | 10 +++++-----
 ProjectSettings/ProjectVersion.txt                     |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs
index d74770c..9b71544 100644
--- a/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs
+++ b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs
@@ -1,5 +1,5 @@
 using UnityEditor;
-using UnityEditor.Experimental.AssetImporters;
+
 
 namespace AsmdefHelper.UnityInternal {
     public class InspectorWindowWrapper : EditorWindow{
@@ -17,7 +17,7 @@ namespace AsmdefHelper.UnityInternal {
 
         public void AllApply() {
             foreach (var editor in inspectorWindow.tracker.activeEditors) {
-                var assetImporterEditor = editor as AssetImporterEditor;
+                var assetImporterEditor = editor as UnityEditor.AssetImporters.AssetImporterEditor;
 
                 if (assetImporterEditor != null && assetImporterEditor.HasModified()) {
                     assetImporterEditor.ApplyAndImport();
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 7f2b0ce..4101ac4 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "com.unity.ide.rider": "1.2.1",
-    "com.unity.ide.visualstudio": "2.0.2",
-    "com.unity.test-framework": "1.1.16",
+    "com.unity.ide.rider": "2.0.7",
+    "com.unity.ide.visualstudio": "2.0.5",
+    "com.unity.test-framework": "1.1.19",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 167787c..c7ec9e9 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "com.unity.ext.nunit": {
-      "version": "1.0.0",
+      "version": "1.0.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "1.2.1",
+      "version": "2.0.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -17,18 +17,18 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.2",
+      "version": "2.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.16",
+      "version": "1.1.19",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.0",
+        "com.unity.ext.nunit": "1.0.5",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 9d99902..0560e11 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.1.6f1
-m_EditorVersionWithRevision: 2020.1.6f1 (fc477ca6df10)
+m_EditorVersion: 2020.2.0f1
+m_EditorVersionWithRevision: 2020.2.0f1 (3721df5a8b28)

From 89d8712bb5b8f4ecda62f2895c9075ef53f8ceec Mon Sep 17 00:00:00 2001
From: naninunenoy <naninuneno0411@gmail.com>
Date: Wed, 16 Dec 2020 23:01:15 +0900
Subject: [PATCH 2/4] add rootNamespace property

---
 .../Editor/AsmdefCustomCreateView.cs             | 16 ++++++++++++++--
 .../Editor/AsmdefCustomCreateView.uxml           |  3 ++-
 .../Editor/AssemblyDefinitionJson.cs             |  3 +++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
index 8ac0e69..9c963af 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
@@ -37,8 +37,10 @@ namespace AsmdefHelper.CustomCreate.Editor {
             var NameTextField = root.Q<TextField>(className: "NameTextField");
             var AllowUnsafeToggle = root.Q<Toggle>(className: "AllowUnsafeToggle");
             var AutoReferencedToggle = root.Q<Toggle>(className: "AutoReferencedToggle");
-            var OverrideReferencesToggle = root.Q<Toggle>(className: "OverrideReferencesToggle");
             var NoEngineReferencesToggle = root.Q<Toggle>(className: "NoEngineReferencesToggle");
+            var OverrideReferencesToggle = root.Q<Toggle>(className: "OverrideReferencesToggle");
+            var RootNamespaceTextField = root.Q<TextField>(className: "RootNamespaceTextField");
+
             var IsEditorToggle = root.Q<Toggle>(className: "IsEditorToggle");
             var CreateButton = root.Q<Button>(className: "CreateButton");
 
@@ -47,8 +49,15 @@ namespace AsmdefHelper.CustomCreate.Editor {
             var assetPath = AssetDatabase.GetAssetPath(asset);
             var directory = string.IsNullOrWhiteSpace(assetPath) ? "Assets/" : assetPath;
             PathTextField.value = directory;
-            NameTextField.value = directory.Replace("Assets/", "").Replace('/', '.');
+            var defaultName = directory.Replace("Assets/", "").Replace('/', '.');
+            NameTextField.value = defaultName;
 
+            // RootNamespace が設定できるのは2020.2以降
+#if UNITY_2020_2_OR_NEWER
+            RootNamespaceTextField.value = defaultName;
+#else
+            root.Remove(RootNamespaceTextField);
+#endif
             // .asmdefを作成して閉じる
             CreateButton.clickable.clicked += () => {
                 var asmdefName = NameTextField.value;
@@ -60,6 +69,9 @@ namespace AsmdefHelper.CustomCreate.Editor {
                     noEngineReferences = NoEngineReferencesToggle.value,
                     includePlatforms = IsEditorToggle.value ? new[] { "Editor" } : new string[0]
                 };
+#if UNITY_2020_2_OR_NEWER
+                asmdef.rootNamespace = RootNamespaceTextField.value;
+#endif
                 var asmdefJson = JsonUtility.ToJson(asmdef, true);
                 var asmdefPath = $"{directory}/{asmdefName}.asmdef";
                 File.WriteAllText(asmdefPath, asmdefJson, Encoding.UTF8);
diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
index 1386e62..290c110 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
@@ -11,8 +11,9 @@
         <engine:TextField class="NameTextField"  label="Name" text="ASMDEF_NAME_HERE"/>
         <engine:Toggle class="AllowUnsafeToggle"  label="Allow 'unsafe' Code" value="false"/>
         <engine:Toggle class="AutoReferencedToggle"  label="Auto Referenced" value="true"/>
-        <engine:Toggle class="OverrideReferencesToggle"  label="Override Referenced" value="false"/>
         <engine:Toggle class="NoEngineReferencesToggle"  label="No Engine References" value="false"/>
+        <engine:Toggle class="OverrideReferencesToggle"  label="Override Referenced" value="false"/>
+        <engine:TextField class="RootNamespaceTextField"  label="Root Namespace" text="ROOT_NAMESPACE_HERE"/>
         <engine:Toggle class="IsEditorToggle"  label="Is Editor" value="false"/>
         <engine:Button class="CreateButton"  text="Create" />
     </engine:Box>
diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AssemblyDefinitionJson.cs b/Assets/AsmdefHelper/CustomCreate/Editor/AssemblyDefinitionJson.cs
index 898c7d8..9d5ccb5 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AssemblyDefinitionJson.cs
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AssemblyDefinitionJson.cs
@@ -1,6 +1,9 @@
 namespace AsmdefHelper.CustomCreate.Editor {
     public class AssemblyDefinitionJson {
         public string name = string.Empty;
+#if UNITY_2020_2_OR_NEWER
+        public string rootNamespace = string.Empty;
+#endif
         public string[] references = new string[0];
         public string[] includePlatforms = new string[0];
         public string[] excludePlatforms = new string[0];

From a2b3bc90a7a080fdcf7522fd452369214b0069b5 Mon Sep 17 00:00:00 2001
From: naninunenoy <naninuneno0411@gmail.com>
Date: Wed, 16 Dec 2020 23:12:10 +0900
Subject: [PATCH 3/4] fix to remve text fileld in old unity

---
 .../CustomCreate/Editor/AsmdefCustomCreateView.cs        | 9 ++++-----
 .../CustomCreate/Editor/AsmdefCustomCreateView.uxml      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
index 9c963af..c35fea4 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
@@ -40,7 +40,6 @@ namespace AsmdefHelper.CustomCreate.Editor {
             var NoEngineReferencesToggle = root.Q<Toggle>(className: "NoEngineReferencesToggle");
             var OverrideReferencesToggle = root.Q<Toggle>(className: "OverrideReferencesToggle");
             var RootNamespaceTextField = root.Q<TextField>(className: "RootNamespaceTextField");
-
             var IsEditorToggle = root.Q<Toggle>(className: "IsEditorToggle");
             var CreateButton = root.Q<Button>(className: "CreateButton");
 
@@ -56,22 +55,22 @@ namespace AsmdefHelper.CustomCreate.Editor {
 #if UNITY_2020_2_OR_NEWER
             RootNamespaceTextField.value = defaultName;
 #else
-            root.Remove(RootNamespaceTextField);
+            root.Q<Box>(className: "Box").Remove(RootNamespaceTextField);
 #endif
             // .asmdefを作成して閉じる
             CreateButton.clickable.clicked += () => {
                 var asmdefName = NameTextField.value;
                 var asmdef = new AssemblyDefinitionJson {
                     name = asmdefName,
+#if UNITY_2020_2_OR_NEWER
+                    rootNamespace = RootNamespaceTextField.value,
+#endif
                     allowUnsafeCode = AllowUnsafeToggle.value,
                     autoReferenced = AutoReferencedToggle.value,
                     overrideReferences = OverrideReferencesToggle.value,
                     noEngineReferences = NoEngineReferencesToggle.value,
                     includePlatforms = IsEditorToggle.value ? new[] { "Editor" } : new string[0]
                 };
-#if UNITY_2020_2_OR_NEWER
-                asmdef.rootNamespace = RootNamespaceTextField.value;
-#endif
                 var asmdefJson = JsonUtility.ToJson(asmdef, true);
                 var asmdefPath = $"{directory}/{asmdefName}.asmdef";
                 File.WriteAllText(asmdefPath, asmdefJson, Encoding.UTF8);
diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
index 290c110..af86e43 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
@@ -6,7 +6,7 @@
     xsi:noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd"
 >
     <engine:Label class="AsmdefInfo" text="Input your asmdef info"/>
-    <engine:Box>
+    <engine:Box class="Box">
         <engine:TextField class="PathTextField"  label="Path" text="ASMDEF_PATH_HERE"  readonly="true"/>
         <engine:TextField class="NameTextField"  label="Name" text="ASMDEF_NAME_HERE"/>
         <engine:Toggle class="AllowUnsafeToggle"  label="Allow 'unsafe' Code" value="false"/>

From d470c63feedf0296baf2b26b43a69b54409488c5 Mon Sep 17 00:00:00 2001
From: naninunenoy <naninuneno0411@gmail.com>
Date: Wed, 16 Dec 2020 23:16:45 +0900
Subject: [PATCH 4/4] release 0.4.1

---
 Assets/package.json | 2 +-
 README.md           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/package.json b/Assets/package.json
index f7afe49..4880e6b 100644
--- a/Assets/package.json
+++ b/Assets/package.json
@@ -1,7 +1,7 @@
 {
     "name": "dev.n5y.asmdefhelper",
     "displayName": "AsmdefHelper",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "unity": "2019.3",
     "description": "Unity assembly definition utilities.",
     "keywords": ["asmdef", "editor"],
diff --git a/README.md b/README.md
index 191724e..c5f48d2 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ And you can also rename an asmdef by one action.
 ___
 
 ## Environment
-Unity 2020.1.6f1
+Unity 2020.2.0f1
 
 This library use unity internal class, so may be not work (or couse build error) depending your unity vresion.