From 8647512e834c515c6fcc588cd8d098e93d87b5d5 Mon Sep 17 00:00:00 2001
From: nakano yosuke <naninuneno0411@gmail.com>
Date: Wed, 15 Apr 2020 21:13:20 +0900
Subject: [PATCH] =?UTF-8?q?SyncSolution=E3=81=A8UnityInternalAPI=E3=81=AE?=
 =?UTF-8?q?=E4=BE=9D=E5=AD=98=E3=82=92=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.idea.AsmdefHelper/.idea/contentModel.xml |  4 +-
 .idea/.idea.AsmdefHelper/.idea/workspace.xml  | 37 +++++++++++++++----
 .../AsmdefHelper.SyncSolution.Editor.asmdef   | 17 +++++++++
 ...defHelper.SyncSolution.Editor.asmdef.meta} |  4 +-
 .../AsmdefHelper.SyncSolution.Editor.asmref   |  3 --
 .../Editor/SyncSolutionUtilities.cs           | 11 ++----
 .../SolutionSynchronizerWrapper.cs            | 22 +++++++++++
 .../SolutionSynchronizerWrapper.cs.meta       |  3 ++
 8 files changed, 79 insertions(+), 22 deletions(-)
 create mode 100644 Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmdef
 rename Assets/AsmdefHelper/SyncSolution/Editor/{AsmdefHelper.SyncSolution.Editor.asmref.meta => AsmdefHelper.SyncSolution.Editor.asmdef.meta} (56%)
 delete mode 100644 Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref
 create mode 100644 Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs
 create mode 100644 Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs.meta

diff --git a/.idea/.idea.AsmdefHelper/.idea/contentModel.xml b/.idea/.idea.AsmdefHelper/.idea/contentModel.xml
index 8e75e83..75dd7ce 100644
--- a/.idea/.idea.AsmdefHelper/.idea/contentModel.xml
+++ b/.idea/.idea.AsmdefHelper/.idea/contentModel.xml
@@ -10,6 +10,7 @@
       <e p="AsmdefHelper.Example.Hoge.csproj" t="IncludeRecursive" />
       <e p="AsmdefHelper.Example.Piyo.csproj" t="IncludeRecursive" />
       <e p="AsmdefHelper.sln" t="IncludeFlat" />
+      <e p="AsmdefHelper.SyncSolution.Editor.csproj" t="IncludeRecursive" />
       <e p="Assets" t="Include">
         <e p="AsmdefHelper" t="Include">
           <e p="DependencyGraph" t="Include">
@@ -45,11 +46,12 @@
           </e>
           <e p="SyncSolution" t="Include">
             <e p="Editor" t="Include">
-              <e p="AsmdefHelper.SyncSolution.Editor.asmref" t="Include" />
+              <e p="AsmdefHelper.SyncSolution.Editor.asmdef" t="Include" />
               <e p="SyncSolutionUtilities.cs" t="Include" />
             </e>
           </e>
           <e p="Unity.InternalAPIEditorBridgeDev.001" t="Include">
+            <e p="SolutionSynchronizerWrapper.cs" t="Include" />
             <e p="Unity.InternalAPIEditorBridgeDev.001.asmdef" t="Include" />
           </e>
         </e>
diff --git a/.idea/.idea.AsmdefHelper/.idea/workspace.xml b/.idea/.idea.AsmdefHelper/.idea/workspace.xml
index afc9746..95c4b1d 100644
--- a/.idea/.idea.AsmdefHelper/.idea/workspace.xml
+++ b/.idea/.idea.AsmdefHelper/.idea/workspace.xml
@@ -2,9 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f71251e0-52ab-4cea-859f-4c363c01a121" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.AsmdefHelper/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.AsmdefHelper/.idea/contentModel.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.AsmdefHelper/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.AsmdefHelper/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref.meta" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -16,16 +20,18 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/Unity.InternalAPIEditorBridgeDev.001.asmdef" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmdef" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/Unity.InternalAPIEditorBridgeDev.001.asmdef" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="IdeDocumentHistory">
@@ -39,8 +45,11 @@
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs" />
-        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" />
         <option value="$PROJECT_DIR$/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs" />
+        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/UnityInternal/SolutionSynchronizerWrapper.cs" />
+        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/UnityInternal/SyncSolutionUtilities.cs" />
+        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs" />
+        <option value="$PROJECT_DIR$/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs" />
       </list>
     </option>
   </component>
