Expose async entrypoint for IWorkspaceProjectContextFactory

src/VisualStudio/CSharp/Test/ProjectSystemShim/CPS/AdditionalPropertiesTests.cs

@@ -5,6 +5,7 @@
 #nullable disable
 
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.VisualStudio;
@@ -22,10 +23,10 @@ public class AdditionalPropertiesTests
     {
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void SetProperty_RootNamespace_CPS()
+        public async Task SetProperty_RootNamespace_CPS()
         {
             using (var environment = new TestEnvironment())
-            using (var project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test"))
+            using (var project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test"))
             {
                 Assert.Null(DefaultNamespaceOfSingleProject(environment));
 
@@ -47,12 +48,12 @@ static string DefaultNamespaceOfSingleProject(TestEnvironment environment)
         [InlineData(LanguageVersion.LatestMajor)]
         [InlineData(LanguageVersion.Preview)]
         [InlineData(null)]
-        public void SetProperty_MaxSupportedLangVersion_CPS(LanguageVersion? maxSupportedLangVersion)
+        public async Task SetProperty_MaxSupportedLangVersion_CPS(LanguageVersion? maxSupportedLangVersion)
         {
             const LanguageVersion attemptedVersion = LanguageVersion.CSharp8;
 
             using (var environment = new TestEnvironment(typeof(CSharpParseOptionsChangingService)))
-            using (var cpsProject = CSharpHelpers.CreateCSharpCPSProject(environment, "Test"))
+            using (var cpsProject = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test"))
             {
                 var project = environment.Workspace.CurrentSolution.Projects.Single();
                 var oldParseOptions = (CSharpParseOptions)project.ParseOptions;
@@ -76,12 +77,12 @@ public void SetProperty_MaxSupportedLangVersion_CPS(LanguageVersion? maxSupporte
         }
 
         [WpfFact]
-        public void SetProperty_MaxSupportedLangVersion_CPS_NotSet()
+        public async Task SetProperty_MaxSupportedLangVersion_CPS_NotSet()
         {
             const LanguageVersion attemptedVersion = LanguageVersion.CSharp8;
 
             using (var environment = new TestEnvironment(typeof(CSharpParseOptionsChangingService)))
-            using (var cpsProject = CSharpHelpers.CreateCSharpCPSProject(environment, "Test"))
+            using (var cpsProject = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test"))
             {
                 var project = environment.Workspace.CurrentSolution.Projects.Single();
                 var oldParseOptions = (CSharpParseOptions)project.ParseOptions;
@@ -119,16 +120,16 @@ public void SetProperty_MaxSupportedLangVersion_CPS_NotSet()
         [InlineData("FALSE", "", false)]
         // Invalid values ignored
         [InlineData("Invalid", "INVALID", true)]
-        public void SetProperty_RunAnalyzersAndRunAnalyzersDuringLiveAnalysis(string runAnalyzers, string runAnalyzersDuringLiveAnalysis, bool expectedRunAnalyzers)
+        public async Task SetProperty_RunAnalyzersAndRunAnalyzersDuringLiveAnalysis(string runAnalyzers, string runAnalyzersDuringLiveAnalysis, bool expectedRunAnalyzers)
         {
-            TestCPSProject();
+            await TestCPSProject();
             TestLegacyProject();
             return;
 
-            void TestCPSProject()
+            async Task TestCPSProject()
             {
                 using var environment = new TestEnvironment();
-                using var cpsProject = CSharpHelpers.CreateCSharpCPSProject(environment, "Test");
+                using var cpsProject = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test");
 
                 cpsProject.SetProperty(AdditionalPropertyNames.RunAnalyzers, runAnalyzers);
                 cpsProject.SetProperty(AdditionalPropertyNames.RunAnalyzersDuringLiveAnalysis, runAnalyzersDuringLiveAnalysis);

src/VisualStudio/CSharp/Test/ProjectSystemShim/CPS/AnalyzersTests.cs

@@ -6,6 +6,7 @@
 
 using System.Collections.Immutable;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Test.Utilities;
@@ -20,7 +21,7 @@ public class AnalyzersTests : TestBase
     {
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void RuleSet_GeneralOption_CPS()
+        public async Task RuleSet_GeneralOption_CPS()
         {
             var ruleSetFile = Temp.CreateFile().WriteAllText(
 @"<?xml version=""1.0"" encoding=""utf-8""?>
@@ -29,7 +30,7 @@ public void RuleSet_GeneralOption_CPS()
 </RuleSet>
 ");
             using var environment = new TestEnvironment();
-            using var project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test");
+            using var project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test");
             var workspaceProject = environment.Workspace.CurrentSolution.Projects.Single();
             var options = (CSharpCompilationOptions)workspaceProject.CompilationOptions;
 
@@ -45,7 +46,7 @@ public void RuleSet_GeneralOption_CPS()
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void RuleSet_SpecificOptions_CPS()
+        public async Task RuleSet_SpecificOptions_CPS()
         {
             var ruleSetFile = Temp.CreateFile().WriteAllText(
 @"<?xml version=""1.0"" encoding=""utf-8""?>
@@ -58,7 +59,7 @@ public void RuleSet_SpecificOptions_CPS()
 ");
 
             using var environment = new TestEnvironment();
-            using var project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test");
+            using var project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test");
             // Verify SetRuleSetFile updates the ruleset.
             project.SetOptions(ImmutableArray.Create($"/ruleset:{ruleSetFile.Path}"));
 
@@ -70,13 +71,13 @@ public void RuleSet_SpecificOptions_CPS()
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void RuleSet_PathCanBeFound()
+        public async Task RuleSet_PathCanBeFound()
         {
             var ruleSetFile = Temp.CreateFile();
             using var environment = new TestEnvironment();
             ProjectId projectId;
 
-            using (var project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test"))
+            using (var project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test"))
             {
                 project.SetOptions(ImmutableArray.Create($"/ruleset:{ruleSetFile.Path}"));
 

src/VisualStudio/CSharp/Test/ProjectSystemShim/CPS/CSharpCompilerOptionsTests.cs

@@ -8,6 +8,7 @@
 using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.VisualStudio.LanguageServices.ProjectSystem;
@@ -23,30 +24,30 @@ public class CSharpCompilerOptionsTests : TestBase
     {
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void DocumentationModeSetToDiagnoseIfProducingDocFile_CPS()
+        public async Task DocumentationModeSetToDiagnoseIfProducingDocFile_CPS()
         {
             using var environment = new TestEnvironment();
-            using var project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test", commandLineArguments: @"/doc:DocFile.xml");
+            using var project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test", commandLineArguments: @"/doc:DocFile.xml");
             var parseOptions = environment.Workspace.CurrentSolution.Projects.Single().ParseOptions;
             Assert.Equal(DocumentationMode.Diagnose, parseOptions.DocumentationMode);
         }
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void DocumentationModeSetToParseIfNotProducingDocFile_CPS()
+        public async Task DocumentationModeSetToParseIfNotProducingDocFile_CPS()
         {
             using var environment = new TestEnvironment();
-            using var project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test", commandLineArguments: @"/doc:");
+            using var project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test", commandLineArguments: @"/doc:");
             var parseOptions = environment.Workspace.CurrentSolution.Projects.Single().ParseOptions;
             Assert.Equal(DocumentationMode.Parse, parseOptions.DocumentationMode);
         }
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void ProjectSettingsOptionAddAndRemove_CPS()
+        public async Task ProjectSettingsOptionAddAndRemove_CPS()
         {
             using var environment = new TestEnvironment();
-            using var project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test", commandLineArguments: @"/warnaserror:CS1111");
+            using var project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test", commandLineArguments: @"/warnaserror:CS1111");
             var options = environment.GetUpdatedCompilationOptionOfSingleProject();
             Assert.Equal(expected: ReportDiagnostic.Error, actual: options.SpecificDiagnosticOptions["CS1111"]);
 
@@ -57,13 +58,13 @@ public void ProjectSettingsOptionAddAndRemove_CPS()
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void ProjectOutputBinPathChange_CPS()
+        public async Task ProjectOutputBinPathChange_CPS()
         {
             var initialObjPath = @"C:\test.dll";
             var initialBinPath = initialObjPath;
 
             using var environment = new TestEnvironment();
-            using var project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test", commandLineArguments: $"/out:{initialObjPath}");
+            using var project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test", commandLineArguments: $"/out:{initialObjPath}");
             Assert.Equal(initialObjPath, project.CompilationOutputAssemblyFilePath);
             Assert.Equal(initialBinPath, project.BinOutputPath);
 
@@ -101,42 +102,42 @@ public void ProjectOutputBinPathChange_CPS()
 
         [WpfFact, WorkItem(14520, "https://github.com/dotnet/roslyn/issues/14520")]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void InvalidProjectOutputBinPaths_CPS1()
+        public async Task InvalidProjectOutputBinPaths_CPS1()
         {
             using var environment = new TestEnvironment();
-            using var project1 = CSharpHelpers.CreateCSharpCPSProject(environment, "Test", binOutputPath: null);
+            using var project1 = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test", binOutputPath: null);
             // Null output path is allowed.
             Assert.Null(project1.BinOutputPath);
         }
 
         [WpfFact, WorkItem(14520, "https://github.com/dotnet/roslyn/issues/14520")]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void InvalidProjectOutputBinPaths_CPS2()
+        public async Task InvalidProjectOutputBinPaths_CPS2()
         {
             using var environment = new TestEnvironment();
-            using var project2 = CSharpHelpers.CreateCSharpCPSProject(environment, "Test2", binOutputPath: String.Empty);
+            using var project2 = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test2", binOutputPath: String.Empty);
             // Empty output path is not allowed, it gets reset to null.
             Assert.Null(project2.BinOutputPath);
         }
 
         [WpfFact, WorkItem(14520, "https://github.com/dotnet/roslyn/issues/14520")]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void InvalidProjectOutputBinPaths_CPS3()
+        public async Task InvalidProjectOutputBinPaths_CPS3()
         {
             using var environment = new TestEnvironment();
-            using var project3 = CSharpHelpers.CreateCSharpCPSProject(environment, "Test3", binOutputPath: "Test.dll");
+            using var project3 = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test3", binOutputPath: "Test.dll");
             // Non-rooted output path is not allowed, it gets reset to a temp rooted path.
             Assert.Equal(Path.Combine(Path.GetTempPath(), "Test.dll"), project3.BinOutputPath);
         }
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void ProjectGuidSetter_CPS()
+        public async Task ProjectGuidSetter_CPS()
         {
             var initialGuid = Guid.NewGuid();
 
             using var environment = new TestEnvironment();
-            using IWorkspaceProjectContext projectContext = CSharpHelpers.CreateCSharpCPSProject(environment, "Test", initialGuid);
+            using IWorkspaceProjectContext projectContext = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test", initialGuid);
             Assert.Equal(initialGuid, projectContext.Guid);
 
             var newGuid = Guid.NewGuid();
@@ -146,10 +147,10 @@ public void ProjectGuidSetter_CPS()
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void ProjectLastDesignTimeBuildSucceededSetter_CPS()
+        public async Task ProjectLastDesignTimeBuildSucceededSetter_CPS()
         {
             using var environment = new TestEnvironment();
-            using IWorkspaceProjectContext projectContext = CSharpHelpers.CreateCSharpCPSProject(environment, "Test");
+            using IWorkspaceProjectContext projectContext = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test");
             Assert.True(projectContext.LastDesignTimeBuildSucceeded);
 
             projectContext.LastDesignTimeBuildSucceeded = false;
@@ -158,10 +159,10 @@ public void ProjectLastDesignTimeBuildSucceededSetter_CPS()
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void ProjectDisplayNameSetter_CPS()
+        public async Task ProjectDisplayNameSetter_CPS()
         {
             using var environment = new TestEnvironment();
-            using IWorkspaceProjectContext project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test");
+            using IWorkspaceProjectContext project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test");
             Assert.Equal("Test", project.DisplayName);
             var initialProjectFilePath = project.ProjectFilePath;
 
@@ -174,10 +175,10 @@ public void ProjectDisplayNameSetter_CPS()
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void ProjectFilePathSetter_CPS()
+        public async Task ProjectFilePathSetter_CPS()
         {
             using var environment = new TestEnvironment();
-            using IWorkspaceProjectContext project = CSharpHelpers.CreateCSharpCPSProject(environment, "Test");
+            using IWorkspaceProjectContext project = await CSharpHelpers.CreateCSharpCPSProjectAsync(environment, "Test");
             var initialProjectDisplayName = project.DisplayName;
             var initialProjectFilePath = project.ProjectFilePath;
             var newFilePath = Temp.CreateFile().Path;

src/VisualStudio/CSharp/Test/ProjectSystemShim/CPS/CSharpReferencesTests.cs

@@ -6,6 +6,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Test.Utilities;
@@ -24,13 +25,13 @@ public class CSharpReferenceTests
     {
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void AddRemoveProjectAndMetadataReference_CPS()
+        public async Task AddRemoveProjectAndMetadataReference_CPS()
         {
             using var environment = new TestEnvironment();
-            var project1 = CreateCSharpCPSProject(environment, "project1", commandLineArguments: @"/out:c:\project1.dll");
-            var project2 = CreateCSharpCPSProject(environment, "project2", commandLineArguments: @"/out:c:\project2.dll");
-            var project3 = CreateCSharpCPSProject(environment, "project3", commandLineArguments: @"/out:c:\project3.dll");
-            var project4 = CreateCSharpCPSProject(environment, "project4");
+            var project1 = await CreateCSharpCPSProjectAsync(environment, "project1", commandLineArguments: @"/out:c:\project1.dll");
+            var project2 = await CreateCSharpCPSProjectAsync(environment, "project2", commandLineArguments: @"/out:c:\project2.dll");
+            var project3 = await CreateCSharpCPSProjectAsync(environment, "project3", commandLineArguments: @"/out:c:\project3.dll");
+            var project4 = await CreateCSharpCPSProjectAsync(environment, "project4");
 
             // Add project reference
             project3.AddProjectReference(project1, new MetadataReferenceProperties());
@@ -90,11 +91,11 @@ IEnumerable<PortableExecutableReference> GetProject3MetadataReferences()
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void RemoveProjectConvertsProjectReferencesBack()
+        public async Task RemoveProjectConvertsProjectReferencesBack()
         {
             using var environment = new TestEnvironment();
-            var project1 = CreateCSharpCPSProject(environment, "project1", commandLineArguments: @"/out:c:\project1.dll");
-            var project2 = CreateCSharpCPSProject(environment, "project2");
+            var project1 = await CreateCSharpCPSProjectAsync(environment, "project1", commandLineArguments: @"/out:c:\project1.dll");
+            var project2 = await CreateCSharpCPSProjectAsync(environment, "project2");
 
             // Add project reference as metadata reference: since this is known to be the output path of project1, the metadata reference is converted to a project reference
             project2.AddMetadataReference(@"c:\project1.dll", new MetadataReferenceProperties());
@@ -112,11 +113,11 @@ public void RemoveProjectConvertsProjectReferencesBack()
         [WorkItem(461967, "https://devdiv.visualstudio.com/DevDiv/_workitems/edit/461967")]
         [WorkItem(727173, "https://devdiv.visualstudio.com/DevDiv/_workitems/edit/727173")]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void AddingMetadataReferenceToProjectThatCannotCompileInTheIdeKeepsMetadataReference()
+        public async Task AddingMetadataReferenceToProjectThatCannotCompileInTheIdeKeepsMetadataReference()
         {
             using var environment = new TestEnvironment(typeof(NoCompilationLanguageServiceFactory));
-            var project1 = CreateCSharpCPSProject(environment, "project1", commandLineArguments: @"/out:c:\project1.dll");
-            var project2 = CreateNonCompilableProject(environment, "project2", @"C:\project2.fsproj");
+            var project1 = await CreateCSharpCPSProjectAsync(environment, "project1", commandLineArguments: @"/out:c:\project1.dll");
+            var project2 = await CreateNonCompilableProjectAsync(environment, "project2", @"C:\project2.fsproj");
             project2.BinOutputPath = "c:\\project2.dll";
 
             project1.AddMetadataReference(project2.BinOutputPath, MetadataReferenceProperties.Assembly);
@@ -130,10 +131,10 @@ public void AddingMetadataReferenceToProjectThatCannotCompileInTheIdeKeepsMetada
 
         [WpfFact]
         [Trait(Traits.Feature, Traits.Features.ProjectSystemShims)]
-        public void AddRemoveAnalyzerReference_CPS()
+        public async Task AddRemoveAnalyzerReference_CPS()
         {
             using var environment = new TestEnvironment();
-            using var project = CreateCSharpCPSProject(environment, "project1");
+            using var project = await CreateCSharpCPSProjectAsync(environment, "project1");
             // Add analyzer reference
             var analyzerAssemblyFullPath = @"c:\someAssembly.dll";