Skip to content

Fix detection of Windows PS vs PS Core resolving module directory issues #1974

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
Borgquite wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −3
Open

Fix detection of Windows PS vs PS Core resolving module directory issues #1974

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
5 changes: 2 additions & 3 deletions src/code/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,15 +1161,14 @@ private static string GetHomeOrCreateTempHome()
return s_tempHome;
}

private readonly static Version PSVersion6 = new Version(6, 0);
private static void GetStandardPlatformPaths(
PSCmdlet psCmdlet,
out string localUserDir,
out string allUsersDir)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
string powerShellType = (psCmdlet.Host.Version >= PSVersion6) ? "PowerShell" : "WindowsPowerShell";
string powerShellType = ((psCmdlet.GetVariableValue("PSEdition") as string) == "Core") ? "PowerShell" : "WindowsPowerShell";
localUserDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), powerShellType);
allUsersDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), powerShellType);
}
Expand All @@ -1189,7 +1188,7 @@ private static void GetStandardPlatformPaths(

public static bool GetIsWindowsPowerShell(PSCmdlet psCmdlet)
{
return psCmdlet.Host.Version < PSVersion6;
return ((psCmdlet.GetVariableValue("PSEdition") as string) != "Core");
}

/// <summary>
Expand Down