Skip to content

Commit ac1154a

Browse files
authored
Upgrade MicrosoftCodeAnalysisTestingVersion to 1.1.2-beta1.24121.1 (#73840)
* update codeanalysistestingversion * undo * fix errors * update build log version * wip
1 parent e58065d commit ac1154a

File tree

9 files changed

+37
-38
lines changed

9 files changed

+37
-38
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<!-- Versions used by several individual references below -->
2222
<RoslynDiagnosticsNugetPackageVersion>3.3.4-beta1.22579.2</RoslynDiagnosticsNugetPackageVersion>
2323
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview1.23111.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
24-
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23163.2</MicrosoftCodeAnalysisTestingVersion>
24+
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisTestingVersion>
2525
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.149-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
2626
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
2727
<CodeStyleAnalyzerVersion>4.3.0-1.final</CodeStyleAnalyzerVersion>

src/EditorFeatures/CSharpTest/ConvertToRecord/ConvertToRecordCodeRefactoringTests.cs

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System;
66
using System.Collections.Generic;
77
using System.Collections.Immutable;
8+
using System.ServiceModel.Syndication;
89
using System.Threading.Tasks;
910
using Microsoft.CodeAnalysis.CodeActions;
1011
using Microsoft.CodeAnalysis.CSharp;
@@ -4542,37 +4543,23 @@ public class C : [|B|]
45424543

45434544
#endregion
45444545

4545-
private static void AddSolutionTransform(List<Func<Solution, ProjectId, Solution>> solutionTransforms)
4546-
{
4547-
solutionTransforms.Add((solution, projectId) =>
4548-
{
4549-
var project = solution.GetProject(projectId)!;
4550-
4551-
var compilationOptions = (CSharpCompilationOptions)project.CompilationOptions!;
4552-
// enable nullable
4553-
compilationOptions = compilationOptions.WithNullableContextOptions(NullableContextOptions.Enable);
4554-
solution = solution
4555-
.WithProjectCompilationOptions(projectId, compilationOptions)
4556-
.WithProjectMetadataReferences(projectId, TargetFrameworkUtil.GetReferences(TargetFramework.Net60));
4557-
4558-
return solution;
4559-
});
4560-
}
4561-
45624546
private class RefactoringTest : VerifyCSRefactoring.Test
45634547
{
45644548
public RefactoringTest()
45654549
{
4550+
ReferenceAssemblies = ReferenceAssemblies.Net.Net60;
45664551
LanguageVersion = LanguageVersion.CSharp10;
4567-
AddSolutionTransform(SolutionTransforms);
45684552
MarkupOptions = MarkupOptions.UseFirstDescriptor;
45694553
}
45704554

4571-
protected override Workspace CreateWorkspaceImpl()
4555+
protected override CompilationOptions CreateCompilationOptions()
45724556
{
4573-
var workspace = new AdhocWorkspace();
4557+
var compilationOptions = (CSharpCompilationOptions)base.CreateCompilationOptions();
4558+
4559+
// enable nullable
4560+
compilationOptions = compilationOptions.WithNullableContextOptions(NullableContextOptions.Enable);
45744561

4575-
return workspace;
4562+
return compilationOptions;
45764563
}
45774564
}
45784565

@@ -4596,8 +4583,18 @@ private class CodeFixTest :
45964583
{
45974584
public CodeFixTest()
45984585
{
4586+
ReferenceAssemblies = ReferenceAssemblies.Net.Net60;
45994587
LanguageVersion = LanguageVersion.CSharp10;
4600-
AddSolutionTransform(SolutionTransforms);
4588+
}
4589+
4590+
protected override CompilationOptions CreateCompilationOptions()
4591+
{
4592+
var compilationOptions = (CSharpCompilationOptions)base.CreateCompilationOptions();
4593+
4594+
// enable nullable
4595+
compilationOptions = compilationOptions.WithNullableContextOptions(NullableContextOptions.Enable);
4596+
4597+
return compilationOptions;
46014598
}
46024599
}
46034600

src/EditorFeatures/CSharpTest/ExtractClass/ExtractClassTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ protected override IEnumerable<CodeRefactoringProvider> GetCodeRefactoringProvid
4747
return SpecializedCollections.SingletonEnumerable(new CSharpExtractClassCodeRefactoringProvider(service));
4848
}
4949

50-
protected override Workspace CreateWorkspaceImpl()
50+
protected override Task<Workspace> CreateWorkspaceImplAsync()
5151
{
5252
var unusedCompilationOptions = new CSharpCompilationOptions(OutputKind.NetModule);
5353
var unusedParseOptions = new CSharpParseOptions(LanguageVersion.CSharp1);
54-
return TestWorkspace.Create(WorkspaceKind, LanguageNames.CSharp, unusedCompilationOptions, unusedParseOptions);
54+
return Task.FromResult<Workspace>(TestWorkspace.Create(WorkspaceKind, LanguageNames.CSharp, unusedCompilationOptions, unusedParseOptions));
5555
}
5656
}
5757

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private class TestWithDialog : VerifyCS.Test
3737
public ImmutableArray<string> MemberNames;
3838
public Action<ImmutableArray<PickMembersOption>> OptionsCallback;
3939

