Merge pull request #1059 from StephenHodgson/MRTK-ForwardCompatibility2

Mrtk forward compatibility

Author: StephenHodgson

Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPrefs.cs

@@ -11,6 +11,7 @@ public static class BuildDeployPrefs
         // Constants
         private const string EditorPrefs_BuildDir = "_BuildDeployWindow_BuildDir";
         private const string EditorPrefs_BuildConfig = "_BuildDeployWindow_BuildConfig";
+        private const string EditorPrefs_BuildPlatform = "_BuildDeployWindow_BuildPlatform";
         private const string EditorPrefs_ForceRebuild = "_BuildDeployWindow_ForceBuild";
         private const string EditorPrefs_IncrementBuildVersion = "_BuildDeployWindow_IncrementBuildVersion";
         private const string EditorPrefs_MSBuildVer = "_BuildDeployWindow_MSBuildVer";
@@ -42,6 +43,12 @@ public static string BuildConfig
             set { EditorPrefsUtility.SetEditorPref(EditorPrefs_BuildConfig, value); }
         }
 
+        public static string BuildPlatform
+        {
+            get { return EditorPrefsUtility.GetEditorPref(EditorPrefs_BuildPlatform, "Any CPU"); }
+            set { EditorPrefsUtility.SetEditorPref(EditorPrefs_BuildPlatform, value); }
+        }
+
         public static bool ForceRebuild
         {
             get { return EditorPrefsUtility.GetEditorPref(EditorPrefs_ForceRebuild, false); }

Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs

@@ -22,6 +22,26 @@ public class BuildDeployTools
     {
         public static readonly string DefaultMSBuildVersion = "14.0";
 
+        public static bool CanBuild()
+        {
+            if (PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA) == ScriptingImplementation.IL2CPP && IsIl2CppAvailable())
+            {
+                return true;
+            }
+
+            return PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA) == ScriptingImplementation.WinRTDotNET && IsDotNetAvailable();
+        }
+
+        public static bool IsDotNetAvailable()
+        {
+            return Directory.Exists(EditorApplication.applicationContentsPath + "\\PlaybackEngines\\MetroSupport\\Managed\\UAP");
+        }
+
+        public static bool IsIl2CppAvailable()
+        {
+            return Directory.Exists(EditorApplication.applicationContentsPath + "\\PlaybackEngines\\MetroSupport\\Managed\\il2cpp");
+        }
+
         public static bool BuildSLN(string buildDirectory, bool showDialog = true)
         {
             // Use BuildSLNUtilities to create the SLN
@@ -55,6 +75,7 @@ public static bool BuildSLN(string buildDirectory, bool showDialog = true)
                                     BuildDeployPrefs.MsBuildVersion,
                                     BuildDeployPrefs.ForceRebuild,
                                     BuildDeployPrefs.BuildConfig,
+                                    BuildDeployPrefs.BuildPlatform,
                                     BuildDeployPrefs.BuildDirectory,
                                     BuildDeployPrefs.IncrementBuildVersion);
                             }
@@ -82,7 +103,7 @@ public static string CalcMSBuildPath(string msBuildVersion)
                 {
                     if (key != null)
                     {
-                        var msBuildBinFolder = (string) key.GetValue("MSBuildToolsPath");
+                        var msBuildBinFolder = (string)key.GetValue("MSBuildToolsPath");
                         return Path.Combine(msBuildBinFolder, "msbuild.exe");
                     }
                 }
@@ -158,7 +179,7 @@ public static bool RestoreNugetPackages(string nugetPath, string storePath)
             return File.Exists(storePath + "\\project.lock.json");
         }
 
