Added checks for editor updating (#313)

XRTK · Sep 12, 2019 · 8636357 · 8636357
1 parent 8192f15
commit 8636357
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 11 deletions.
diff --git a/...ore/Packages/com.xrtk.core/Extensions/EditorClassExtensions/ScriptableObjectExtensions.cs b/...ore/Packages/com.xrtk.core/Extensions/EditorClassExtensions/ScriptableObjectExtensions.cs
@@ -43,7 +43,12 @@ public static ScriptableObject CreateAsset(this ScriptableObject scriptableObjec
 
             AssetDatabase.CreateAsset(scriptableObject, assetPathAndName);
             AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
+
+            if (!EditorApplication.isUpdating)
+            {
+                AssetDatabase.Refresh();
+            }
+
             EditorUtility.FocusProjectWindow();
             Selection.activeObject = scriptableObject;
             EditorGUIUtility.PingObject(scriptableObject);

diff --git a/XRTK-Core/Packages/com.xrtk.core/Inspectors/MixedRealityPreferences.cs b/XRTK-Core/Packages/com.xrtk.core/Inspectors/MixedRealityPreferences.cs
@@ -459,7 +459,11 @@ private static SceneAsset GetSceneObject(string sceneName, SceneAsset asset = nu
                 EditorBuildSettings.scenes = scenes;
                 Debug.Assert(EditorBuildSettings.scenes[0].guid == sceneGuid);
                 AssetDatabase.SaveAssets();
-                AssetDatabase.Refresh();
+
+                if (!EditorApplication.isUpdating)
+                {
+                    AssetDatabase.Refresh();
+                }
             }
 
             if (!EditorBuildSettings.scenes[0].enabled)

diff --git a/XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/AssemblyDefinitionEditorExtension.cs b/XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/AssemblyDefinitionEditorExtension.cs
@@ -95,7 +95,11 @@ public static void ReplaceWithAssembly()
                 Debug.LogError("Failed to replace source code with assembly!");
             }
 
-            AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+            if (!EditorApplication.isUpdating)
+            {
+                AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+            }
+
             EditorUtility.ClearProgressBar();
         }
 
@@ -270,7 +274,11 @@ public static void ReplaceWithSource()
             File.Delete(builtAssemblyPath);
             File.Delete($"{builtAssemblyPath}{META}");
 
-            AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+            if (!EditorApplication.isUpdating)
+            {
+                AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+            }
+
             EditorUtility.ClearProgressBar();
         }
 

diff --git a/...Core/Packages/com.xrtk.core/Inspectors/Utilities/Packages/MixedRealityPackageUtilities.cs b/...Core/Packages/com.xrtk.core/Inspectors/Utilities/Packages/MixedRealityPackageUtilities.cs
@@ -209,8 +209,12 @@ internal static async Task<Tuple<MixedRealityPackageInfo, bool>[]> GetCurrentMix
 
         private static async Task AddPackageAsync(MixedRealityPackageInfo packageInfo)
         {
-            var versionSeperator = new char[] { '.' };
-            var tag = (await GitUtilities.GetAllTagsFromRemoteAsync(packageInfo.Uri)).OrderBy(value => int.Parse(value.Split(versionSeperator)[0])).ThenBy(value => int.Parse(value.Split(versionSeperator)[1])).ThenBy(value => int.Parse(value.Split(versionSeperator)[2])).LastOrDefault();
+            var versionSeparator = new[] { '.' };
+            var tag = (await GitUtilities.GetAllTagsFromRemoteAsync(packageInfo.Uri))
+                .OrderBy(value => int.Parse(value.Split(versionSeparator)[0])) // Major
+                .ThenBy(value => int.Parse(value.Split(versionSeparator)[1]))  // Minor
+                .ThenBy(value => int.Parse(value.Split(versionSeparator)[2]))  // Revision
+                .LastOrDefault();
             var addRequest = Client.Add($"{packageInfo.Name}@{packageInfo.Uri}#{tag}");
 
             await addRequest.WaitUntil(request => request.IsCompleted, timeout: 30);

diff --git a/XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/SymbolicLinks/SymbolicLinker.cs b/XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/SymbolicLinks/SymbolicLinker.cs
@@ -192,7 +192,11 @@ public static void RunSync(bool forceUpdate = false)
 
             EditorUtility.SetDirty(Settings);
             AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
+
+            if (!EditorApplication.isUpdating)
+            {
+                AssetDatabase.Refresh();
+            }
 
             EditorApplication.UnlockReloadAssemblies();
             MixedRealityPackageUtilities.CheckPackageManifest();
@@ -390,7 +394,12 @@ private static bool CreateSymbolicLink(string sourceAbsolutePath, string targetA
 #endif
 
             Debug.Log($"Successfully created symbolic link to {sourceAbsolutePath}");
-            AssetDatabase.Refresh();
+
+            if (!EditorApplication.isUpdating)
+            {
+                AssetDatabase.Refresh();
+            }
+
             return true;
         }
 

diff --git a/XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/SymbolicLinks/SymbolicLinkerWindow.cs b/XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/SymbolicLinks/SymbolicLinkerWindow.cs
@@ -115,7 +115,11 @@ private static void DisableSymbolicLink()
 
             EditorUtility.SetDirty(SymbolicLinker.Settings);
             AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
+
+            if (!EditorApplication.isUpdating)
+            {
+                AssetDatabase.Refresh();
+            }
         }
 
         private void OnGUI()
@@ -167,7 +171,11 @@ private void OnGUI()
 
                     EditorUtility.SetDirty(SymbolicLinker.Settings);
                     AssetDatabase.SaveAssets();
-                    AssetDatabase.Refresh();
+
+                    if (!EditorApplication.isUpdating)
+                    {
+                        AssetDatabase.Refresh();
+                    }
                 }
             }
         }

diff --git a/XRTK-Core/Packages/com.xrtk.core/Utilities/Editor/EditorAssemblyReloadManager.cs b/XRTK-Core/Packages/com.xrtk.core/Utilities/Editor/EditorAssemblyReloadManager.cs
@@ -35,7 +35,13 @@ public static bool LockReloadAssemblies
                 else
                 {
                     EditorApplication.UnlockReloadAssemblies();
-                    EditorApplication.delayCall += () => AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+                    EditorApplication.delayCall += () =>
+                    {
+                        if (!EditorApplication.isUpdating)
+                        {
+                            AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+                        }
+                    };
 
                     if (!Application.isBatchMode)
                     {