Change Requests

Author: StephenHodgson

Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs

@@ -223,6 +223,7 @@ public static void ParseBuildCommandLine(ref IBuildInfo buildInfo)
                         break;
                     case "-x86":
                     case "-x64":
+                    case "-arm":
                         buildInfo.BuildPlatform = arguments[i].Substring(1);
                         break;
                     case "-debug":

Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs

@@ -181,12 +181,15 @@ private static async Task<string> FindMsBuildPathAsync()
 
         private static bool UpdateAppxManifest(IBuildInfo buildInfo)
         {
+            var fullPathOutputDirectory = Path.GetFullPath(buildInfo.OutputDirectory);
+            Debug.Log($"Searching for appx manifest in {fullPathOutputDirectory}...");
+
             // Find the manifest, assume the one we want is the first one
-            string[] manifests = Directory.GetFiles(BuildDeployPreferences.AbsoluteBuildDirectory, "Package.appxmanifest", SearchOption.AllDirectories);
+            string[] manifests = Directory.GetFiles(fullPathOutputDirectory, "Package.appxmanifest", SearchOption.AllDirectories);
 
             if (manifests.Length == 0)
             {
-                Debug.LogError($"Unable to find Package.appxmanifest file for build (in path - {BuildDeployPreferences.AbsoluteBuildDirectory})");
+                Debug.LogError($"Unable to find Package.appxmanifest file for build (in path - {fullPathOutputDirectory})");
                 return false;
             }
 
@@ -200,15 +203,15 @@ private static bool UpdateAppxManifest(IBuildInfo buildInfo)
 
             if (identityNode == null)
             {
-                Debug.LogError($"Package.appxmanifest for build (in path - {BuildDeployPreferences.AbsoluteBuildDirectory}) is missing an <Identity /> node");
+                Debug.LogError($"Package.appxmanifest for build (in path - {fullPathOutputDirectory}) is missing an <Identity /> node");
                 return false;
             }
 
             var dependencies = rootNode.Element(rootNode.GetDefaultNamespace() + "Dependencies");
 
             if (dependencies == null)
             {
-                Debug.LogError($"Package.appxmanifest for build (in path - {BuildDeployPreferences.AbsoluteBuildDirectory}) is missing <Dependencies /> node.");
+                Debug.LogError($"Package.appxmanifest for build (in path - {fullPathOutputDirectory}) is missing <Dependencies /> node.");
                 return false;
             }
 
@@ -221,7 +224,7 @@ private static bool UpdateAppxManifest(IBuildInfo buildInfo)
 
             if (versionAttr == null)
             {
-                Debug.LogError($"Package.appxmanifest for build (in path - {BuildDeployPreferences.AbsoluteBuildDirectory}) is missing a Version attribute in the <Identity /> node.");
+                Debug.LogError($"Package.appxmanifest for build (in path - {fullPathOutputDirectory}) is missing a Version attribute in the <Identity /> node.");
                 return false;
             }