Merge pull request #6903 from keveleigh/arm64

Add ARM64 support to build window for Unity 2019 and support multiple VS versions side-by-side

Author: keveleigh

Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/BuildDeployWindow.cs

@@ -39,6 +39,9 @@ private enum Architecture
             x86 = 0,
             x64 = 1,
             ARM = 2,
+#if UNITY_2019_1_OR_NEWER
+            ARM64 = 3
+#endif // UNITY_2019_1_OR_NEWER
         }
 
         private enum PlatformToolset
@@ -584,6 +587,12 @@ private void AppxBuildGUI()
             {
                 buildArchitecture = Architecture.ARM;
             }
+#if UNITY_2019_1_OR_NEWER
+            else if (currentArchitectureString.ToLower().Equals("arm64"))
+            {
+                buildArchitecture = Architecture.ARM64;
+            }
+#endif // UNITY_2019_1_OR_NEWER
 
             buildArchitecture = (Architecture)EditorGUILayout.EnumPopup("Build Platform", buildArchitecture, GUILayout.Width(HALF_WIDTH));
 

Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs

@@ -174,6 +174,17 @@ private static async Task<string> FindMsBuildPathAsync()
             // have VS2017 or VS2019 installed.
             foreach (VSWhereFindOption findOption in VSWhereFindOptions)
             {
+                string arguments = findOption.arguments;
+                if (string.IsNullOrWhiteSpace(EditorUserBuildSettings.wsaUWPVisualStudioVersion))
+                {
+                    arguments += " -latest";
+                }
+                else
+                {
+                    // Add version number with brackets to find only the specified version
+                    arguments += $" -version [{EditorUserBuildSettings.wsaUWPVisualStudioVersion}]";
+                }
+
                 var result = await new Process().StartProcessAsync(
                 new ProcessStartInfo
                 {
@@ -182,7 +193,7 @@ private static async Task<string> FindMsBuildPathAsync()
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
-                    Arguments = findOption.arguments,
+                    Arguments = arguments,
                     WorkingDirectory = @"C:\Program Files (x86)\Microsoft Visual Studio\Installer"
                 });
 
@@ -623,12 +634,12 @@ public VSWhereFindOption(string args, string suffix)
         {
             // This find option corresponds to the version of vswhere that ships with VS2019.
             new VSWhereFindOption(
-                $@"/C vswhere -all -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe",
+                @"/C vswhere -all -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe",
                 ""),
             // This find option corresponds to the version of vswhere that ships with VS2017 - this doesn't have
             // support for the -find command switch.
             new VSWhereFindOption(
-                $@"/C vswhere -all -products * -requires Microsoft.Component.MSBuild -property installationPath",
+                @"/C vswhere -all -products * -requires Microsoft.Component.MSBuild -property installationPath",
                 "\\MSBuild\\15.0\\Bin\\MSBuild.exe"),
         };
     }