@@ -266,13 +266,11 @@ private async Task ProcessTemplateGenerationResultAsync(IProjectRunSettingsFromT
266266 private async Task CollectingWithTemplateAsync ( IProjectRunSettingsFromTemplateResult generationResult , List < ICoverageProject > coverageProjectsForShim )
267267 {
268268 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 ) ;
276274 collectionStatus = MsCodeCoverageCollectionStatus . Collecting ;
277275 }
278276
@@ -369,27 +367,17 @@ public void StopCoverage()
369367
370368 #region Logging
371369 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 )
381370 {
382371 await threadHelper . JoinableTaskFactory . SwitchToMainThreadAsync ( ) ;
383- action ( ) ;
372+ logger . Log ( message ) ;
373+ reportGeneratorUtil . LogCoverageProcess ( message ) ;
384374 }
385375
386- private Task CombinedLogExceptionAsync ( Exception ex , string reason )
376+ private async Task CombinedLogExceptionAsync ( Exception ex , string reason )
387377 {
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 ) ;
393381 }
394382
395383 #endregion
0 commit comments