Merge pull request #2209 from Microsoft/may19_dev-IL2CPP-BuildWIndowFix

David Kline · web-flow · commit e36c610ddb21 · 2018-05-30T09:45:49.000-07:00
Build Window fix for IL2CPP Targets
diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs
@@ -651,7 +651,8 @@ private void AppxBuildGUI()
             GUILayout.FlexibleSpace();
 
             // Open AppX packages location
-            string appxBuildPath = Path.GetFullPath(BuildDeployPrefs.BuildDirectory + "/" + PlayerSettings.productName + "/AppPackages");
+            string appxDirectory = curScriptingBackend == ScriptingImplementation.IL2CPP ? "/AppPackages/" + PlayerSettings.productName : "/" + PlayerSettings.productName + "/AppPackages";
+            string appxBuildPath = Path.GetFullPath(BuildDeployPrefs.BuildDirectory + appxDirectory);
             GUI.enabled = builds.Count > 0 && !string.IsNullOrEmpty(appxBuildPath);
 
             if (GUILayout.Button("Open APPX Packages Location", GUILayout.Width(halfWidth)))
@@ -1071,13 +1072,16 @@ private void UpdateBuilds()
         {
             builds.Clear();
 
+            var curScriptingBackend = PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA);
+            string appxDirectory = curScriptingBackend == ScriptingImplementation.IL2CPP ? "AppPackages\\" + PlayerSettings.productName : PlayerSettings.productName + "\\AppPackages";
+
             try
             {
                 appPackageDirectories.Clear();
                 string[] buildList = Directory.GetDirectories(BuildDeployPrefs.AbsoluteBuildDirectory, "*", SearchOption.AllDirectories);
                 foreach (string appBuild in buildList)
                 {
-                    if (appBuild.Contains("AppPackages") && !appBuild.Contains("AppPackages\\"))
+                    if (appBuild.Contains(appxDirectory) && !appBuild.Contains(appxDirectory + "\\"))
                     {
                         appPackageDirectories.AddRange(Directory.GetDirectories(appBuild));
                     }

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,8 @@ private void AppxBuildGUI()`
`651`	`651`	`GUILayout.FlexibleSpace();`
`652`	`652`
`653`	`653`	`// Open AppX packages location`
`654`		`- string appxBuildPath = Path.GetFullPath(BuildDeployPrefs.BuildDirectory + "/" + PlayerSettings.productName + "/AppPackages");`
	`654`	`+ string appxDirectory = curScriptingBackend == ScriptingImplementation.IL2CPP ? "/AppPackages/" + PlayerSettings.productName : "/" + PlayerSettings.productName + "/AppPackages";`
	`655`	`+ string appxBuildPath = Path.GetFullPath(BuildDeployPrefs.BuildDirectory + appxDirectory);`
`655`	`656`	`GUI.enabled = builds.Count > 0 && !string.IsNullOrEmpty(appxBuildPath);`
`656`	`657`
`657`	`658`	`if (GUILayout.Button("Open APPX Packages Location", GUILayout.Width(halfWidth)))`
`@@ -1071,13 +1072,16 @@ private void UpdateBuilds()`
`1071`	`1072`	`{`
`1072`	`1073`	`builds.Clear();`
`1073`	`1074`
	`1075`	`+ var curScriptingBackend = PlayerSettings.GetScriptingBackend(BuildTargetGroup.WSA);`
	`1076`	`+ string appxDirectory = curScriptingBackend == ScriptingImplementation.IL2CPP ? "AppPackages\\" + PlayerSettings.productName : PlayerSettings.productName + "\\AppPackages";`
	`1077`	`+`
`1074`	`1078`	`try`
`1075`	`1079`	`{`
`1076`	`1080`	`appPackageDirectories.Clear();`
`1077`	`1081`	`string[] buildList = Directory.GetDirectories(BuildDeployPrefs.AbsoluteBuildDirectory, "*", SearchOption.AllDirectories);`
`1078`	`1082`	`foreach (string appBuild in buildList)`
`1079`	`1083`	`{`
`1080`		`- if (appBuild.Contains("AppPackages") && !appBuild.Contains("AppPackages\\"))`
	`1084`	`+ if (appBuild.Contains(appxDirectory) && !appBuild.Contains(appxDirectory + "\\"))`
`1081`	`1085`	`{`
`1082`	`1086`	`appPackageDirectories.AddRange(Directory.GetDirectories(appBuild));`
`1083`	`1087`	`}`