Merge pull request #9695 from MaxWang-MS/build_scene_fix

Only use scenes specified in command line when flags are present

Author: MaxWang-MS

Assets/MRTK/Core/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs

@@ -215,6 +215,10 @@ public static string GetProjectPath()
         public static void ParseBuildCommandLine(ref IBuildInfo buildInfo)
         {
             string[] arguments = Environment.GetCommandLineArgs();
+            
+            // Boolean used to track whether builfInfo contains scenes that are not specified by command line arguments.
+            // These non command line arugment scenes should be overwritten by those specified in the command line.
+            bool buildInfoContainsNonCommandLineScene = buildInfo.Scenes.Count() > 0;
 
             for (int i = 0; i < arguments.Length; ++i)
             {
@@ -224,13 +228,29 @@ public static void ParseBuildCommandLine(ref IBuildInfo buildInfo)
                         buildInfo.AutoIncrement = true;
                         break;
                     case "-sceneList":
-                        buildInfo.Scenes = buildInfo.Scenes.Union(SplitSceneList(arguments[++i]));
+                        if (buildInfoContainsNonCommandLineScene)
+                        {
+                            buildInfo.Scenes = SplitSceneList(arguments[++i]);
+                            buildInfoContainsNonCommandLineScene = false;
+                        }
+                        else
+                        {
+                            buildInfo.Scenes = buildInfo.Scenes.Union(SplitSceneList(arguments[++i]));
+                        }
                         break;
                     case "-sceneListFile":
                         string path = arguments[++i];
                         if (File.Exists(path))
                         {
-                            buildInfo.Scenes = buildInfo.Scenes.Union(SplitSceneList(File.ReadAllText(path)));
+                            if (buildInfoContainsNonCommandLineScene)
+                            {
+                                buildInfo.Scenes = SplitSceneList(File.ReadAllText(path));
+                                buildInfoContainsNonCommandLineScene = false;
+                            }
+                            else
+                            {
+                                buildInfo.Scenes = buildInfo.Scenes.Union(SplitSceneList(File.ReadAllText(path)));
+                            }
                         }
                         else
                         {