40-
protected override Workspace CreateWorkspaceImpl()
40+
protected override Task<Workspace> CreateWorkspaceImplAsync()
4141
{
4242
// If we're a dialog test, then mixin our mock and initialize its values to the ones the test asked for.
4343
var workspace = new AdhocWorkspace(s_composition.GetHostServices());
@@ -46,7 +46,7 @@ protected override Workspace CreateWorkspaceImpl()
4646
service.MemberNames = MemberNames;
4747
service.OptionsCallback = OptionsCallback;
4848

49-
return workspace;
49+
return Task.FromResult<Workspace>(workspace);
5050
}
5151
}
5252

src/EditorFeatures/CSharpTest/MoveStaticMembers/CSharpMoveStaticMembersTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3420,7 +3420,7 @@ public Test(
34203420

34213421
private readonly bool _testPreselection;
34223422

3423-
protected override Workspace CreateWorkspaceImpl()
3423+
protected override Task<Workspace> CreateWorkspaceImplAsync()
34243424
{
34253425
var hostServices = s_testServices.GetHostServices();
34263426

@@ -3432,7 +3432,7 @@ protected override Workspace CreateWorkspaceImpl()
34323432
testOptionsService.CreateNew = _createNew;
34333433
testOptionsService.ExpectedPrecheckedMembers = _testPreselection ? _selection : ImmutableArray<string>.Empty;
34343434

3435-
return workspace;
3435+
return Task.FromResult<Workspace>(workspace);
34363436
}
34373437
}
34383438

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,18 @@ protected override CodeFixContext CreateCodeFixContext(Document document, TextSp
113113

114114
protected override FixAllContext CreateFixAllContext(
115115
Document? document,
116+
TextSpan? diagnosticSpan,
116117
Project project,
117118
CodeFixProvider codeFixProvider,
118119
FixAllScope scope,
119120
string? codeActionEquivalenceKey,
120121
IEnumerable<string> diagnosticIds,
122+
DiagnosticSeverity minimumSeverity,
121123
FixAllContext.DiagnosticProvider fixAllDiagnosticProvider,
122124
CancellationToken cancellationToken)
123125
=> new(new FixAllState(
124126
fixAllProvider: NoOpFixAllProvider.Instance,
125-
diagnosticSpan: null,
127+
diagnosticSpan,
126128
document,
127129
project,
128130
codeFixProvider,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ protected override CodeRefactoringContext CreateCodeRefactoringContext(Document
124124

125125
private static readonly TestComposition s_editorFeaturesOOPComposition = EditorTestCompositions.EditorFeatures.WithTestHostParts(TestHost.OutOfProcess);
126126

127-
protected override Workspace CreateWorkspaceImpl()
127+
protected override Task<Workspace> CreateWorkspaceImplAsync()
128128
{
129129
if (TestHost == TestHost.InProcess)
130-
return base.CreateWorkspaceImpl();
130+
return base.CreateWorkspaceImplAsync();
131131

132132
var hostServices = s_editorFeaturesOOPComposition.GetHostServices();
133133
var workspace = new AdhocWorkspace(hostServices);
134-
return workspace;
134+
return Task.FromResult<Workspace>(workspace);
135135
}
136136
#endif
137137
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ protected override CodeRefactoringContext CreateCodeRefactoringContext(Document
110110

111111
private static readonly TestComposition s_editorFeaturesOOPComposition = EditorTestCompositions.EditorFeatures.WithTestHostParts(TestHost.OutOfProcess);
112112

113-
protected override Workspace CreateWorkspaceImpl()
113+
protected override Task<Workspace> CreateWorkspaceImplAsync()
114114
{
115115
if (TestHost == TestHost.InProcess)
116-
return base.CreateWorkspaceImpl();
116+
return base.CreateWorkspaceImplAsync();
117117

118118
var hostServices = s_editorFeaturesOOPComposition.GetHostServices();
119119
var workspace = new AdhocWorkspace(hostServices);
120-
return workspace;
120+
return Task.FromResult<Workspace>(workspace);
121121
}
122122

123123
#endif

src/EditorFeatures/VisualBasicTest/MoveStaticMembers/VisualBasicMoveStaticMembersTests.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3065,7 +3065,7 @@ End Namespace"
30653065

30663066
Private ReadOnly _newType As Boolean
30673067

3068-
Protected Overrides Function CreateWorkspaceImpl() As Workspace
3068+
Protected Overrides Function CreateWorkspaceImplAsync() As Task(Of Workspace)
30693069
Dim hostServices = s_testServices.GetHostServices()
30703070
Dim workspace = New AdhocWorkspace(hostServices)
30713071
Dim optionsService = DirectCast(workspace.Services.GetRequiredService(Of IMoveStaticMembersOptionsService)(), TestMoveStaticMembersService)
@@ -3079,7 +3079,7 @@ End Namespace"
30793079
End If
30803080
optionsService.CreateNew = _newType
30813081

3082-
Return workspace
3082+
Return Task.FromResult(Of Workspace)(workspace)
30833083
End Function
30843084
End Class
30853085

0 commit comments

Comments
 (0)