PowerShell · KirkMunro · Jul 24, 2019 · Jul 24, 2019 · Jul 24, 2019 · Jul 25, 2019
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -1,5 +1,12 @@
 # Security Vulnerabilities
 
+Security issues are treated very seriously and will, by default,
+takes precedence over other considerations including usability, performance,
+etc...  Best effort will be used to mitigate side effects of a security
+change, but PowerShell must be secure by default.
+
+## Reporting a security vulnerability
+
 If you believe that there is a security vulnerability in PowerShell,
 it **must** be reported to [secure@microsoft.com](https://technet.microsoft.com/security/ff852094.aspx) to allow for [Coordinated Vulnerability Disclosure](https://technet.microsoft.com/security/dn467923).
 **Only** file an issue, if [secure@microsoft.com](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue?rtc=1) has confirmed filing an issue is appropriate.
diff --git a/docker/InstallTarballPackage.sh b/docker/InstallTarballPackage.sh
@@ -3,24 +3,21 @@
 # Exit on errors
 set -e
 
-#
 # Example use:
 #     ./InstallTarballPackage.sh "6.0.0-beta.9" "powershell-6.0.0-beta.9-linux-x64.tar.gz"
-#
+
 usage() {
     echo "usage: $0 <powershell version> <powershell package name>"
     exit 1
 }
 
 POWERSHELL_VERSION=$1
-if [ ! "$POWERSHELL_VERSION" ]
-then
+if [ ! "$POWERSHELL_VERSION" ]; then
     usage
 fi
 
 POWERSHELL_PACKAGE=$2
-if [ ! "$POWERSHELL_PACKAGE" ]
-then
+if [ ! "$POWERSHELL_PACKAGE" ]; then
     usage
 fi
 
@@ -37,7 +34,7 @@ tar zxf /tmp/powershell.tar.gz -C /opt/microsoft/powershell/$POWERSHELL_VERSION
 # Create the symbolic link that points to powershell
 ln -s /opt/microsoft/powershell/$POWERSHELL_VERSION/pwsh $POWERSHELL_LINKFILE
 # Add the symbolic link path to /etc/shells
-if [ ! -f /etc/shells ] ; then
+if [ ! -f /etc/shells ]; then
     echo $POWERSHELL_LINKFILE > /etc/shells ;
 else
     grep -q "^${POWERSHELL_LINKFILE}$" /etc/shells || echo $POWERSHELL_LINKFILE >> /etc/shells ;

diff --git a/docker/tests/README.md b/docker/tests/README.md
@@ -10,7 +10,7 @@ The tests must be run separately on the Windows and Linux docker daemons. You ca
 Invoke-Pester
 ```
 
-Note: be sure to do this using both the Windows and Linux docker daemon, as the windows.
+Note: be sure to do this using both the Windows and Linux docker daemon.
 
 ## To test the productions containers
 

diff --git a/docker/tests/Templates/centos7/Dockerfile b/docker/tests/Templates/centos7/Dockerfile
@@ -17,7 +17,7 @@ ENV LANG en_US.UTF-8
 ENV LC_ALL $LANG
 RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
 
-RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
-RUN yum install -y $PACKAGENAME
+RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME \
+    && yum install -y $PACKAGENAME
 RUN $TESTDOWNLOADCOMMAND
 RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
diff --git a/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile b/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile
@@ -23,8 +23,8 @@ RUN locale-gen $LANG && update-locale
 
 # Install PowerShell package
 ADD $PACKAGELOCATION/$PACKAGENAME .
-RUN mkdir -p /opt/microsoft/powershell
-RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+RUN mkdir -p /opt/microsoft/powershell \
+    && tar zxf $PACKAGENAME -C /opt/microsoft/powershell
 
 # Download and run tests
 RUN $TESTDOWNLOADCOMMAND

diff --git a/docker/tests/Templates/fxdependent-fedora28/Dockerfile b/docker/tests/Templates/fxdependent-fedora28/Dockerfile
@@ -30,8 +30,8 @@ RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
 
 # Install PowerShell package
 ADD $PACKAGELOCATION/$PACKAGENAME .
-RUN mkdir -p /opt/microsoft/powershell
-RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+RUN mkdir -p /opt/microsoft/powershell \
+    && tar zxf $PACKAGENAME -C /opt/microsoft/powershell
 
 # Download and run tests
 RUN $TESTDOWNLOADCOMMAND

diff --git a/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile b/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile
@@ -31,8 +31,8 @@ RUN locale-gen $LANG && update-locale
 
 # Install PowerShell package
 ADD $PACKAGELOCATION/$PACKAGENAME .
-RUN mkdir -p /opt/microsoft/powershell
-RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+RUN mkdir -p /opt/microsoft/powershell \
+    && tar zxf $PACKAGENAME -C /opt/microsoft/powershell
 
 # Download and run tests
 RUN $TESTDOWNLOADCOMMAND

diff --git a/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile b/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile
@@ -23,8 +23,8 @@ RUN locale-gen $LANG && update-locale
 
 # Install PowerShell package
 ADD $PACKAGELOCATION/$PACKAGENAME .
-RUN mkdir -p /opt/microsoft/powershell
-RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+RUN mkdir -p /opt/microsoft/powershell \
+    && tar zxf $PACKAGENAME -C /opt/microsoft/powershell
 
 # Download and run tests
 RUN $TESTDOWNLOADCOMMAND

diff --git a/docker/tests/containerTestCommon.psm1 b/docker/tests/containerTestCommon.psm1
@@ -75,7 +75,6 @@ function Get-LinuxContainer
             Path = "$psscriptroot/../release/$os"
         }
     }
-
 }
 
 # Return a list of Windows Container Test Cases
@@ -130,7 +129,7 @@ function Test-SkipLinux
             return $true
         }
         default {
-            throw "Unknow docker os '$os'"
+            throw "Unknown docker os '$os'"
         }
     }
 }

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -1023,11 +1023,12 @@ bool IHostProvidesTelemetryData.HostIsInteractive
         double IHostProvidesTelemetryData.ReadyForInputTimeInMS { get { return _readyForInputTimeInMS; } }
 
         int IHostProvidesTelemetryData.InteractiveCommandCount { get { return _interactiveCommandCount; } }
-#endif
 
-        private double _profileLoadTimeInMS;
         private double _readyForInputTimeInMS;
         private int _interactiveCommandCount;
+#endif
+
+        private double _profileLoadTimeInMS;
 
         #endregion overrides
 
@@ -1602,8 +1603,10 @@ private void DoCreateRunspace(string initialCommand, bool skipProfiles, bool sta
                                                    PSTask.PowershellConsoleStartup, PSKeyword.UseAlwaysOperational);
             }
 
+#if LEGACYTELEMETRY
             // Record how long it took from process start to runspace open for telemetry.
             _readyForInputTimeInMS = (DateTime.Now - Process.GetCurrentProcess().StartTime).TotalMilliseconds;
+#endif
 
             DoRunspaceInitialization(skipProfiles, initialCommand, configurationName, initialCommandArgs);
         }
@@ -2517,8 +2520,10 @@ e is RemoteException ||
                                 }
                             }
 
+#if LEGACYTELEMETRY
                             if (!inBlockMode)
                                 s_theConsoleHost._interactiveCommandCount += 1;
+#endif
                         }
                     }
                     // NTRAID#Windows Out Of Band Releases-915506-2005/09/09

diff --git a/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs b/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs
@@ -152,11 +152,6 @@ internal object Transform(EngineIntrinsics engineIntrinsics, object inputData, b
                         if (_convertTypes[i] == typeof(ActionPreference))
                         {
                             ActionPreference resultPreference = (ActionPreference)result;
-
-                            if (resultPreference == ActionPreference.Suspend)
-                            {
-                                throw new PSInvalidCastException("InvalidActionPreference", null, ErrorPackage.UnsupportedPreferenceVariable, resultPreference);
-                            }
                         }
                     }
                 }

diff --git a/src/System.Management.Automation/engine/CommandBase.cs b/src/System.Management.Automation/engine/CommandBase.cs
@@ -286,8 +286,6 @@ public enum ActionPreference
         Inquire,
         /// <summary>Ignore the event completely (not even logging it to the target stream)</summary>
         Ignore,
-        /// <summary>Suspend the command for further diagnosis. Supported only for workflows.</summary>
-        Suspend,
     }
     #endregion ActionPreference
 

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -207,7 +207,7 @@ List<CompletionResult> ExecuteGetCommandCommand(bool useModulePrefix)
         }
 
         private static readonly HashSet<string> s_keywordsToExcludeFromAddingAmpersand
-            = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { TokenKind.InlineScript.ToString(), TokenKind.Configuration.ToString() };
+            = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { TokenKind.Configuration.ToString() };
         internal static CompletionResult GetCommandNameCompletionResult(string name, object command, bool addAmpersandIfNecessary, string quote)
         {
             string syntax = name, listItem = name;

diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -580,7 +580,7 @@ internal T GetEnumPreference<T>(VariablePath preferenceVariablePath, T defaultPr
                 if (val is ActionPreference)
                 {
                     ActionPreference preference = (ActionPreference)val;
-                    if ((preference == ActionPreference.Ignore) || (preference == ActionPreference.Suspend))
+                    if (preference == ActionPreference.Ignore)
                     {
                         // Reset the variable value
                         EngineSessionState.SetVariableValue(preferenceVariablePath.UserPath, defaultPref);

diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -559,7 +559,6 @@ public static IEnumerator GetEnumerator(object obj)
 
         /// <summary>
         /// This method takes a an arbitrary object and wraps it in a PSDataCollection of PSObject.
-        /// This simplifies interacting with the PowerShell workflow activities.
         /// </summary>
         /// <param name="inputValue"></param>
         /// <returns></returns>
@@ -1771,7 +1770,7 @@ public static object ConvertPSObjectToType(PSObject valueToConvert, Type resultT
         }
 
         /// <summary>
-        /// Generic convertto that simplifies working with workflow.
+        /// Generic conversion method.
         /// </summary>
         /// <typeparam name="T">The type of object to return</typeparam>
         /// <param name="valueToConvert"></param>

diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -3037,11 +3037,6 @@ internal ActionPreference WarningPreference
 
             set
             {
-                if (value == ActionPreference.Suspend)
-                {
-                    throw PSTraceSource.NewNotSupportedException(ErrorPackage.SuspendActionPreferenceErrorActionOnly);
-                }
-
                 _warningPreference = value;
                 IsWarningActionSet = true;
             }
@@ -3207,11 +3202,6 @@ internal ActionPreference ErrorAction
 
             set
             {
-                if (value == ActionPreference.Suspend)
-                {
-                    throw PSTraceSource.NewNotSupportedException(ErrorPackage.SuspendActionPreferenceSupportedOnlyOnWorkflow);
-                }
-
                 _errorAction = value;
                 IsErrorActionSet = true;
             }
@@ -3274,11 +3264,6 @@ internal ActionPreference InformationPreference
 
             set
             {
-                if (value == ActionPreference.Suspend)
-                {
-                    throw PSTraceSource.NewNotSupportedException(ErrorPackage.SuspendActionPreferenceErrorActionOnly);
-                }
-
                 _informationPreference = value;
                 IsInformationActionSet = true;
             }

diff --git a/src/System.Management.Automation/engine/SessionStateStrings.cs b/src/System.Management.Automation/engine/SessionStateStrings.cs
@@ -116,12 +116,12 @@ internal static class StringLiterals
         internal const string PowerShellDataFileExtension = ".psd1";
 
         /// <summary>
-        /// The file extension (including the dot) of an workflow dependent assembly.
+        /// The file extension (including the dot) of a binary module.
         /// </summary>
         internal const string PowerShellILAssemblyExtension = ".dll";
 
         /// <summary>
-        /// The file extension (including the dot) of an workflow dependent Ngen assembly.
+        /// The file extension (including the dot) of a binary module Ngen assembly.
         /// </summary>
         internal const string PowerShellNgenAssemblyExtension = ".ni.dll";