Merge pull request #4048 from sharwell/testing-updates

sharwell · web-flow · commit d4ebd50d44ec · 2025-11-30T15:27:15.000-08:00
Support testing on Linux
diff --git a/StyleCop.Analyzers/Directory.Build.props b/StyleCop.Analyzers/Directory.Build.props
@@ -45,7 +45,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp10/StyleCop.Analyzers.Test.CSharp10.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp10/StyleCop.Analyzers.Test.CSharp10.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/Lightup/IImportScopeWrapperCSharp11UnitTests.cs b/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
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/StyleCop.Analyzers.Test.CSharp11.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/StyleCop.Analyzers.Test.CSharp11.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/StyleCop.Analyzers.Test.CSharp12.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/StyleCop.Analyzers.Test.CSharp12.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp13/StyleCop.Analyzers.Test.CSharp13.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp13/StyleCop.Analyzers.Test.CSharp13.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/StyleCop.Analyzers.Test.CSharp7.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFrameworks>net46;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/Settings/SettingsCSharp8UnitTests.cs b/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))
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/StyleCop.Analyzers.Test.CSharp8.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/StyleCop.Analyzers.Test.CSharp8.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.6.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
 
     <!-- Increase the NuGet.Framworks version to the minimum supported by the net472 build of the testing library -->
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/StyleCop.Analyzers.Test.CSharp9.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/StyleCop.Analyzers.Test.CSharp9.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/IndentationHelperTests.cs b/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)
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/SymbolNameHelpersUnitTests.cs b/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
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1412UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1412UnitTests.cs
@@ -19,24 +19,37 @@ namespace StyleCop.Analyzers.Test.MaintainabilityRules
 
     public class SA1412UnitTests
     {
+#if NET
+        static SA1412UnitTests()
+        {
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+        }
+#endif
+
         public static IEnumerable<object[]> NonUtf8Encodings
         {
             get
             {
                 yield return new object[] { Encoding.ASCII.CodePage };
                 yield return new object[] { Encoding.BigEndianUnicode.CodePage };
+#if NETFRAMEWORK
                 yield return new object[] { Encoding.Default.CodePage };
+#else
+                yield return new object[] { 1252 };
+#endif
                 yield return new object[] { Encoding.Unicode.CodePage };
                 yield return new object[] { Encoding.UTF32.CodePage };
+#pragma warning disable SYSLIB0001 // Type or member is obsolete
                 yield return new object[] { Encoding.UTF7.CodePage };
+#pragma warning restore SYSLIB0001 // Type or member is obsolete
             }
         }
 
         [Theory]
         [MemberData(nameof(NonUtf8Encodings))]
         public async Task TestFileWithWrongEncodingAsync(int codepage)
         {
-            var testCode = SourceText.From("class TypeName { }", Encoding.GetEncoding(codepage));
+            var testCode = SourceText.From("class TypeName { }", GetEncoding(codepage));
             var fixedCode = SourceText.From(testCode.ToString(), Encoding.UTF8);
 
             var expected = Diagnostic().WithLocation(1, 1);
@@ -88,7 +101,9 @@ public async Task TestFixAllWithMultipleEncodingsAsync()
                 {
                     SourceText.From("class Foo { }", Encoding.Unicode),
                     SourceText.From("class Bar { }", Encoding.Unicode),
+#pragma warning disable SYSLIB0001 // Type or member is obsolete
                     SourceText.From("class FooBar { }", Encoding.UTF7),
+#pragma warning restore SYSLIB0001 // Type or member is obsolete
                 },
                 ExpectedDiagnostics =
                 {
@@ -110,6 +125,18 @@ public async Task TestFixAllWithMultipleEncodingsAsync()
             await test.RunAsync(CancellationToken.None).ConfigureAwait(false);
         }
 
+        private static Encoding GetEncoding(int codepage)
+        {
+#pragma warning disable SYSLIB0001 // Type or member is obsolete
+            if (codepage == Encoding.UTF7.CodePage)
+            {
+                return Encoding.UTF7;
+            }
+#pragma warning restore SYSLIB0001 // Type or member is obsolete
+
+            return Encoding.GetEncoding(codepage);
+        }
+
         private async Task TestFixAllExecuterAsync(int codepage, FixAllScope scope)
         {
             // Currently unused
@@ -119,8 +146,8 @@ private async Task TestFixAllExecuterAsync(int codepage, FixAllScope scope)
             {
                 TestSources =
                 {
-                    SourceText.From("class Foo { }", Encoding.GetEncoding(codepage)),
-                    SourceText.From("class Bar { }", Encoding.GetEncoding(codepage)),
+                    SourceText.From("class Foo { }", GetEncoding(codepage)),
+                    SourceText.From("class Bar { }", GetEncoding(codepage)),
                 },
                 ExpectedDiagnostics =
                 {
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SequentialTestCollection.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SequentialTestCollection.cs
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Test
     /// Defines a collection for tests which cannot run in parallel with other tests.
     /// </summary>
     [CollectionDefinition(nameof(SequentialTestCollection), DisableParallelization = true)]
-    internal sealed class SequentialTestCollection
+    public sealed class SequentialTestCollection
     {
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Settings/SettingsUnitTests.cs b/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));
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj b/StyleCop.Analyzers/StyleCop.Analyzers.Test/StyleCop.Analyzers.Test.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFrameworks>net452;net6.0</TargetFrameworks>
     <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -20,16 +20,28 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="1.3.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.2-beta1.23509.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.1.8" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="Xunit.Combinatorial" Version="1.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.1.8" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
 
     <!-- Make sure NuGet can parse the 'net5.0' TFM -->
     <PackageReference Include="NuGet.Frameworks" Version="5.9.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <!-- Exclude Microsoft.Composition which is only needed for .NET Framework execution -->
+    <PackageReference Include="Microsoft.Composition" Version="1.0.31" ExcludeAssets="all" />
+
+    <!-- Make sure Windows-1252 is available for testing -->
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\StyleCop.Analyzers.CodeFixes\StyleCop.Analyzers.CodeFixes.csproj" />
     <ProjectReference Include="..\StyleCop.Analyzers\StyleCop.Analyzers.csproj" />
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/GenericAnalyzerTest.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/GenericAnalyzerTest.cs
@@ -5,24 +5,41 @@ 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<ReferenceAssemblies> LazyReferenceAssemblies;
 
-        private static readonly Lazy<IExportProviderFactory> ExportProviderFactory;
+        private static readonly AnalyzerTest<DefaultVerifier> WorkspaceHelper =
+            new CSharpCodeFixTest<EmptyDiagnosticAnalyzer, EmptyCodeFixProvider, DefaultVerifier>();
 
         static GenericAnalyzerTest()
+        {
+            LazyReferenceAssemblies = new Lazy<ReferenceAssemblies>(CreateDefaultReferenceAssemblies);
+        }
+
+        internal static ReferenceAssemblies ReferenceAssemblies
+        {
+            get
+            {
+                return LazyReferenceAssemblies.Value;
+            }
+        }
+
+        internal static async Task<Workspace> CreateWorkspaceAsync()
+        {
+            return await WorkspaceHelper.CreateWorkspaceAsync().ConfigureAwait(false);
+        }
+
+        private static ReferenceAssemblies CreateDefaultReferenceAssemblies()
         {
             string codeAnalysisTestVersion =
-                typeof(Compilation).Assembly.GetName().Version.Major switch
+                typeof(Compilation).Assembly.GetName().Version!.Major switch
                 {
                     1 => "1.2.1",
                     2 => "2.8.2",
@@ -54,34 +71,18 @@ static GenericAnalyzerTest()
             {
                 defaultReferenceAssemblies = ReferenceAssemblies.NetCore.NetCoreApp30;
             }
+            else if (LightupHelpers.SupportsCSharp7)
+            {
+                defaultReferenceAssemblies = ReferenceAssemblies.NetFramework.Net46.Default;
+            }
             else
             {
-                defaultReferenceAssemblies = ReferenceAssemblies.Default;
+                defaultReferenceAssemblies = ReferenceAssemblies.NetFramework.Net452.Default;
             }
 
-            ReferenceAssemblies = defaultReferenceAssemblies.AddPackages(ImmutableArray.Create(
+            return 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()
-        {
-            var exportProvider = ExportProviderFactory.Value.CreateExportProvider();
-            var host = MefV1HostServices.Create(exportProvider.AsExportProvider());
-            return new AdhocWorkspace(host);
         }
     }
 }
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs
diff --git a/build/build-and-test.yml b/build/build-and-test.yml
diff --git a/build/test.yml b/build/test.yml

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public class TestClass`
`52`	`52`	`}`
`53`	`53`	`";`
`54`	`54`
`55`		`- var workspace = GenericAnalyzerTest.CreateWorkspace();`
	`55`	`+ var workspace = await GenericAnalyzerTest.CreateWorkspaceAsync().ConfigureAwait(false);`
`56`	`56`	`var projectId = ProjectId.CreateNewId();`
`57`	`57`
`58`	`58`	`var references = await GenericAnalyzerTest.ReferenceAssemblies`