Revert "Add -StrictMode to Invoke-Command to allow specifying strict mode when invoking command locally" (#18040)

SteveL-MSFT · web-flow · commit 944ed5413d56 · 2022-09-12T11:41:57.000-07:00
diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
@@ -2,6 +2,5 @@
   "PSCommandNotFoundSuggestion",
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandErrorActionPreference",
-  "PSStrictModeAssignment",
   "PSSubsystemPluginModel"
 ]
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
@@ -2,6 +2,5 @@
   "PSCommandNotFoundSuggestion",
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandErrorActionPreference",
-  "PSStrictModeAssignment",
   "PSSubsystemPluginModel"
 ]
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -22,7 +22,6 @@ public class ExperimentalFeature
 
         internal const string EngineSource = "PSEngine";
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
-        internal const string PSStrictModeAssignment = "PSStrictModeAssignment";
 
         #endregion
 
@@ -117,9 +116,6 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: PSNativeCommandErrorActionPreferenceFeatureName,
                     description: "Native commands with non-zero exit codes issue errors according to $ErrorActionPreference when $PSNativeCommandUseErrorActionPreference is $true"),
-                new ExperimentalFeature(
-                    name: PSStrictModeAssignment,
-                    description: "Add support of setting Strict-Mode with Invoke-Command"),
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
@@ -263,72 +263,6 @@ public override SwitchParameter UseSSL
             }
         }
 
-        private sealed class ArgumentToPSVersionTransformationAttribute : ArgumentToVersionTransformationAttribute
-        {
-            protected override bool TryConvertFromString(string versionString, [NotNullWhen(true)] out Version version)
-            {
-                if (string.Equals("off", versionString, StringComparison.OrdinalIgnoreCase))
-                {
-                    version = new Version(0, 0);
-                    return true;
-                }
-
-                if (string.Equals("latest", versionString, StringComparison.OrdinalIgnoreCase))
-                {
-                    version = PSVersionInfo.PSVersion;
-                    return true;
-                }
-
-                return base.TryConvertFromString(versionString, out version);
-            }
-        }
-
-        private static readonly Version s_OffVersion = new Version(0, 0);
-
-        private sealed class ValidateVersionAttribute : ValidateArgumentsAttribute
-        {
-            protected override void Validate(object arguments, EngineIntrinsics engineIntrinsics)
-            {
-                Version version = arguments as Version;
-                if (version == s_OffVersion)
-                {
-                    return;
-                }
-
-                if (version == null || !PSVersionInfo.IsValidPSVersion(version))
-                {
-                    // No conversion succeeded so throw an exception...
-                    throw new ValidationMetadataException(
-                        "InvalidPSVersion",
-                        null,
-                        Metadata.ValidateVersionFailure,
-                        arguments);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets strict mode.
-        /// </summary>
-        [Experimental(ExperimentalFeature.PSStrictModeAssignment, ExperimentAction.Show)]
-        [Parameter(ParameterSetName = InvokeCommandCommand.InProcParameterSet)]
-        [ArgumentToPSVersionTransformation]
-        [ValidateVersion]
-        public Version StrictMode
-        {
-            get
-            {
-                return _strictmodeversion;
-            }
-
-            set
-            {
-                _strictmodeversion = value;
-            }
-        }
-
-        private Version _strictmodeversion = null;
-
         /// <summary>
         /// For WSMan session:
         /// If this parameter is not specified then the value specified in
@@ -908,8 +842,6 @@ public virtual SwitchParameter RemoteDebug
 
         #endregion
 
-        private Version _savedStrictModeVersion;
-
         #endregion Parameters
 
         #region Overrides
@@ -1033,12 +965,6 @@ protected override void BeginProcessing()
                     }
                 }
 
-                if (_strictmodeversion != null)
-                {
-                    _savedStrictModeVersion = Context.EngineSessionState.CurrentScope.StrictModeVersion;
-                    Context.EngineSessionState.CurrentScope.StrictModeVersion = _strictmodeversion;
-                }
-
                 return;
             }
 
@@ -1255,19 +1181,7 @@ protected override void ProcessRecord()
                 }
                 else if (ParameterSetName.Equals(InvokeCommandCommand.InProcParameterSet) && (_steppablePipeline != null))
                 {
-                    try
-                    {
-                        _steppablePipeline.Process(InputObject);
-                    }
-                    catch
-                    {
-                        if (_strictmodeversion != null)
-                        {
-                            Context.EngineSessionState.CurrentScope.StrictModeVersion = _savedStrictModeVersion;
-                        }
-                        
-                        throw;
-                    }
+                    _steppablePipeline.Process(InputObject);
                 }
                 else
                 {
@@ -1298,30 +1212,20 @@ protected override void EndProcessing()
             {
                 if (ParameterSetName.Equals(InvokeCommandCommand.InProcParameterSet))
                 {
-                    try
-                    {   
-                        if (_steppablePipeline != null)
-                        {
-                            _steppablePipeline.End();
-                        }
-                        else
-                        {
-                            ScriptBlock.InvokeUsingCmdlet(
-                                contextCmdlet: this,
-                                useLocalScope: !NoNewScope,
-                                errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
-                                dollarUnder: AutomationNull.Value,
-                                input: _input,
-                                scriptThis: AutomationNull.Value,
-                                args: ArgumentList);
-                        }
+                    if (_steppablePipeline != null)
+                    {
+                        _steppablePipeline.End();
                     }
-                    finally
+                    else
                     {
-                        if (_strictmodeversion != null)
-                        {
-                            Context.EngineSessionState.CurrentScope.StrictModeVersion = _savedStrictModeVersion;
-                        }
+                        ScriptBlock.InvokeUsingCmdlet(
+                            contextCmdlet: this,
+                            useLocalScope: !NoNewScope,
+                            errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
+                            dollarUnder: AutomationNull.Value,
+                            input: _input,
+                            scriptThis: AutomationNull.Value,
+                            args: ArgumentList);
                     }
                 }
                 else
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@`
`2`	`2`	`"PSCommandNotFoundSuggestion",`
`3`	`3`	`"PSLoadAssemblyFromNativeCode",`
`4`	`4`	`"PSNativeCommandErrorActionPreference",`
`5`		`- "PSStrictModeAssignment",`
`6`	`5`	`"PSSubsystemPluginModel"`
`7`	`6`	`]`