Skip to content

Run SetInitialWorkingDirectoryAsync before LoadProfiles #2091

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
merged 1 commit into from
Oct 25, 2023
Merged

Run SetInitialWorkingDirectoryAsync before LoadProfiles #2091

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
14 changes: 7 additions & 7 deletions src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,13 @@ public async Task<bool> TryStartAsync(HostStartOptions startOptions, Cancellatio

_pipelineThread.Start();

if (startOptions.InitialWorkingDirectory is not null)
{
_logger.LogDebug($"Setting InitialWorkingDirectory to {startOptions.InitialWorkingDirectory}...");
await SetInitialWorkingDirectoryAsync(startOptions.InitialWorkingDirectory, cancellationToken).ConfigureAwait(false);
_logger.LogDebug("InitialWorkingDirectory set!");
}

if (startOptions.LoadProfiles)
{
_logger.LogDebug("Loading profiles...");
Expand All @@ -320,13 +327,6 @@ public async Task<bool> TryStartAsync(HostStartOptions startOptions, Cancellatio
_logger.LogDebug("Shell integration not enabled!");
}

if (startOptions.InitialWorkingDirectory is not null)
{
_logger.LogDebug($"Setting InitialWorkingDirectory to {startOptions.InitialWorkingDirectory}...");
await SetInitialWorkingDirectoryAsync(startOptions.InitialWorkingDirectory, cancellationToken).ConfigureAwait(false);
_logger.LogDebug("InitialWorkingDirectory set!");
}

await _started.Task.ConfigureAwait(false);
return true;
}
Expand Down