Skip to content

If SMA.dll location is not found, use host exe to determine $PSHOME location #24072

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

Merged
daxian-dbw merged 10 commits into from
Aug 19, 2024
Merged

If SMA.dll location is not found, use host exe to determine $PSHOME location #24072

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4557c9f
Change getting PowerShell base directory to exe host directory instea…
SteveL-MSFT Jul 22, 2024
909d85b
fallback to SMA.dll location if host is null
SteveL-MSFT Jul 22, 2024
357c18f
fix get-process test
Jul 22, 2024
0f45224
change check of basedirectory
Jul 22, 2024
611c9c1
remove trailing separator
Jul 22, 2024
f2caa31
revert change to get-process tests
Jul 22, 2024
39ed644
only trim end
SteveL-MSFT Jul 23, 2024
058fbc5
change to try SMA.dll first
Aug 13, 2024
f7b4880
Update src/System.Management.Automation/engine/Utils.cs
daxian-dbw Aug 19, 2024
91cfe5d
Update src/System.Management.Automation/engine/Utils.cs
daxian-dbw Aug 19, 2024
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
17 changes: 12 additions & 5 deletions src/System.Management.Automation/engine/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,16 @@ internal static string GetWindowsPowerShellVersionFromRegistry()

internal static string GetApplicationBase(string shellId)
{
// Use the location of SMA.dll as the application base.
Assembly assembly = typeof(PSObject).Assembly;
return Path.GetDirectoryName(assembly.Location);
// Use the location of SMA.dll as the application base if it exists,
// otherwise, use the base directory from `AppContext`.
var baseDirectory = Path.GetDirectoryName(typeof(PSObject).Assembly.Location);
if (string.IsNullOrEmpty(baseDirectory))
{
// Need to remove any trailing directory separator characters
baseDirectory = AppContext.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar);
}

return baseDirectory;
}

private static string[] s_productFolderDirectories;
Expand Down Expand Up @@ -1536,8 +1543,8 @@ internal static bool IsSessionRestricted(ExecutionContext context)
// if import-module is visible, then the session is not restricted,
// because the user can load arbitrary code.
if (cmdletInfo != null && cmdletInfo.Visibility == SessionStateEntryVisibility.Public)
{
return false;
{
return false;
}
return true;
}
Expand Down