Skip to content

[release/v7.6.5] Fix the dot-sourcing behavior of pwsh -file for advanced-function scripts #27762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Patrick Meinecke (SeeminglyScience) wants to merge 1 commit into
base: release/v7.6.5
Choose a base branch
from
+5 −1
Open

[release/v7.6.5] Fix the dot-sourcing behavior of pwsh -file for advanced-function scripts #27762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/System.Management.Automation/engine/CommandProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,9 @@ private void Init(IScriptCommandInfo scriptCommandInfo)
InitCommon();

// If the script has been dotted, throw an error if it's from a different language mode.
if (!this.UseLocalScope)
// Unless it was a script loaded through -File, in which case the danger of dotting other
// language modes (getting internal functions in the user's state) isn't a danger.
if (!this.UseLocalScope && !scriptCmdlet.ShouldRethrowExitException)
{
ValidateCompatibleLanguageMode(scriptCommandInfo.ScriptBlock, _context, Command.MyInvocation);
}
Expand Down
2 changes: 2 additions & 0 deletions src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2191,6 +2191,8 @@ internal sealed class PSScriptCmdlet : PSCmdlet, IDynamicParameters, IDisposable
private bool _exitWasCalled;
private bool _anyClauseExecuted;

internal bool ShouldRethrowExitException => _rethrowExitException;

public PSScriptCmdlet(ScriptBlock scriptBlock, bool useNewScope, bool fromScriptFile, ExecutionContext context)
{
_scriptBlock = scriptBlock;
Expand Down
Loading