Merge pull request #7087 from wiwei/issue7086

Update the extension service creator to work when the extension package isn't installed

Author: wiwei

Assets/MixedRealityToolkit.Tools/ExtensionServiceCreator/ExtensionServiceCreator.cs

@@ -6,6 +6,7 @@
 using Microsoft.MixedReality.Toolkit.Utilities.Editor;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
@@ -255,7 +256,8 @@ public string SampleCode
 
         #region static
 
-        private static readonly string DefaultExtensionsFolderName = "MixedRealityToolkit.Extensions";
+        private static readonly string DefaultGeneratedFolderName = "MixedRealityToolkit.Generated";
+        private static readonly string DefaultExtensionsFolderName = "Extensions";
         private static readonly string DefaultExtensionNamespace = "Microsoft.MixedReality.Toolkit.Extensions";
         private static readonly string PersistentStateKey = "MRTK_ExtensionServiceWizard_State_Before_Recompilation";
         private static readonly string ScriptExtension = ".cs";
@@ -273,7 +275,7 @@ public string SampleCode
 
         #region paths
 
-        private string ExtensionsFolder => MixedRealityToolkitFiles.MapModulePath(MixedRealityToolkitModuleType.Extensions);
+        private string ExtensionsFolder => Path.Combine("Assets", DefaultGeneratedFolderName, DefaultExtensionsFolderName);
         private string ServiceTemplatePath => MixedRealityToolkitFiles.MapRelativeFilePath(MixedRealityToolkitModuleType.Tools, "ExtensionServiceCreator/Templates/ExtensionScriptTemplate.txt");
         private string InspectorTemplatePath => MixedRealityToolkitFiles.MapRelativeFilePath(MixedRealityToolkitModuleType.Tools, "ExtensionServiceCreator/Templates/ExtensionInspectorTemplate.txt");
         private string InterfaceTemplatePath => MixedRealityToolkitFiles.MapRelativeFilePath(MixedRealityToolkitModuleType.Tools, "ExtensionServiceCreator/Templates/ExtensionInterfaceTemplate.txt");
@@ -413,7 +415,13 @@ public bool ValidateAssets(List<string> errors)
 
             if (!AssetDatabase.IsValidFolder(ExtensionsFolder))
             {
-                AssetDatabase.CreateFolder("Assets", DefaultExtensionsFolderName);
+                var generatedFolder = Path.Combine("Assets", DefaultGeneratedFolderName);
+                if (!AssetDatabase.IsValidFolder(generatedFolder))
+                {
+                    AssetDatabase.CreateFolder("Assets", DefaultGeneratedFolderName);
+                }
+                
+                AssetDatabase.CreateFolder(generatedFolder, DefaultExtensionsFolderName);
                 AssetDatabase.Refresh();
             }
 
@@ -803,4 +811,4 @@ private static Type FindServiceType(string serviceClassName)
 
         #endregion
     }
-}
+}

Assets/MixedRealityToolkit/Utilities/Editor/Setup/MixedRealityToolkitFiles.cs

@@ -320,11 +320,12 @@ public static string MapRelativeFolderPathToAbsolutePath(MixedRealityToolkitModu
         /// </summary>
         /// <param name="module">Module type to search for</param>
         /// <remarks>
-        /// Returns first valid module folder path (relative) found
+        /// Returns first valid module folder path (relative) found. Returns null otherwise.
         /// </remarks>
         public static string MapModulePath(MixedRealityToolkitModuleType module)
         {
-            return GetAssetDatabasePath(MapRelativeFolderPathToAbsolutePath(module, ""));
+            var path = MapRelativeFolderPathToAbsolutePath(module, "");
+            return path != null ? GetAssetDatabasePath(path) : null;
         }
 
         /// <summary>