Updated the default Build Platform to be x86 and Project wizard now updates build to appropriate settings.

Stephen Hodgson · Stephen Hodgson · commit 3e74f7a61690 · 2017-10-03T14:44:53.000-07:00
diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPrefs.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPrefs.cs
@@ -45,7 +45,7 @@ public static string BuildConfig
 
         public static string BuildPlatform
         {
-            get { return EditorPrefsUtility.GetEditorPref(EditorPrefs_BuildPlatform, "Any CPU"); }
+            get { return EditorPrefsUtility.GetEditorPref(EditorPrefs_BuildPlatform, "x86"); }
             set { EditorPrefsUtility.SetEditorPref(EditorPrefs_BuildPlatform, value); }
         }
 
diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs
@@ -329,7 +329,7 @@ private void OnGUI()
 
             var curScriptingBackend = PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA);
             var newScriptingBackend = (ScriptingImplementation)EditorGUILayout.IntPopup(
-                "Scripting Backend",
+                GUIHorizontalSpacer + "Scripting Backend",
                 (int)curScriptingBackend,
                 new[] { "IL2CPP", ".NET" },
                 new[] { (int)ScriptingImplementation.IL2CPP, (int)ScriptingImplementation.WinRTDotNET });
diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs
@@ -102,8 +102,11 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
                 {
                     using (var webRequest = UnityWebRequest.Get(SharingServiceURL))
                     {
+#if UNITY_2017_2_OR_NEWER
+                        webRequest.SendRequest();
+#else
                         webRequest.Send();
-
+#endif
                         while (!webRequest.isDone)
                         {
                             if (webRequest.downloadProgress != -1)
@@ -162,7 +165,11 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
                 {
                     using (var webRequest = UnityWebRequest.Get(InputManagerAssetURL))
                     {
+#if UNITY_2017_2_OR_NEWER
+                        webRequest.SendRequest();
+#else
                         webRequest.Send();
+#endif
 
                         while (!webRequest.isDone)
                         {
@@ -227,6 +234,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
                 EditorUserBuildSettings.wsaSubtarget = WSASubtarget.AnyDevice;
                 UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.WSA, new[] { "None" });
                 PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, false);
+                BuildDeployPrefs.BuildPlatform = "Any CPU";
             }
             else
             {
@@ -238,6 +246,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
                     EditorUserBuildSettings.wsaSubtarget = WSASubtarget.HoloLens;
                     UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.WSA, new[] { "HoloLens" });
                     PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, Values[ProjectSetting.XboxControllerSupport]);
+                    BuildDeployPrefs.BuildPlatform = "x86";
 
                     for (var i = 0; i < QualitySettings.names.Length; i++)
                     {
@@ -249,6 +258,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
                     EditorUserBuildSettings.wsaSubtarget = WSASubtarget.PC;
                     UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.WSA, new[] { "stereo" });
                     PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, false);
+                    BuildDeployPrefs.BuildPlatform = "x64";
 
                     for (var i = 0; i < QualitySettings.names.Length; i++)
                     {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static string BuildConfig`
`45`	`45`
`46`	`46`	`public static string BuildPlatform`
`47`	`47`	`{`
`48`		`- get { return EditorPrefsUtility.GetEditorPref(EditorPrefs_BuildPlatform, "Any CPU"); }`
	`48`	`+ get { return EditorPrefsUtility.GetEditorPref(EditorPrefs_BuildPlatform, "x86"); }`
`49`	`49`	`set { EditorPrefsUtility.SetEditorPref(EditorPrefs_BuildPlatform, value); }`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,11 @@ private void UpdateSettings(BuildTarget currentBuildTarget)`
`102`	`102`	`{`
`103`	`103`	`using (var webRequest = UnityWebRequest.Get(SharingServiceURL))`
`104`	`104`	`{`
	`105`	`+#if UNITY_2017_2_OR_NEWER`
	`106`	`+ webRequest.SendRequest();`
	`107`	`+#else`
`105`	`108`	`webRequest.Send();`
`106`		`-`
	`109`	`+#endif`
`107`	`110`	`while (!webRequest.isDone)`
`108`	`111`	`{`
`109`	`112`	`if (webRequest.downloadProgress != -1)`
`@@ -162,7 +165,11 @@ private void UpdateSettings(BuildTarget currentBuildTarget)`
`162`	`165`	`{`
`163`	`166`	`using (var webRequest = UnityWebRequest.Get(InputManagerAssetURL))`
`164`	`167`	`{`
	`168`	`+#if UNITY_2017_2_OR_NEWER`
	`169`	`+ webRequest.SendRequest();`
	`170`	`+#else`
`165`	`171`	`webRequest.Send();`
	`172`	`+#endif`
`166`	`173`
`167`	`174`	`while (!webRequest.isDone)`
`168`	`175`	`{`
`@@ -227,6 +234,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)`
`227`	`234`	`EditorUserBuildSettings.wsaSubtarget = WSASubtarget.AnyDevice;`
`228`	`235`	`UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.WSA, new[] { "None" });`
`229`	`236`	`PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, false);`
	`237`	`+ BuildDeployPrefs.BuildPlatform = "Any CPU";`
`230`	`238`	`}`
`231`	`239`	`else`
`232`	`240`	`{`
`@@ -238,6 +246,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)`
`238`	`246`	`EditorUserBuildSettings.wsaSubtarget = WSASubtarget.HoloLens;`
`239`	`247`	`UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.WSA, new[] { "HoloLens" });`
`240`	`248`	`PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, Values[ProjectSetting.XboxControllerSupport]);`
	`249`	`+ BuildDeployPrefs.BuildPlatform = "x86";`
`241`	`250`
`242`	`251`	`for (var i = 0; i < QualitySettings.names.Length; i++)`
`243`	`252`	`{`
`@@ -249,6 +258,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)`
`249`	`258`	`EditorUserBuildSettings.wsaSubtarget = WSASubtarget.PC;`
`250`	`259`	`UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.WSA, new[] { "stereo" });`
`251`	`260`	`PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, false);`
	`261`	`+ BuildDeployPrefs.BuildPlatform = "x64";`
`252`	`262`
`253`	`263`	`for (var i = 0; i < QualitySettings.names.Length; i++)`
`254`	`264`	`{`