Pass through joinable task factory

Author: GrahamTheCoder

CommandLine/CodeConv.Shared/CodeConvProgram.cs

@@ -14,6 +14,7 @@
 using CodeConv.Shared.Util;
 using System.Reflection;
 using System.Diagnostics;
+using Microsoft.VisualStudio.Threading;
 
 namespace ICSharpCode.CodeConverter.CommandLine
 {
@@ -134,7 +135,8 @@ private async Task ConvertAsync(IProgress<ConversionProgress> progress, Cancella
             }
 
             var properties = ParsedProperties();
-            var msbuildWorkspaceConverter = new MSBuildWorkspaceConverter(SolutionPath, CoreOnlyProjects, BestEffort, properties);
+            var joinableTaskFactory = new JoinableTaskFactory(new JoinableTaskContext());
+            var msbuildWorkspaceConverter = new MSBuildWorkspaceConverter(SolutionPath, CoreOnlyProjects, joinableTaskFactory, BestEffort, properties);
 
             var converterResultsEnumerable = msbuildWorkspaceConverter.ConvertProjectsWhereAsync(ShouldIncludeProject, TargetLanguage, progress, cancellationToken);
             await ConversionResultWriter.WriteConvertedAsync(converterResultsEnumerable, SolutionPath, outputDirectory, Force, true, strProgress, cancellationToken);

CommandLine/CodeConv.Shared/MSBuildWorkspaceConverter.cs

@@ -31,15 +31,15 @@ public sealed class MSBuildWorkspaceConverter : IDisposable
         private AsyncLazy<Solution>? _cachedSolution; //Cached for performance of tests
         private readonly bool _isNetCore;
 
-        public MSBuildWorkspaceConverter(string solutionFilePath, bool isNetCore, bool bestEffortConversion = false, Dictionary<string, string>? buildProps = null)
+        public MSBuildWorkspaceConverter(string solutionFilePath, bool isNetCore, JoinableTaskFactory joinableTaskFactory, bool bestEffortConversion = false, Dictionary<string, string>? buildProps = null)
         {
             _bestEffortConversion = bestEffortConversion;
             _buildProps = buildProps ?? new Dictionary<string, string>();
             _buildProps.TryAdd("Configuration", "Debug");
             _buildProps.TryAdd("Platform", "AnyCPU");
             _solutionFilePath = solutionFilePath;
             _isNetCore = isNetCore;
-            _workspace = new AsyncLazy<MSBuildWorkspace>(() => CreateWorkspaceAsync(_buildProps));
+            _workspace = new AsyncLazy<MSBuildWorkspace>(() => CreateWorkspaceAsync(_buildProps), joinableTaskFactory);
         }
 
         public async IAsyncEnumerable<ConversionResult> ConvertProjectsWhereAsync(Func<Project, bool> shouldConvertProject, Language? targetLanguage, IProgress<ConversionProgress> progress, [EnumeratorCancellation] CancellationToken token)

Tests/TestRunners/MultiFileTestFixture.cs

@@ -42,7 +42,7 @@ public sealed class MultiFileTestFixture : ICollectionFixture<MultiFileTestFixtu
         private static readonly string MultiFileCharacterizationDir = Path.Combine(TestConstants.GetTestDataDirectory(), "MultiFileCharacterization");
         private static readonly string OriginalSolutionDir = Path.Combine(MultiFileCharacterizationDir, "SourceFiles");
         private static readonly string SolutionFile = Path.Combine(OriginalSolutionDir, "CharacterizationTestSolution.sln");
-        private static readonly MSBuildWorkspaceConverter _msBuildWorkspaceConverter = new MSBuildWorkspaceConverter(SolutionFile, false);
+        private static readonly MSBuildWorkspaceConverter _msBuildWorkspaceConverter = new MSBuildWorkspaceConverter(SolutionFile, false, JoinableTaskFactorySingleton.EnsureInitialized());
 
         public async Task ConvertProjectsWhereAsync(Func<Project, bool> shouldConvertProject, Language targetLanguage, [CallerMemberName] string expectedResultsDirectory = "")
         {