From d1edcb38bdd12a17a9b59d0224dad6e6447be37f Mon Sep 17 00:00:00 2001
From: George Fleming <v-geflem@microsoft.com>
Date: Thu, 14 Apr 2016 09:09:52 -0700
Subject: [PATCH 1/5] Redo command-line parsing, add -noninteractive and
 -encodedcommand options

---
 .../main.cs                                   | 153 +++++++++++++-----
 1 file changed, 115 insertions(+), 38 deletions(-)

diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
index ba3f0be180..697774b59f 100644
--- a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
+++ b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
@@ -14,6 +14,30 @@ namespace Microsoft.PowerShell.CoreConsoleHost
 
     public static class Program
     {
+        private enum Options {Help, File, Command, NoProfile, NonInteractive, EncodedCommand, Invalid};
+        private class CommandOptions
+        {
+            public Options opt;
+            public string optString;
+
+            public CommandOptions(Options o, string s)
+            {
+                opt = o;
+                optString = s;
+            }
+        }
+
+        private static CommandOptions[] commandOptions = new CommandOptions[] 
+            {
+                new CommandOptions(Options.Help, "help"), 
+                new CommandOptions(Options.Help, "?"), 
+                new CommandOptions(Options.File, "file"),
+                new CommandOptions(Options.Command, "command"), 
+                new CommandOptions(Options.NoProfile, "noprofile"),
+                new CommandOptions(Options.NonInteractive, "noninteractive"), 
+                new CommandOptions(Options.EncodedCommand, "encodedcommand")
+            };
+
         /// <summary>
         /// Creates and initiates the listener instance.
         /// </summary>
@@ -25,6 +49,7 @@ namespace Microsoft.PowerShell.CoreConsoleHost
             // here eliminates the need for a custom native host.
             PowerShellAssemblyLoadContextInitializer.SetPowerShellAssemblyLoadContext(string.Empty);
 
+
             // Argument parsing
             string initialScript = null;
             bool loadProfiles = true;
@@ -37,15 +62,33 @@ namespace Microsoft.PowerShell.CoreConsoleHost
                     bool hasNext = (i+1) < args.Length;
                     string nextArg = hasNext ? args[i+1] : string.Empty;
 
-                    // --help was specified
-                    if (arg == "--help" || arg == "-h")
+                    // options start with "-" or "--"
+
+                    string option;
+                    if (arg.StartsWith("-"))
                     {
-                        Console.WriteLine(@"
-usage: powershell[.exe] [ (--help | -h) ]
+                        if (arg.StartsWith("--"))
+                        {
+                            option = arg.Remove(0, 2);
+                        }
+                        else
+                        {
+                            option = arg.Remove(0, 1);
+                        }
+
+                        Options bestOption = FindOption(option);
+
+                        switch (bestOption)
+                        {
+                            case Options.Help:
+                                Console.WriteLine(@"
+usage: powershell[.exe] [ (--help | -h | -?) ]
                         [ (--file | -f) <filePath> ]
                         [ <script>.ps1 ]
                         [ (--command | -c) <string> ]
-                        [ --noprofile ]
+                        [ --noprofile | -nop ]
+                        [ --noninteractive | -non ]
+                        [ (--encodedcommand | -e) <bas64Command> ]
 
 SYNOPSIS
 
@@ -65,46 +108,63 @@ OPTIONS
     (--command | -c) <string>
             Will execute given string as a PowerShell script.
 
-    --noprofile
+    (--noprofile | -nop)
             Disables parsing of PowerShell profiles.
 
-    (--help | -h)
+    (--help | -h | -?)
             Prints this text.
+
+    (--noninteractive | -non)
+            Does not present an interactive prompt to the user.
+
+    (--encodedcommand | -e) <base64Command>
+            Accepts a base-64-encoded string version of a command.
 ");
-                        return;
-                    }
-                    else if (arg == "--noprofile")
-                    {
-                        loadProfiles = false;
-                    }
-                    // lone argument is a script
-                    else if (!hasNext && arg.EndsWith(".ps1"))
-                    {
-                        initialScript = Path.GetFullPath(arg);
-                    }
-                    // lone argument is an inline script
-                    else if (!hasNext)
-                    {
-                        initialScript = arg;
-                    }
-                    // --file <filePath> was specified
-                    else if (hasNext && (arg == "--file" || arg == "-f"))
-                    {
-                        initialScript = Path.GetFullPath(nextArg);
-                        ++i;
-                    }
-                    // --command <string> was specified
-                    else if (hasNext && (arg == "--command" || arg == "-c"))
-                    {
-                        if (nextArg == "-")
-                        {
-                            initialScript = "\"TODO: read stdin using Console.OpenStandardInput\"";
+                                return;
+
+                            case Options.NoProfile:
+                                loadProfiles = false;
+                                break;
+                            case Options.File:
+                                initialScript = Path.GetFullPath(nextArg);
+                                ++i;
+                                break;
+                            case Options.Command:
+                                if (nextArg == "-")
+                                {
+                                    initialScript = "\"TODO: read stdin using Console.OpenStandardInput\"";
+                                }
+                                else
+                                {
+                                    initialScript = nextArg;
+                                }
+                                ++i;
+                                break;
+                            case Options.NonInteractive:
+                                // TODO, figure out what this option does exactly
+                                break;
+                            case Options.EncodedCommand:
+                                byte[] data = Convert.FromBase64String(nextArg);
+                                initialScript = Encoding.UTF8.GetString(data);
+                                ++i;
+                                break;
+                            default:
+                                Console.WriteLine("Invalid command-line option: {0}. Use '-help' option to get a list of valid options.");
+                                return;
                         }
-                        else
+                    }
+                    else  // not an option parameter
+                    {
+                        // lone argument is a script
+                        if (!hasNext && arg.EndsWith(".ps1"))
                         {
-                            initialScript = nextArg;
+                            initialScript = Path.GetFullPath(arg);
+                        }
+                        // lone argument is an inline script
+                        else if (!hasNext)
+                        {
+                            initialScript = arg;
                         }
-                        ++i;
                     }
                 }
             }
@@ -129,6 +189,23 @@ OPTIONS
             // The exit code is set in the host by the MyHost.SetShouldExit() method.
             System.Environment.Exit(listener.ExitCode);
         }
+
+        private static Options FindOption(string option)
+        {
+            int matches = 0;
+            int index = -1;
+
+            for (int i=0; i<commandOptions.Length; ++i)
+            {
+                if (commandOptions[i].optString.StartsWith(option, StringComparison.OrdinalIgnoreCase))
+                {
+                    matches++;
+                    index = i;
+                }
+            }
+
+            return (matches == 1) ? commandOptions[index].opt : Options.Invalid;
+        }
     }
 
     internal class Listener

