Use CreateWorkspaceAsync from the testing library

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/Lightup/IImportScopeWrapperCSharp11UnitTests.cs

@@ -52,7 +52,7 @@ public class TestClass
 }
 ";
 
-            var workspace = GenericAnalyzerTest.CreateWorkspace();
+            var workspace = await GenericAnalyzerTest.CreateWorkspaceAsync().ConfigureAwait(false);
             var projectId = ProjectId.CreateNewId();
 
             var references = await GenericAnalyzerTest.ReferenceAssemblies

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/Settings/SettingsCSharp8UnitTests.cs

@@ -206,7 +206,7 @@ private async Task<SyntaxTreeAnalysisContext> CreateAnalysisContextFromEditorCon
             var documentId = DocumentId.CreateNewId(projectId);
             var analyzerConfigDocumentId = DocumentId.CreateNewId(projectId);
 
-            var solution = GenericAnalyzerTest.CreateWorkspace()
+            var solution = (await GenericAnalyzerTest.CreateWorkspaceAsync().ConfigureAwait(false))
                 .CurrentSolution
                 .AddProject(projectId, TestProjectName, TestProjectName, LanguageNames.CSharp)
                 .AddDocument(documentId, "/0/Test0.cs", SourceText.From(string.Empty))

StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/IndentationHelperTests.cs

@@ -142,7 +142,7 @@ public async Task VerifyGetIndentationStepsForTokenNotAtStartOfLineAsync()
 
         private static async Task<Document> CreateTestDocumentAsync(string source, int indentationSize = 4, bool useTabs = false, int tabSize = 4, CancellationToken cancellationToken = default)
         {
-            var workspace = GenericAnalyzerTest.CreateWorkspace();
+            var workspace = await GenericAnalyzerTest.CreateWorkspaceAsync().ConfigureAwait(false);
             workspace.Options = workspace.Options
                 .WithChangedOption(FormattingOptions.IndentationSize, LanguageNames.CSharp, indentationSize)
                 .WithChangedOption(FormattingOptions.UseTabs, LanguageNames.CSharp, useTabs)

StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/SymbolNameHelpersUnitTests.cs

@@ -108,7 +108,7 @@ private static Document GetDocument(Solution solution, string sourceCode)
 
         private static async Task<Solution> CreateTestSolutionAsync(CSharpCompilationOptions compilationOptions)
         {
-            var workspace = GenericAnalyzerTest.CreateWorkspace();
+            var workspace = await GenericAnalyzerTest.CreateWorkspaceAsync().ConfigureAwait(false);
             var projectId = ProjectId.CreateNewId();
 
             var references = await GenericAnalyzerTest.ReferenceAssemblies

StyleCop.Analyzers/StyleCop.Analyzers.Test/Settings/SettingsUnitTests.cs

@@ -431,7 +431,7 @@ private static async Task<SyntaxTreeAnalysisContext> CreateAnalysisContextAsync(
             var projectId = ProjectId.CreateNewId();
             var documentId = DocumentId.CreateNewId(projectId);
 
-            var solution = GenericAnalyzerTest.CreateWorkspace()
+            var solution = (await GenericAnalyzerTest.CreateWorkspaceAsync().ConfigureAwait(false))
                 .CurrentSolution
                 .AddProject(projectId, TestProjectName, TestProjectName, LanguageNames.CSharp)
                 .AddDocument(documentId, "Test0.cs", SourceText.From(string.Empty));

StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/GenericAnalyzerTest.cs

@@ -5,19 +5,17 @@ namespace StyleCop.Analyzers.Test.Verifiers
 {
     using System;
     using System.Collections.Immutable;
-    using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis;
-    using Microsoft.CodeAnalysis.Host.Mef;
+    using Microsoft.CodeAnalysis.CSharp.Testing;
     using Microsoft.CodeAnalysis.Testing;
-    using Microsoft.VisualStudio.Composition;
     using StyleCop.Analyzers.Lightup;
 
     internal static class GenericAnalyzerTest
     {
         internal static readonly ReferenceAssemblies ReferenceAssemblies;
-
-        private static readonly Lazy<IExportProviderFactory> ExportProviderFactory;
+        private static readonly AnalyzerTest<DefaultVerifier> WorkspaceHelper =
+            new CSharpCodeFixTest<EmptyDiagnosticAnalyzer, EmptyCodeFixProvider, DefaultVerifier>();
 
         static GenericAnalyzerTest()
         {
@@ -62,26 +60,11 @@ static GenericAnalyzerTest()
             ReferenceAssemblies = defaultReferenceAssemblies.AddPackages(ImmutableArray.Create(
                 new PackageIdentity("Microsoft.CodeAnalysis.CSharp", codeAnalysisTestVersion),
                 new PackageIdentity("System.ValueTuple", "4.5.0")));
-
-            ExportProviderFactory = new Lazy<IExportProviderFactory>(
-                () =>
-                {
-                    var discovery = new AttributedPartDiscovery(Resolver.DefaultInstance, isNonPublicSupported: true);
-                    var parts = Task.Run(() => discovery.CreatePartsAsync(MefHostServices.DefaultAssemblies)).GetAwaiter().GetResult();
-                    var catalog = ComposableCatalog.Create(Resolver.DefaultInstance).AddParts(parts);
-
-                    var configuration = CompositionConfiguration.Create(catalog);
-                    var runtimeComposition = RuntimeComposition.CreateRuntimeComposition(configuration);
-                    return runtimeComposition.CreateExportProviderFactory();
-                },
-                LazyThreadSafetyMode.ExecutionAndPublication);
         }
 
-        internal static AdhocWorkspace CreateWorkspace()
+        internal static async Task<Workspace> CreateWorkspaceAsync()
         {
-            var exportProvider = ExportProviderFactory.Value.CreateExportProvider();
-            var host = MefV1HostServices.Create(exportProvider.AsExportProvider());
-            return new AdhocWorkspace(host);
+            return await WorkspaceHelper.CreateWorkspaceAsync().ConfigureAwait(false);
         }
     }
 }