@@ -266,13 +266,11 @@ private async Task ProcessTemplateGenerationResultAsync(IProjectRunSettingsFromT
266
266
private async Task CollectingWithTemplateAsync ( IProjectRunSettingsFromTemplateResult generationResult , List < ICoverageProject > coverageProjectsForShim )
267
267
{
268
268
coverageProjectsForShim . AddRange ( generationResult . CoverageProjectsWithFCCMsTestAdapter ) ;
269
- await CombinedLogAsync ( ( ) =>
270
- {
271
- var leadingMessage = generationResult . CustomTemplatePaths . Any ( ) ? $ "{ msCodeCoverageMessage } - custom template paths" : msCodeCoverageMessage ;
272
- var loggerMessages = new List < string > { leadingMessage } . Concat ( generationResult . CustomTemplatePaths . Distinct ( ) ) ;
273
- logger . Log ( loggerMessages ) ;
274
- reportGeneratorUtil . LogCoverageProcess ( msCodeCoverageMessage ) ;
275
- } ) ;
269
+ await threadHelper . JoinableTaskFactory . SwitchToMainThreadAsync ( ) ;
270
+ var leadingMessage = generationResult . CustomTemplatePaths . Any ( ) ? $ "{ msCodeCoverageMessage } - custom template paths" : msCodeCoverageMessage ;
271
+ var loggerMessages = new List < string > { leadingMessage } . Concat ( generationResult . CustomTemplatePaths . Distinct ( ) ) ;
272
+ logger . Log ( loggerMessages ) ;
273
+ reportGeneratorUtil . LogCoverageProcess ( msCodeCoverageMessage ) ;
276
274
collectionStatus = MsCodeCoverageCollectionStatus . Collecting ;
277
275
}
278
276
@@ -369,27 +367,17 @@ public void StopCoverage()
369
367
370
368
#region Logging
371
369
private async Task CombinedLogAsync ( string message )
372
- {
373
- await CombinedLogAsync ( ( ) =>
374
- {
375
- logger . Log ( message ) ;
376
- reportGeneratorUtil . LogCoverageProcess ( message ) ;
377
- } ) ;
378
- }
379
-
380
- private async Task CombinedLogAsync ( Action action )
381
370
{
382
371
await threadHelper . JoinableTaskFactory . SwitchToMainThreadAsync ( ) ;
383
- action ( ) ;
372
+ logger . Log ( message ) ;
373
+ reportGeneratorUtil . LogCoverageProcess ( message ) ;
384
374
}
385
375
386
- private Task CombinedLogExceptionAsync ( Exception ex , string reason )
376
+ private async Task CombinedLogExceptionAsync ( Exception ex , string reason )
387
377
{
388
- return CombinedLogAsync ( ( ) =>
389
- {
390
- logger . Log ( reason , ex . ToString ( ) ) ;
391
- reportGeneratorUtil . LogCoverageProcess ( reason ) ;
392
- } ) ;
378
+ await threadHelper . JoinableTaskFactory . SwitchToMainThreadAsync ( ) ;
379
+ logger . Log ( reason , ex . ToString ( ) ) ;
380
+ reportGeneratorUtil . LogCoverageProcess ( reason ) ;
393
381
}
394
382
395
383
#endregion
0 commit comments