From ec61d56c0e24481366fa3cd9cccc2b427a855bc1 Mon Sep 17 00:00:00 2001
From: George Fleming <v-geflem@microsoft.com>
Date: Thu, 14 Apr 2016 10:54:01 -0700
Subject: [PATCH 2/5] minor change to error message

---
 src/Microsoft.PowerShell.CoreConsoleHost/main.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
index 697774b59f..aa68187141 100644
--- a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
+++ b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
@@ -149,7 +149,7 @@ OPTIONS
                                 ++i;
                                 break;
                             default:
-                                Console.WriteLine("Invalid command-line option: {0}. Use '-help' option to get a list of valid options.");
+                                Console.WriteLine("Invalid command-line option: {0}. Use '-help' option to get a list of valid options.", arg);
                                 return;
                         }
                     }

From 4c1ee1c589a7fd050e09fbe06f6a691d50774c6c Mon Sep 17 00:00:00 2001
From: George Fleming <v-geflem@microsoft.com>
Date: Thu, 14 Apr 2016 11:18:47 -0700
Subject: [PATCH 3/5] Prevent UI popups when run with -noninteractive

---
 .../host.cs                                   |   2 +-
 .../main.cs                                   |  17 +-
 .../ui.cs                                     | 280 ++++++++++--------
 3 files changed, 166 insertions(+), 133 deletions(-)

diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/host.cs b/src/Microsoft.PowerShell.CoreConsoleHost/host.cs
index 6d23885fd3..c987abac76 100644
--- a/src/Microsoft.PowerShell.CoreConsoleHost/host.cs
+++ b/src/Microsoft.PowerShell.CoreConsoleHost/host.cs
@@ -16,7 +16,7 @@ namespace Microsoft.PowerShell.CoreConsoleHost
         public MyHost(Listener Listener)
         {
             this.Listener = Listener;
-            this.myHostUserInterface = new MyHostUserInterface(Listener.HasUI);
+            this.myHostUserInterface = new MyHostUserInterface(Listener.HasUI, Listener.Interactive);
         }
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
index aa68187141..d01f7a54d8 100644
--- a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
+++ b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
@@ -53,6 +53,7 @@ namespace Microsoft.PowerShell.CoreConsoleHost
             // Argument parsing
             string initialScript = null;
             bool loadProfiles = true;
+            bool interactive = true;
 
             if (args.Length > 0)
             {
@@ -141,7 +142,7 @@ OPTIONS
                                 ++i;
                                 break;
                             case Options.NonInteractive:
-                                // TODO, figure out what this option does exactly
+                                interactive = false;
                                 break;
                             case Options.EncodedCommand:
                                 byte[] data = Convert.FromBase64String(nextArg);
@@ -174,7 +175,7 @@ OPTIONS
             ConsoleColor InitialBackgroundColor = Console.BackgroundColor;
 
             // Create the listener and run it
-            Listener listener = new Listener(initialScript, loadProfiles);
+            Listener listener = new Listener(initialScript, loadProfiles, interactive);
 
             // only run if there was no script file passed in
             if (initialScript == null)
@@ -282,13 +283,19 @@ OPTIONS
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether UI should exit.
+        /// Gets or sets a value indicating whether UI exists (display prompt)
         /// </summary>
         public bool HasUI;
 
-        public Listener(string initialScript, bool loadProfiles)
+        /// <summary>
+        /// Gets or sets a value indicating whether session is interactive (allow popup)
+        /// </summary>
+        public bool Interactive;
+
+        public Listener(string initialScript, bool loadProfiles, bool interactive)
         {
-            HasUI = (initialScript == null) ? true : false;
+            this.HasUI = (initialScript == null) ? true : false;
+            this.Interactive = interactive;
 
             // Create the host and runspace instances for this interpreter.
             // Note that this application does not support console files so
diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs b/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs
index 14667eee1d..05d02188d0 100644
--- a/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs
+++ b/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs
@@ -20,7 +20,7 @@ namespace Microsoft.PowerShell.CoreConsoleHost
         /// <summary>
         /// Public constructor
         /// </summary>
-        public MyHostUserInterface(bool hasUI)
+        public MyHostUserInterface(bool hasUI, bool interactive)
         {
             myRawUi = (hasUI) ? new MyRawUserInterface() : null;
         }
@@ -39,6 +39,11 @@ namespace Microsoft.PowerShell.CoreConsoleHost
             get { return this.myRawUi; }
         }
 
+        /// <summary>
+        ///   Whether user pop-ups are allowed
+        /// </summary>
+        public bool Interactive;
+
         /// <summary>
         /// Prompts the user for input.
         /// <param name="caption">The caption or title of the prompt.</param>
@@ -52,26 +57,33 @@ namespace Microsoft.PowerShell.CoreConsoleHost
                 string message,
                 Collection<FieldDescription> descriptions)
         {
-            this.Write(
-                    ConsoleColor.White,
-                    Console.BackgroundColor,
-                    caption + System.Environment.NewLine + message + " ");
-            Dictionary<string, PSObject> results =
-                new Dictionary<string, PSObject>();
-            foreach (FieldDescription fd in descriptions)
+            if (Interactive)
             {
-                string[] label = GetHotkeyAndLabel(fd.Label);
-                this.WriteLine(label[1]);
-                string userData = Console.ReadLine();
-                if (userData == null)
+                this.Write(
+                           ConsoleColor.White,
+                           Console.BackgroundColor,
+                           caption + System.Environment.NewLine + message + " ");
+                Dictionary<string, PSObject> results =
+                    new Dictionary<string, PSObject>();
+                foreach (FieldDescription fd in descriptions)
                 {
-                    return null;
+                    string[] label = GetHotkeyAndLabel(fd.Label);
+                    this.WriteLine(label[1]);
+                    string userData = Console.ReadLine();
+                    if (userData == null)
+                    {
+                        return null;
+                    }
+
+                    results[fd.Name] = PSObject.AsPSObject(userData);
                 }
 
-                results[fd.Name] = PSObject.AsPSObject(userData);
+                return results;
+            }
+            else
+            {
+                throw new InvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
             }
-
-            return results;
         }
 
         /// <summary>
@@ -93,57 +105,64 @@ namespace Microsoft.PowerShell.CoreConsoleHost
                 Collection<ChoiceDescription> choices,
                 int defaultChoice)
         {
-            // Write the caption and message strings in Blue.
-            this.WriteLine(
-                    ConsoleColor.Blue,
-                    Console.BackgroundColor,
-                    caption + System.Environment.NewLine + message + System.Environment.NewLine);
-
-            // Convert the choice collection into something that is
-            // easier to work with. See the BuildHotkeysAndPlainLabels
-            // method for details.
-            string[,] promptData = BuildHotkeysAndPlainLabels(choices);
-
-            // Format the overall choice prompt string to display.
-            StringBuilder sb = new StringBuilder();
-            for (int element = 0; element < choices.Count; element++)
+            if (Interactive)
             {
+                // Write the caption and message strings in Blue.
+                this.WriteLine(
+                               ConsoleColor.Blue,
+                               Console.BackgroundColor,
+                               caption + System.Environment.NewLine + message + System.Environment.NewLine);
+
+                // Convert the choice collection into something that is
+                // easier to work with. See the BuildHotkeysAndPlainLabels
+                // method for details.
+                string[,] promptData = BuildHotkeysAndPlainLabels(choices);
+
+                // Format the overall choice prompt string to display.
+                StringBuilder sb = new StringBuilder();
+                for (int element = 0; element < choices.Count; element++)
+                {
+                    sb.Append(String.Format(
+                                            CultureInfo.CurrentCulture,
+                                            "|{0}> {1} ",
+                                            promptData[0, element],
+                                            promptData[1, element]));
+                }
+
                 sb.Append(String.Format(
-                            CultureInfo.CurrentCulture,
-                            "|{0}> {1} ",
-                            promptData[0, element],
-                            promptData[1, element]));
-            }
+                                        CultureInfo.CurrentCulture,
+                                        "[Default is ({0}]",
+                                        promptData[0, defaultChoice]));
 
-            sb.Append(String.Format(
-                        CultureInfo.CurrentCulture,
-                        "[Default is ({0}]",
-                        promptData[0, defaultChoice]));
-
-            // Read prompts until a match is made, the default is
-            // chosen, or the loop is interrupted with ctrl-C.
-            while (true)
-            {
-                this.WriteLine(ConsoleColor.Cyan, Console.BackgroundColor, sb.ToString());
-                string data = Console.ReadLine().Trim().ToUpper();
-
-                // If the choice string was empty, use the default selection.
-                if (data.Length == 0)
+                // Read prompts until a match is made, the default is
+                // chosen, or the loop is interrupted with ctrl-C.
+                while (true)
                 {
-                    return defaultChoice;
-                }
+                    this.WriteLine(ConsoleColor.Cyan, Console.BackgroundColor, sb.ToString());
+                    string data = Console.ReadLine().Trim().ToUpper();
 
-                // See if the selection matched and return the
-                // corresponding index if it did.
-                for (int i = 0; i < choices.Count; i++)
-                {
-                    if (promptData[0, i] == data)
+                    // If the choice string was empty, use the default selection.
+                    if (data.Length == 0)
                     {
-                        return i;
+                        return defaultChoice;
                     }
-                }
 
-                this.WriteErrorLine("Invalid choice: " + data);
+                    // See if the selection matched and return the
+                    // corresponding index if it did.
+                    for (int i = 0; i < choices.Count; i++)
+                    {
+                        if (promptData[0, i] == data)
+                        {
+                            return i;
+                        }
+                    }
+
+                    this.WriteErrorLine("Invalid choice: " + data);
+                }
+            }
+            else
+            {
+                throw new InvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
             }
         }
 
@@ -167,87 +186,94 @@ namespace Microsoft.PowerShell.CoreConsoleHost
                 Collection<ChoiceDescription> choices,
                 IEnumerable<int> defaultChoices)
         {
-            // Write the caption and message strings in Blue.
-            this.WriteLine(
-                    ConsoleColor.Blue,
-                    Console.BackgroundColor,
-                    caption + System.Environment.NewLine + message + System.Environment.NewLine);
-
-            // Convert the choice collection into something that is
-            // easier to work with. See the BuildHotkeysAndPlainLabels
-            // method for details.
-            string[,] promptData = BuildHotkeysAndPlainLabels(choices);
-
-            // Format the overall choice prompt string to display.
-            StringBuilder sb = new StringBuilder();
-            for (int element = 0; element < choices.Count; element++)
+            if (Interactive)
             {
-                sb.Append(String.Format(
-                            CultureInfo.CurrentCulture,
-                            "|{0}> {1} ",
-                            promptData[0, element],
-                            promptData[1, element]));
-            }
+                // Write the caption and message strings in Blue.
+                this.WriteLine(
+                               ConsoleColor.Blue,
+                               Console.BackgroundColor,
+                               caption + System.Environment.NewLine + message + System.Environment.NewLine);
 
-            Collection<int> defaultResults = new Collection<int>();
-            if (defaultChoices != null)
-            {
-                int countDefaults = 0;
-                foreach (int defaultChoice in defaultChoices)
+                // Convert the choice collection into something that is
+                // easier to work with. See the BuildHotkeysAndPlainLabels
+                // method for details.
+                string[,] promptData = BuildHotkeysAndPlainLabels(choices);
+
+                // Format the overall choice prompt string to display.
+                StringBuilder sb = new StringBuilder();
+                for (int element = 0; element < choices.Count; element++)
                 {
-                    ++countDefaults;
-                    defaultResults.Add(defaultChoice);
+                    sb.Append(String.Format(
+                                            CultureInfo.CurrentCulture,
+                                            "|{0}> {1} ",
+                                            promptData[0, element],
+                                            promptData[1, element]));
                 }
 
-                if (countDefaults != 0)
+                Collection<int> defaultResults = new Collection<int>();
+                if (defaultChoices != null)
                 {
-                    sb.Append(countDefaults == 1 ? "[Default choice is " : "[Default choices are ");
+                    int countDefaults = 0;
                     foreach (int defaultChoice in defaultChoices)
                     {
-                        sb.AppendFormat(
-                                CultureInfo.CurrentCulture,
-                                "\"{0}\",",
-                                promptData[0, defaultChoice]);
+                        ++countDefaults;
+                        defaultResults.Add(defaultChoice);
                     }
 
-                    sb.Remove(sb.Length - 1, 1);
-                    sb.Append("]");
+                    if (countDefaults != 0)
+                    {
+                        sb.Append(countDefaults == 1 ? "[Default choice is " : "[Default choices are ");
+                        foreach (int defaultChoice in defaultChoices)
+                        {
+                            sb.AppendFormat(
+                                            CultureInfo.CurrentCulture,
+                                            "\"{0}\",",
+                                            promptData[0, defaultChoice]);
+                        }
+
+                        sb.Remove(sb.Length - 1, 1);
+                        sb.Append("]");
+                    }
+                }
+
+                this.WriteLine(
+                               ConsoleColor.Cyan,
+                               Console.BackgroundColor,
+                               sb.ToString());
+                // Read prompts until a match is made, the default is
+                // chosen, or the loop is interrupted with ctrl-C.
+                Collection<int> results = new Collection<int>();
+                while (true)
+                {
+                ReadNext:
+                    string prompt = string.Format(CultureInfo.CurrentCulture, "Choice[{0}]:", results.Count);
+                    this.Write(ConsoleColor.Cyan, Console.BackgroundColor, prompt);
+                    string data = Console.ReadLine().Trim().ToUpper();
+
+                    // If the choice string was empty, no more choices have been made.
+                    // If there were no choices made, return the defaults
+                    if (data.Length == 0)
+                    {
+                        return (results.Count == 0) ? defaultResults : results;
+                    }
+
+                    // See if the selection matched and return the
+                    // corresponding index if it did.
+                    for (int i = 0; i < choices.Count; i++)
+                    {
+                        if (promptData[0, i] == data)
+                        {
+                            results.Add(i);
+                            goto ReadNext;
+                        }
+                    }
+
+                    this.WriteErrorLine("Invalid choice: " + data);
                 }
             }
-
-            this.WriteLine(
-                    ConsoleColor.Cyan,
-                    Console.BackgroundColor,
-                    sb.ToString());
-            // Read prompts until a match is made, the default is
-            // chosen, or the loop is interrupted with ctrl-C.
-            Collection<int> results = new Collection<int>();
-            while (true)
+            else
             {
-ReadNext:
-                string prompt = string.Format(CultureInfo.CurrentCulture, "Choice[{0}]:", results.Count);
-                this.Write(ConsoleColor.Cyan, Console.BackgroundColor, prompt);
-                string data = Console.ReadLine().Trim().ToUpper();
-
-                // If the choice string was empty, no more choices have been made.
-                // If there were no choices made, return the defaults
-                if (data.Length == 0)
-                {
-                    return (results.Count == 0) ? defaultResults : results;
-                }
-
-                // See if the selection matched and return the
-                // corresponding index if it did.
-                for (int i = 0; i < choices.Count; i++)
-                {
-                    if (promptData[0, i] == data)
-                    {
-                        results.Add(i);
-                        goto ReadNext;
-                    }
-                }
-
-                this.WriteErrorLine("Invalid choice: " + data);
+                throw new InvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
             }
         }
 

