Skip to content

Use the OperationCancellationException to replace the StoppingException in 'ConvertToJson'#8920

Merged
daxian-dbw merged 2 commits intoPowerShell:masterfrom
daxian-dbw:fix
Feb 21, 2019
Merged

Use the OperationCancellationException to replace the StoppingException in 'ConvertToJson'#8920
daxian-dbw merged 2 commits intoPowerShell:masterfrom
daxian-dbw:fix

Conversation

@daxian-dbw
Copy link
Member

@daxian-dbw daxian-dbw commented Feb 20, 2019

PR Summary

  • Use the OperationCancellationException that comes with the CancellationToken to replace the StoppingException.
  • Fix the arguments passed to a resource format string. This bug has been there forever, but it seems the code path never reaches there.

PR Context

PR Checklist

@daxian-dbw daxian-dbw changed the title Fix Use the OperationCancellationException to replace the StoppingException in 'ConvertToJson' Feb 20, 2019
@iSazonov iSazonov added the CL-CodeCleanup Indicates that a PR should be marked as a Code Cleanup change in the Change Log label Feb 20, 2019
@daxian-dbw daxian-dbw merged commit 8617363 into PowerShell:master Feb 21, 2019
@daxian-dbw daxian-dbw deleted the fix branch February 21, 2019 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CL-CodeCleanup Indicates that a PR should be marked as a Code Cleanup change in the Change Log

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants