Make initial logging work in constrained language mode #1222
Conversation
rjmholt
changed the title
| private static object GetPSVersion() | ||
| { | ||
| #if CoreCLR | ||
| return typeof(PSObject).Assembly | ||
| .GetType("System.Management.Automation.PSVersionInfo") | ||
| .GetMethod("get_PSVersion", BindingFlags.Static | BindingFlags.Public) | ||
| .Invoke(null, Array.Empty<object>()); | ||
| #else | ||
| return typeof(PSObject).Assembly | ||
| .GetType("System.Management.Automation.PSVersionInfo", BindingFlags.Instance | BindingFlags.NonPublic) | ||
| .GetMethod("get_PSVersion", BindingFlags.Static | BindingFlags.NonPublic) | ||
| .Invoke(null, Array.Empty<object>()); | ||
| #endif | ||
| } |
There was a problem hiding this comment.
isn't this in the VersionUtils class already?
There was a problem hiding this comment.
If it is, we can't use it unfortunately, since we can't load PSES.dll at this stage.
There was a problem hiding this comment.
What about using this?
pwsh.Runspace.SessionStateProxy.PSVariable.Get(name);There was a problem hiding this comment.
So, the language mode check works, but the GetVariable API doesn't because it throws on concurrent access. At that point we'd need to spin up a new runspace to use it, which wouldn't be good for startup. But I simplified the reflection a bit at least
rjmholt
changed the title
| @@ -339,16 +341,17 @@ private string GetPSOutputEncoding() | |||
|
|
|||
| private void LogPowerShellDetails() | |||
| { | |||
| PSLanguageMode languageMode; | |||
| using (var pwsh = SMA.PowerShell.Create(SMA.RunspaceMode.CurrentRunspace)) | |||
There was a problem hiding this comment.
Curious if this is the same as [runspace]::DefaultRunspace... probably, right? Since you're getting the LanguageMode.
|
|
||
| private static object GetPSVersion() | ||
| { | ||
| using (var pwsh = SMA.PowerShell.Create()) |
There was a problem hiding this comment.
Curious if this is the same as [runspace]::DefaultRunspace... probably, right? Since you're getting PSVersionTable.
| @@ -11,6 +11,9 @@ | |||
| using System.Runtime.InteropServices; | |||
|
|
|||
| using SMA = System.Management.Automation; | |||
There was a problem hiding this comment.
Needed for the $outputencoding log
No description provided.