-        public static bool BuildAppxFromSLN(string productName, string msBuildVersion, bool forceRebuildAppx, string buildConfig, string buildDirectory, bool incrementVersion, bool showDialog = true)
+        public static bool BuildAppxFromSLN(string productName, string msBuildVersion, bool forceRebuildAppx, string buildConfig, string buildPlatform, string buildDirectory, bool incrementVersion, bool showDialog = true)
         {
             EditorUtility.DisplayProgressBar("Build AppX", "Building AppX Package...", 0);
             string slnFilename = Path.Combine(buildDirectory, PlayerSettings.productName + ".sln");
@@ -220,10 +241,11 @@ public static bool BuildAppxFromSLN(string productName, string msBuildVersion, b
             {
                 FileName = vs,
                 CreateNoWindow = false,
-                Arguments = string.Format("\"{0}\" /t:{2} /p:Configuration={1} /p:Platform=x86 /verbosity:m",
+                Arguments = string.Format("\"{0}\" /t:{1} /p:Configuration={2} /p:Platform={3} /verbosity:m",
                     solutionProjectPath,
+                    forceRebuildAppx ? "Rebuild" : "Build",
                     buildConfig,
-                    forceRebuildAppx ? "Rebuild" : "Build")
+                    buildPlatform)
             };
 
             // Uncomment out to debug by copying into command window

Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs

@@ -23,14 +23,21 @@ namespace HoloToolkit.Unity
     public class BuildDeployWindow : EditorWindow
     {
         private const float GUISectionOffset = 10.0f;
-        private const string GUIHorizSpacer = "     ";
+        private const string GUIHorizontalSpacer = "     ";
         private const float UpdateBuildsPeriod = 1.0f;
 
+        private enum BuildPlatformEnum
+        {
+            AnyCPU = 0,
+            x86 = 1,
+            x64 = 2
+        }
+
         private enum BuildConfigEnum
         {
-            DEBUG = 0,
-            RELEASE = 1,
-            MASTER = 2
+            Debug = 0,
+            Release = 1,
+            Master = 2
         }
 
         #region Properties
@@ -107,7 +114,7 @@ private bool HoloLensUsbConnected
 
         #region Methods
 
-        [MenuItem("HoloToolkit/Build Window", false, 0)]
+        [MenuItem("Mixed Reality Toolkit/Build Window", false, 0)]
         public static void OpenWindow()
         {
             // Dock it next to the Scene View.
@@ -213,17 +220,28 @@ private void OnGUI()
             EditorGUILayout.BeginHorizontal();
             GUILayout.FlexibleSpace();
             EditorGUILayout.EndHorizontal();
+            EditorGUILayout.BeginHorizontal();
 
             // Build directory (and save setting, if it's changed)
             string curBuildDirectory = BuildDeployPrefs.BuildDirectory;
-            string newBuildDirectory = EditorGUILayout.TextField(GUIHorizSpacer + "Build directory", curBuildDirectory);
+            string newBuildDirectory = EditorGUILayout.TextField(new GUIContent(GUIHorizontalSpacer + "Build Directory", "It's recommended to use UWP"), curBuildDirectory);
 
             if (newBuildDirectory != curBuildDirectory)
             {
                 BuildDeployPrefs.BuildDirectory = newBuildDirectory;
                 curBuildDirectory = newBuildDirectory;
             }
 
+            GUI.enabled = Directory.Exists(BuildDeployPrefs.AbsoluteBuildDirectory);
+
+            if (GUILayout.Button("Open Build Directory"))
+            {
+                Process.Start(BuildDeployPrefs.AbsoluteBuildDirectory);
+            }
+
+            GUI.enabled = true;
+            EditorGUILayout.EndHorizontal();
+
             // Build SLN button
             using (new EditorGUILayout.HorizontalScope())
             {
@@ -246,7 +264,7 @@ private void OnGUI()
 
                 GUI.enabled = ShouldOpenSLNBeEnabled;
 
-                if (GUILayout.Button("Open SLN", GUILayout.Width(buttonWidth_Quarter)))
+                if (GUILayout.Button("Open Project Solution", GUILayout.Width(buttonWidth_Quarter)))
                 {
                     // Open SLN
                     string slnFilename = Path.Combine(curBuildDirectory, PlayerSettings.productName + ".sln");
@@ -256,7 +274,7 @@ private void OnGUI()
                         var slnFile = new FileInfo(slnFilename);
                         Process.Start(slnFile.FullName);
                     }
-                    else if (EditorUtility.DisplayDialog("Solution Not Found", "We couldn't find the solution. Would you like to Build it?", "Yes, Build", "No"))
+                    else if (EditorUtility.DisplayDialog("Solution Not Found", "We couldn't find the Project's Solution. Would you like to Build the project now?", "Yes, Build", "No"))
                     {
                         // Build SLN
                         EditorApplication.delayCall += () => { BuildDeployTools.BuildSLN(curBuildDirectory); };
@@ -265,7 +283,7 @@ private void OnGUI()
 
                 GUI.enabled = ShouldBuildSLNBeEnabled;
 
-                if (GUILayout.Button("Build Visual Studio SLN", GUILayout.Width(buttonWidth_Half)))
+                if (GUILayout.Button("Build Unity Project", GUILayout.Width(buttonWidth_Half)))
                 {
                     // Build SLN
                     EditorApplication.delayCall += () => { BuildDeployTools.BuildSLN(curBuildDirectory); };
@@ -278,6 +296,8 @@ private void OnGUI()
             GUILayout.BeginVertical();
             GUILayout.Label("APPX");
 
+            GUILayout.BeginHorizontal();
+
             // SDK and MS Build Version(and save setting, if it's changed)
             string curMSBuildVer = BuildDeployPrefs.MsBuildVersion;
             string currentSDKVersion = EditorUserBuildSettings.wsaUWPSDK;
@@ -305,7 +325,7 @@ private void OnGUI()
                 }
             }
 
-            currentSDKVersionIndex = EditorGUILayout.Popup(GUIHorizSpacer + "SDK Version", currentSDKVersionIndex, windowsSdkPaths);
+            currentSDKVersionIndex = EditorGUILayout.Popup(GUIHorizontalSpacer + "SDK Version", currentSDKVersionIndex, windowsSdkPaths);
 
             string newSDKVersion = windowsSdkPaths[currentSDKVersionIndex];
 
@@ -315,41 +335,86 @@ private void OnGUI()
             }
 
             string newMSBuildVer = currentSDKVersionIndex <= defaultMSBuildVersionIndex ? BuildDeployTools.DefaultMSBuildVersion : "15.0";
-            EditorGUILayout.LabelField(GUIHorizSpacer + "MS Build Version", newMSBuildVer);
+            EditorGUILayout.LabelField(GUIHorizontalSpacer + "MS Build Version", newMSBuildVer);
 
             if (!newMSBuildVer.Equals(curMSBuildVer))
             {
                 BuildDeployPrefs.MsBuildVersion = newMSBuildVer;
                 curMSBuildVer = newMSBuildVer;
             }
 
+            GUILayout.EndHorizontal();
+            GUILayout.BeginHorizontal();
+
             // Build config (and save setting, if it's changed)
             string curBuildConfigString = BuildDeployPrefs.BuildConfig;
 
             BuildConfigEnum buildConfigOption;
             if (curBuildConfigString.ToLower().Equals("master"))
             {
-                buildConfigOption = BuildConfigEnum.MASTER;
+                buildConfigOption = BuildConfigEnum.Master;
             }
             else if (curBuildConfigString.ToLower().Equals("release"))
             {
-                buildConfigOption = BuildConfigEnum.RELEASE;
+                buildConfigOption = BuildConfigEnum.Release;
             }
             else
             {
-                buildConfigOption = BuildConfigEnum.DEBUG;
+                buildConfigOption = BuildConfigEnum.Debug;
             }
 
-            buildConfigOption = (BuildConfigEnum)EditorGUILayout.EnumPopup(GUIHorizSpacer + "Build Configuration", buildConfigOption);
+            buildConfigOption = (BuildConfigEnum)EditorGUILayout.EnumPopup(GUIHorizontalSpacer + "Build Configuration", buildConfigOption);
 
-            string newBuildConfig = buildConfigOption.ToString();
+            string buildConfigString = buildConfigOption.ToString();
 
-            if (newBuildConfig != curBuildConfigString)
+            if (buildConfigString != curBuildConfigString)
             {
-                BuildDeployPrefs.BuildConfig = newBuildConfig;
-                curBuildConfigString = newBuildConfig;
+                BuildDeployPrefs.BuildConfig = buildConfigString;
+                curBuildConfigString = buildConfigString;
             }
 
+            // Build Platform (and save setting, if it's changed)
+            string curBuildPlatformString = BuildDeployPrefs.BuildPlatform;
+            BuildPlatformEnum buildPlatformOption;
+
+            if (curBuildPlatformString.ToLower().Equals("x86"))
+            {
+                buildPlatformOption = BuildPlatformEnum.x86;
+            }
+            else if (curBuildPlatformString.ToLower().Equals("x64"))
+            {
+                buildPlatformOption = BuildPlatformEnum.x64;
+            }
+            else
+            {
+                buildPlatformOption = BuildPlatformEnum.AnyCPU;
+            }
+
+            buildPlatformOption = (BuildPlatformEnum)EditorGUILayout.EnumPopup(GUIHorizontalSpacer + "Build Platform", buildPlatformOption);
+
+            string newBuildPlatformString;
+
+            switch (buildPlatformOption)
+            {
+                case BuildPlatformEnum.AnyCPU:
+                    newBuildPlatformString = "Any CPU";
+                    break;
+                case BuildPlatformEnum.x86:
+                case BuildPlatformEnum.x64:
+                    newBuildPlatformString = buildPlatformOption.ToString();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+            if (newBuildPlatformString != curBuildPlatformString)
+            {
+                BuildDeployPrefs.BuildPlatform = newBuildPlatformString;
+                curBuildPlatformString = newBuildPlatformString;
+            }
+
+            GUILayout.EndHorizontal();
+
             // Build APPX button
             using (new EditorGUILayout.HorizontalScope())
             {
@@ -371,7 +436,7 @@ private void OnGUI()
                 // Increment version
                 EditorGUIUtility.labelWidth = 110;
                 bool curIncrementVersion = BuildDeployPrefs.IncrementBuildVersion;
-                bool newIncrementVersion = EditorGUILayout.Toggle("Increment version", curIncrementVersion);
+                bool newIncrementVersion = EditorGUILayout.Toggle("Increment Version", curIncrementVersion);
 
                 if (newIncrementVersion != curIncrementVersion)
                 {
@@ -385,7 +450,7 @@ private void OnGUI()
                 // Build APPX
                 GUI.enabled = ShouldBuildAppxBeEnabled;
 
-                if (GUILayout.Button("Build APPX from SLN", GUILayout.Width(buttonWidth_Half)))
+                if (GUILayout.Button("Build APPX", GUILayout.Width(buttonWidth_Half)))
                 {
                     // Open SLN
                     string slnFilename = Path.Combine(curBuildDirectory, PlayerSettings.productName + ".sln");
@@ -399,6 +464,7 @@ private void OnGUI()
                                 curMSBuildVer,
                                 curForceRebuildAppx,
                                 curBuildConfigString,
+                                curBuildPlatformString,
                                 curBuildDirectory,
                                 curIncrementVersion);
                     }
@@ -426,7 +492,7 @@ private void OnGUI()
             if (!LocalIPsOnly)
             {
                 string newTargetIPs = EditorGUILayout.TextField(
-                    new GUIContent(GUIHorizSpacer + "IP Address(es)", "IP(s) of target devices (e.g. 127.0.0.1;10.11.12.13)"),
+                    new GUIContent(GUIHorizontalSpacer + "IP Address(es)", "IP(s) of target devices (e.g. 127.0.0.1 | 10.11.12.13)"),
                     curTargetIps);
 
                 if (newTargetIPs != curTargetIps)
@@ -466,7 +532,7 @@ private void OnGUI()
                     GUI.enabled = false;
                 }
 
-                var selectedAddressIndex = EditorGUILayout.Popup(GUIHorizSpacer + "IP Address", previouslySavedAddress, addressesToPresent.ToArray());
+                var selectedAddressIndex = EditorGUILayout.Popup(GUIHorizontalSpacer + "IP Address", previouslySavedAddress, addressesToPresent.ToArray());
 
                 if (GUILayout.Button(locatorIsSearching ? "Searching" : "Refresh", GUILayout.Width(buttonWidth_Quarter)))
                 {
@@ -486,12 +552,12 @@ private void OnGUI()
 
             // Username/Password (and save seeings, if changed)
             string curUsername = BuildDeployPrefs.DeviceUser;
-            string newUsername = EditorGUILayout.TextField(GUIHorizSpacer + "Username", curUsername);
+            string newUsername = EditorGUILayout.TextField(GUIHorizontalSpacer + "Username", curUsername);
             string curPassword = BuildDeployPrefs.DevicePassword;
-            string newPassword = EditorGUILayout.PasswordField(GUIHorizSpacer + "Password", curPassword);
+            string newPassword = EditorGUILayout.PasswordField(GUIHorizontalSpacer + "Password", curPassword);
             bool curFullReinstall = BuildDeployPrefs.FullReinstall;
             bool newFullReinstall = EditorGUILayout.Toggle(
-                new GUIContent(GUIHorizSpacer + "Uninstall first", "Uninstall application before installing"), curFullReinstall);
+                new GUIContent(GUIHorizontalSpacer + "Uninstall First", "Uninstall application before installing"), curFullReinstall);
 
             if (newUsername != curUsername ||
                 newPassword != curPassword ||
@@ -505,7 +571,7 @@ private void OnGUI()
             // Build list (with install buttons)
             if (builds.Count == 0)
             {
-                GUILayout.Label(GUIHorizSpacer + "*** No builds found in build directory", EditorStyles.boldLabel);
+                GUILayout.Label(GUIHorizontalSpacer + "*** No builds found in build directory", EditorStyles.boldLabel);
             }
             else
             {
@@ -652,6 +718,7 @@ private void BuildAll(bool install = true)
                 BuildDeployPrefs.MsBuildVersion,
                 BuildDeployPrefs.ForceRebuild,
                 BuildDeployPrefs.BuildConfig,
+                BuildDeployPrefs.BuildPlatform,
                 BuildDeployPrefs.BuildDirectory,
                 BuildDeployPrefs.IncrementBuildVersion,
                 showDialog: !install))
@@ -726,7 +793,7 @@ private string CalcPackageFamilyName()
             }
 
             Debug.LogError("Unable to find PackageFamilyName in manifest file (" + manifest + ")");
-            return "";
+            return string.Empty;
         }
 
         private void InstallAppOnDevicesList(string buildPath, string[] targetList)