Upgrade MicrosoftCodeAnalysisTestingVersion to 1.1.2-beta1.24121.1

eng/Versions.props

@@ -21,7 +21,7 @@
     <!-- Versions used by several individual references below -->
     <RoslynDiagnosticsNugetPackageVersion>3.3.4-beta1.22579.2</RoslynDiagnosticsNugetPackageVersion>
     <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview1.23111.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
-    <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23163.2</MicrosoftCodeAnalysisTestingVersion>
+    <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisTestingVersion>
     <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.149-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
     <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
     <CodeStyleAnalyzerVersion>4.3.0-1.final</CodeStyleAnalyzerVersion>

src/EditorFeatures/CSharpTest/ConvertToRecord/ConvertToRecordCodeRefactoringTests.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.ServiceModel.Syndication;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CSharp;
@@ -4542,37 +4543,23 @@ public class C : [|B|]
 
         #endregion
 
-        private static void AddSolutionTransform(List<Func<Solution, ProjectId, Solution>> solutionTransforms)
-        {
-            solutionTransforms.Add((solution, projectId) =>
-            {
-                var project = solution.GetProject(projectId)!;
-
-                var compilationOptions = (CSharpCompilationOptions)project.CompilationOptions!;
-                // enable nullable
-                compilationOptions = compilationOptions.WithNullableContextOptions(NullableContextOptions.Enable);
-                solution = solution
-                    .WithProjectCompilationOptions(projectId, compilationOptions)
-                    .WithProjectMetadataReferences(projectId, TargetFrameworkUtil.GetReferences(TargetFramework.Net60));
-
-                return solution;
-            });
-        }
-
         private class RefactoringTest : VerifyCSRefactoring.Test
         {
             public RefactoringTest()
             {
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net60;
                 LanguageVersion = LanguageVersion.CSharp10;
-                AddSolutionTransform(SolutionTransforms);
                 MarkupOptions = MarkupOptions.UseFirstDescriptor;
             }
 
-            protected override Workspace CreateWorkspaceImpl()
+            protected override CompilationOptions CreateCompilationOptions()
             {
-                var workspace = new AdhocWorkspace();
+                var compilationOptions = (CSharpCompilationOptions)base.CreateCompilationOptions();
+
+                // enable nullable
+                compilationOptions = compilationOptions.WithNullableContextOptions(NullableContextOptions.Enable);
 
-                return workspace;
+                return compilationOptions;
             }
         }
 
@@ -4596,8 +4583,18 @@ private class CodeFixTest :
         {
             public CodeFixTest()
             {
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net60;
                 LanguageVersion = LanguageVersion.CSharp10;
-                AddSolutionTransform(SolutionTransforms);
+            }
+
+            protected override CompilationOptions CreateCompilationOptions()
+            {
+                var compilationOptions = (CSharpCompilationOptions)base.CreateCompilationOptions();
+
+                // enable nullable
+                compilationOptions = compilationOptions.WithNullableContextOptions(NullableContextOptions.Enable);
+
+                return compilationOptions;
             }
         }
 

src/EditorFeatures/CSharpTest/ExtractClass/ExtractClassTests.cs

@@ -47,11 +47,11 @@ protected override IEnumerable<CodeRefactoringProvider> GetCodeRefactoringProvid
                 return SpecializedCollections.SingletonEnumerable(new CSharpExtractClassCodeRefactoringProvider(service));
             }
 
-            protected override Workspace CreateWorkspaceImpl()
+            protected override Task<Workspace> CreateWorkspaceImplAsync()
             {
                 var unusedCompilationOptions = new CSharpCompilationOptions(OutputKind.NetModule);
                 var unusedParseOptions = new CSharpParseOptions(LanguageVersion.CSharp1);
-                return TestWorkspace.Create(WorkspaceKind, LanguageNames.CSharp, unusedCompilationOptions, unusedParseOptions);
+                return Task.FromResult<Workspace>(TestWorkspace.Create(WorkspaceKind, LanguageNames.CSharp, unusedCompilationOptions, unusedParseOptions));
             }
         }
 

src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateEqualsAndGetHashCodeFromMembers/GenerateEqualsAndGetHashCodeFromMembersTests.cs

@@ -37,7 +37,7 @@ private class TestWithDialog : VerifyCS.Test
             public ImmutableArray<string> MemberNames;
             public Action<ImmutableArray<PickMembersOption>> OptionsCallback;
 
