Merged PR 799130: Clean up /scriptfile arg todo

Clean up /scriptfile arg todo

Public/Src/App/Bxl/Args.cs

@@ -953,13 +953,6 @@ namespace BuildXL
                         OptionHandlerFactory.CreateBoolOption(
                             "scheduleMetaPips",
                             sign => schedulingConfiguration.ScheduleMetaPips = sign),
-                        OptionHandlerFactory.CreateOption2(
-                            "scriptFile",
-                            "s",
-                            opt =>
-                            {
-                                throw CommandLineUtilities.Error(Strings.Args_ScriptFile_Deprecated, CommandLineUtilities.ParseStringOption(opt));
-                            }),
                         OptionHandlerFactory.CreateBoolOption(
                             "scriptShowLargest",
                             opt => frontEndConfiguration.ShowLargestFilesStatistics = opt),

Public/Src/App/Bxl/HelpText.cs

@@ -31,8 +31,6 @@ namespace BuildXL
             hw.WriteLine();
         }
 
-        // BUG: should display list of available qualifiers
-        // BUG: should display list of available filter tags
         public static void DisplayHelp(HelpLevel helpLevel)
         {
             var hw = new HelpWriter(helpLevel);
@@ -176,9 +174,6 @@ namespace BuildXL
                 "/canonicalizeFilterOutputs[+|-]",
                 Strings.HelpText_DisplayHelp_CanonicalizeFilterOutputs);
 
-            // TODO: This option is DScript only. It isn't shown in the help text because we have the goal of
-            // removing it and unifying it with the standard filtering above.
-            // hw.WriteOption("scriptFile"
             #endregion
 
             hw.WriteBanner(Strings.HelpText_DisplayHelp_LoggingBanner);

Public/Src/App/Bxl/Strings.resx

@@ -255,9 +255,6 @@
   <data name="HelpText_DisplayHelp_Incremental" xml:space="preserve">
     <value>When enabled, artifacts are built incrementally based on which source files have changed. Defaults to on.</value>
   </data>
-  <data name="Args_ScriptFile_Deprecated" xml:space="preserve">
-    <value>Error: /scriptfile: and /s: have been deprecated so instead of using /s:{0} you can use /filter:spec=’{0}’ or just {0} without the /s: prefix.</value>
-  </data>
   <data name="App_Main_Log" xml:space="preserve">
     <value>    Log: {0}</value>
   </data>