Merge TFS 2064268: ConstrainedLanguage PowerShell should not block nested cmdlet invocation via runspace (#2159)

PaulHigin · daxian-dbw · commit fe1f035d44c6 · 2016-09-01T17:21:54.000-07:00
* Merge TFS 2064268: Under UMCI PowerShell should not block nested cmdlet invocation via runspace

* Update SessionState.cs

Fixed ExecutionContext property name error.
diff --git a/src/System.Management.Automation/engine/AutomationEngine.cs b/src/System.Management.Automation/engine/AutomationEngine.cs
@@ -93,8 +93,6 @@ internal AutomationEngine(PSHost hostInterface, RunspaceConfiguration runspaceCo
             }
 
             InitialSessionState.SetSessionStateDrive(Context, true);
-
-            InitialSessionState.CreateQuestionVariable(Context);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/SessionState.cs b/src/System.Management.Automation/engine/SessionState.cs
@@ -351,6 +351,10 @@ internal void InitializeFixedVariables()
             v = new PSUICultureVariable();
             this.GlobalScope.SetVariable(v.Name, v, false, true, this, CommandOrigin.Internal, fastPath: true);
 
+            // $?
+            v = new QuestionMarkVariable(this.ExecutionContext);
+            this.GlobalScope.SetVariableForce(v, this);
+
             // $ShellId - if there is no runspace config, use the default string
             string shellId = ExecutionContext.ShellID;
 
@@ -648,4 +652,4 @@ internal ProviderInvocationException NewProviderInvocationException(
         }
         #endregion Errors
     } // SessionStateInternal class
-}
+}
diff --git a/src/System.Management.Automation/engine/SessionStateScope.cs b/src/System.Management.Automation/engine/SessionStateScope.cs
@@ -629,6 +629,24 @@ internal PSVariable SetVariable(string name, object value, bool asValue, bool fo
             return variable;
         } // SetVariable
 
+        /// <summary>
+        /// Sets a variable to scope without any checks.
+        /// This is intended to be used only for global scope.
+        /// </summary>
+        /// <param name="variableToSet">PSVariable to set</param>
+        /// <param name="sessionState">SessionState for variable</param>
+        /// <returns></returns>
+        internal void SetVariableForce(PSVariable variableToSet, SessionStateInternal sessionState)
+        {
+            if (Parent != null)
+            {
+                throw new NotImplementedException("SetVariableForce");
+            }
+
+            variableToSet.SessionState = sessionState;
+            GetPrivateVariables()[variableToSet.Name] = variableToSet;
+        }
+
         /// <summary>
         /// Sets a variable to the given value.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,6 @@ internal AutomationEngine(PSHost hostInterface, RunspaceConfiguration runspaceCo`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`InitialSessionState.SetSessionStateDrive(Context, true);`
`96`		`-`
`97`		`- InitialSessionState.CreateQuestionVariable(Context);`
`98`	`96`	`}`
`99`	`97`
`100`	`98`	`/// <summary>`