@@ -105,7 +114,8 @@
       <workItem from="1586793017650" duration="506000" />
       <workItem from="1586793564564" duration="160000" />
       <workItem from="1586793758449" duration="2076000" />
-      <workItem from="1586872725062" duration="502000" />
+      <workItem from="1586872725062" duration="657000" />
+      <workItem from="1586951660938" duration="989000" />
     </task>
     <servers />
   </component>
@@ -114,4 +124,15 @@
   </component>
   <component name="UnityProjectConfiguration" hasMinimizedUI="true" />
   <component name="UnityUnitTestConfiguration" currentTestLauncher="EditMode" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmdef b/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmdef
new file mode 100644
index 0000000..602a998
--- /dev/null
+++ b/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmdef
@@ -0,0 +1,17 @@
+{
+    "name": "AsmdefHelper.SyncSolution.Editor",
+    "references": [
+        "GUID:211243abc45174c45b3a6c275ea126b9"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref.meta b/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmdef.meta
similarity index 56%
rename from Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref.meta
rename to Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmdef.meta
index fee193c..fec76e6 100644
--- a/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref.meta
+++ b/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmdef.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 353d4308cc0c6c945a085f59650f2b11
-AssemblyDefinitionReferenceImporter:
+guid: dcfd308825181f346bc76cac8ae79330
+AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref b/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref
deleted file mode 100644
index 0a12953..0000000
--- a/Assets/AsmdefHelper/SyncSolution/Editor/AsmdefHelper.SyncSolution.Editor.asmref
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "reference": "GUID:211243abc45174c45b3a6c275ea126b9"
-}
\ No newline at end of file
diff --git a/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs b/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs
index 1d6a4e4..d6fc933 100644
--- a/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs
+++ b/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs
@@ -2,18 +2,13 @@
 using System.IO;
 using System.Linq;
 using UnityEditor;
-using UnityEditor.VisualStudioIntegration;
 using UnityEngine;
+using AsmdefHelper.UnityInternal;
 
 // https://forum.unity.com/threads/solved-unity-not-generating-sln-file-from-assets-open-c-project.538487/
 // Thank you Flexford!
 namespace AsmdefHelper.SyncSolution.Editor {
     public static class SyncSolutionUtilities {
-        static SolutionSynchronizer synchronizer;
-
-        static SyncSolutionUtilities() {
-            synchronizer = SyncVS.Synchronizer;
-        }
 
         [MenuItem("Window/Asmdef Helper/Sync C# Solution", priority = 3000)]
         public static void Sync() {
@@ -43,14 +38,14 @@ namespace AsmdefHelper.SyncSolution.Editor {
             if (logsEnabled) {
                 Debug.Log($"Coll method: SyncVS.Sync()");
             }
-            SyncVS.SyncSolution();
+            SolutionSynchronizerWrapper.SyncSolution();
         }
 
         static void Call_SynchronizerSync(bool logsEnabled) {
             if (logsEnabled) {
                 Debug.Log($"Coll method: SyncVS.Synchronizer.Sync()");
             }
-            synchronizer?.Sync();
+            SolutionSynchronizerWrapper.SynchronizerSync();
         }
 
         static IEnumerable<FileInfo> GetFilesByExtensions(DirectoryInfo dir, params string[] extensions) {
diff --git a/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs
new file mode 100644
index 0000000..c66c13d
--- /dev/null
+++ b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs
@@ -0,0 +1,22 @@
+using UnityEditor;
+using UnityEditor.VisualStudioIntegration;
+
+namespace AsmdefHelper.UnityInternal {
+    public static class SolutionSynchronizerWrapper {
+
+        static readonly SolutionSynchronizer synchronizer;
+
+        static SolutionSynchronizerWrapper() {
+            synchronizer = SyncVS.Synchronizer;
+        }
+
+        public static void SyncSolution() {
+            SyncVS.SyncSolution();
+        }
+
+
+        public static void SynchronizerSync() {
+            synchronizer?.Sync();
+        }
+    }
+}
diff --git a/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs.meta b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs.meta
new file mode 100644
index 0000000..c3db60a
--- /dev/null
+++ b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/SolutionSynchronizerWrapper.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: aeb995b6396143f58028eb4aa639c7c4
+timeCreated: 1586952223
\ No newline at end of file