Merge pull request #1064 from StephenHodgson/MRTK-Dev2017.2-MasterMergeUpdate

Mrtk dev2017.2 master merge update

Author: keveleigh

Assets/HoloToolkit-Examples/Prototyping/Shaders/UnlitTransparentTriplanar.shader

@@ -4,7 +4,7 @@
 ///
 /// Simple vertex shader that blends static lighting and camera lighting.
 ///
-Shader "HoloToolkit/Examples/UnlitTransparentTriplanar"
+Shader "MixedRealityToolkit/Examples/UnlitTransparentTriplanar"
 {
 	Properties
 	{

Assets/HoloToolkit-Examples/Prototyping/Shaders/UnlitTriplanar.shader

@@ -2,9 +2,9 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 ///
-///  Simple vertex shader that blends static lighting and camera lighting.
+/// Simple vertex shader that blends static lighting and camera lighting.
 ///
-Shader "HoloToolkit/Examples/UnlitTriplanar"
+Shader "MixedRealityToolkit/Examples/UnlitTriplanar"
 {
 	Properties
 	{

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

@@ -20,6 +20,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
@@ -53,6 +73,7 @@ public static bool BuildSLN(string buildDirectory, bool showDialog = true)
                                     BuildDeployPrefs.MsBuildVersion,
                                     BuildDeployPrefs.ForceRebuild,
                                     BuildDeployPrefs.BuildConfig,
+                                    BuildDeployPrefs.BuildPlatform,
                                     BuildDeployPrefs.BuildDirectory,
                                     BuildDeployPrefs.IncrementBuildVersion);
                             }
@@ -80,7 +101,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");
                     }
                 }
@@ -156,7 +177,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");
@@ -218,10 +239,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