Skip to content
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.

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

Use ContinueWith rather than finally for coroutine result types #4669

Merged
merged 1 commit into from
Jul 25, 2024
Merged
Changes from all commits
Commits
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: 10 additions & 4 deletions src/PowerShell/CommonFiles/PowerShellCmdlet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,14 @@ internal Task RunOnMTA(Func<Task> func)
this.Write(StreamType.Verbose, "Already running on MTA");
try
{
return func();
Task result = func();
result.ContinueWith((task) => this.Complete(), TaskContinuationOptions.ExecuteSynchronously);
return result;
}
finally
catch
{
this.Complete();
throw;
}
}

Expand Down Expand Up @@ -150,11 +153,14 @@ internal Task<TResult> RunOnMTA<TResult>(Func<Task<TResult>> func)
this.Write(StreamType.Verbose, "Already running on MTA");
try
{
return func();
Task<TResult> result = func();
result.ContinueWith((task) => this.Complete(), TaskContinuationOptions.ExecuteSynchronously);
return result;
}
finally
catch
{
this.Complete();
throw;
}
}

Expand Down
Loading