Merge pull request #3785 from MenelvagorMilsom/differentiate-WSAPlayer-buildAppx

wiwei · web-flow · commit 92228d940e25 · 2019-04-04T08:27:12.000-07:00
No longer build appx with WSAPlayer by default
diff --git a/Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs b/Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs
@@ -163,7 +163,7 @@ public static async void StartCommandLineBuild()
                 switch (EditorUserBuildSettings.activeBuildTarget)
                 {
                     case BuildTarget.WSAPlayer:
-                        success = await UwpPlayerBuildTools.BuildPlayer(new UwpBuildInfo(true) { BuildAppx = true });
+                        success = await UwpPlayerBuildTools.BuildPlayer(new UwpBuildInfo(true));
                         break;
                     default:
                         var buildInfo = new BuildInfo(true) as IBuildInfo;
diff --git a/Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/UwpBuildInfo.cs b/Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/UwpBuildInfo.cs
@@ -9,7 +9,6 @@ public class UwpBuildInfo : BuildInfo
     {
         public UwpBuildInfo(bool isCommandLine = false) : base(isCommandLine)
         {
-            BuildPlatform = "x86";
         }
 
         /// <inheritdoc />

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public static async void StartCommandLineBuild()`
`163`	`163`	`switch (EditorUserBuildSettings.activeBuildTarget)`
`164`	`164`	`{`
`165`	`165`	`case BuildTarget.WSAPlayer:`
`166`		`- success = await UwpPlayerBuildTools.BuildPlayer(new UwpBuildInfo(true) { BuildAppx = true });`
	`166`	`+ success = await UwpPlayerBuildTools.BuildPlayer(new UwpBuildInfo(true));`
`167`	`167`	`break;`
`168`	`168`	`default:`
`169`	`169`	`var buildInfo = new BuildInfo(true) as IBuildInfo;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ public class UwpBuildInfo : BuildInfo`
`9`	`9`	`{`
`10`	`10`	`public UwpBuildInfo(bool isCommandLine = false) : base(isCommandLine)`
`11`	`11`	`{`
`12`		`- BuildPlatform = "x86";`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`/// <inheritdoc />`