-            protected override Workspace CreateWorkspaceImpl()
+            protected override Task<Workspace> CreateWorkspaceImplAsync()
             {
                 // If we're a dialog test, then mixin our mock and initialize its values to the ones the test asked for.
                 var workspace = new AdhocWorkspace(s_composition.GetHostServices());
@@ -46,7 +46,7 @@ protected override Workspace CreateWorkspaceImpl()
                 service.MemberNames = MemberNames;
                 service.OptionsCallback = OptionsCallback;
 
-                return workspace;
+                return Task.FromResult<Workspace>(workspace);
             }
         }
 

src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs

@@ -3420,7 +3420,7 @@ public Test(
 
             private readonly bool _testPreselection;
 
-            protected override Workspace CreateWorkspaceImpl()
+            protected override Task<Workspace> CreateWorkspaceImplAsync()
             {
                 var hostServices = s_testServices.GetHostServices();
 
@@ -3432,7 +3432,7 @@ protected override Workspace CreateWorkspaceImpl()
                 testOptionsService.CreateNew = _createNew;
                 testOptionsService.ExpectedPrecheckedMembers = _testPreselection ? _selection : ImmutableArray<string>.Empty;
 
-                return workspace;
+                return Task.FromResult<Workspace>(workspace);
             }
         }
 

src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/CSharpCodeFixVerifier`2+Test.cs

@@ -113,16 +113,18 @@ protected override CodeFixContext CreateCodeFixContext(Document document, TextSp
 
             protected override FixAllContext CreateFixAllContext(
                 Document? document,
+                TextSpan? diagnosticSpan,
                 Project project,
                 CodeFixProvider codeFixProvider,
                 FixAllScope scope,
                 string? codeActionEquivalenceKey,
                 IEnumerable<string> diagnosticIds,
+                DiagnosticSeverity minimumSeverity,
                 FixAllContext.DiagnosticProvider fixAllDiagnosticProvider,
                 CancellationToken cancellationToken)
                 => new(new FixAllState(
                     fixAllProvider: NoOpFixAllProvider.Instance,
-                    diagnosticSpan: null,
+                    diagnosticSpan,
                     document,
                     project,
                     codeFixProvider,

src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/CSharpCodeRefactoringVerifier`1+Test.cs

@@ -124,14 +124,14 @@ protected override CodeRefactoringContext CreateCodeRefactoringContext(Document
 
             private static readonly TestComposition s_editorFeaturesOOPComposition = EditorTestCompositions.EditorFeatures.WithTestHostParts(TestHost.OutOfProcess);
 
-            protected override Workspace CreateWorkspaceImpl()
+            protected override Task<Workspace> CreateWorkspaceImplAsync()
             {
                 if (TestHost == TestHost.InProcess)
-                    return base.CreateWorkspaceImpl();
+                    return base.CreateWorkspaceImplAsync();
 
                 var hostServices = s_editorFeaturesOOPComposition.GetHostServices();
                 var workspace = new AdhocWorkspace(hostServices);
-                return workspace;
+                return Task.FromResult<Workspace>(workspace);
             }
 #endif
         }

src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs

@@ -110,14 +110,14 @@ protected override CodeRefactoringContext CreateCodeRefactoringContext(Document
 
             private static readonly TestComposition s_editorFeaturesOOPComposition = EditorTestCompositions.EditorFeatures.WithTestHostParts(TestHost.OutOfProcess);
 
-            protected override Workspace CreateWorkspaceImpl()
+            protected override Task<Workspace> CreateWorkspaceImplAsync()
             {
                 if (TestHost == TestHost.InProcess)
-                    return base.CreateWorkspaceImpl();
+                    return base.CreateWorkspaceImplAsync();
 
                 var hostServices = s_editorFeaturesOOPComposition.GetHostServices();
                 var workspace = new AdhocWorkspace(hostServices);
-                return workspace;
+                return Task.FromResult<Workspace>(workspace);
             }
 
 #endif

src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb

@@ -3065,7 +3065,7 @@ End Namespace"
 
             Private ReadOnly _newType As Boolean
 
-            Protected Overrides Function CreateWorkspaceImpl() As Workspace
+            Protected Overrides Function CreateWorkspaceImplAsync() As Task(Of Workspace)
                 Dim hostServices = s_testServices.GetHostServices()
                 Dim workspace = New AdhocWorkspace(hostServices)
                 Dim optionsService = DirectCast(workspace.Services.GetRequiredService(Of IMoveStaticMembersOptionsService)(), TestMoveStaticMembersService)
@@ -3079,7 +3079,7 @@ End Namespace"
                 End If
                 optionsService.CreateNew = _newType
 
-                Return workspace
+                Return Task.FromResult(Of Workspace)(workspace)
             End Function
         End Class