From 969dc932ece0bc2de1bad4b5a240991cc11df3c9 Mon Sep 17 00:00:00 2001
From: George Fleming <v-geflem@microsoft.com>
Date: Fri, 15 Apr 2016 10:56:22 -0700
Subject: [PATCH 4/5] Change InvalidOperationException to
 PSInvalidOperationException because monad code looks only for PS version to
 rethrow MissingMandatoryParameter exception.

---
 src/Microsoft.PowerShell.CoreConsoleHost/ui.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs b/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs
index 05d02188d0..768a85c015 100644
--- a/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs
+++ b/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs
@@ -82,7 +82,7 @@ namespace Microsoft.PowerShell.CoreConsoleHost
             }
             else
             {
-                throw new InvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
+                throw new PSInvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
             }
         }
 
@@ -162,7 +162,7 @@ namespace Microsoft.PowerShell.CoreConsoleHost
             }
             else
             {
-                throw new InvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
+                throw new PSInvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
             }
         }
 
@@ -273,7 +273,7 @@ namespace Microsoft.PowerShell.CoreConsoleHost
             }
             else
             {
-                throw new InvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
+                throw new PSInvalidOperationException("Cannot prompt user when invoked with --noninteractive option.");
             }
         }
 

From 71ab234674011aef8f5e3a5436ed5bdda0445d79 Mon Sep 17 00:00:00 2001
From: George Fleming <v-geflem@microsoft.com>
Date: Fri, 15 Apr 2016 12:35:11 -0700
Subject: [PATCH 5/5] fix typo

---
 src/Microsoft.PowerShell.CoreConsoleHost/main.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
index d01f7a54d8..fc80add9de 100644
--- a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
+++ b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
@@ -89,7 +89,7 @@ usage: powershell[.exe] [ (--help | -h | -?) ]
                         [ (--command | -c) <string> ]
                         [ --noprofile | -nop ]
                         [ --noninteractive | -non ]
-                        [ (--encodedcommand | -e) <bas64Command> ]
+                        [ (--encodedcommand | -e) <base64Command> ]
 
 SYNOPSIS