Skip to content

Commit b46e01b

Browse files
sharwellsharwell
authored
Merge pull request #3528 from bjornhellander/feature/languageversion0
Remove hard-coded language versions in test projects for c# 8, 9 and 10
2 parents 7319ae0 + a25f0f7 commit b46e01b

28 files changed

+51
-84
lines changed

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp10/NamingRules/SA1313CSharp10UnitTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace StyleCop.Analyzers.Test.CSharp10.NamingRules
77
{
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.CSharp;
1110
using StyleCop.Analyzers.Test.CSharp9.NamingRules;
1211
using StyleCop.Analyzers.Test.Verifiers;
1312
using Xunit;
@@ -43,7 +42,7 @@ public R(int a, int b)
4342
}}
4443
";
4544

46-
await new CSharpTest(LanguageVersion.CSharp10)
45+
await new CSharpTest()
4746
{
4847
ReferenceAssemblies = GenericAnalyzerTest.ReferenceAssembliesNet60,
4948
TestCode = testCode,

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp10/ReadabilityRules/SA1101CSharp10UnitTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ namespace StyleCop.Analyzers.Test.CSharp10.ReadabilityRules
55
{
66
using System.Threading;
77
using System.Threading.Tasks;
8-
using Microsoft.CodeAnalysis.CSharp;
98
using StyleCop.Analyzers.Test.CSharp9.ReadabilityRules;
109
using StyleCop.Analyzers.Test.Verifiers;
1110
using Xunit;
@@ -30,7 +29,7 @@ public bool Method(Test arg)
3029
}
3130
}";
3231

33-
await new CSharpTest(LanguageVersion.CSharp10)
32+
await new CSharpTest()
3433
{
3534
ReferenceAssemblies = GenericAnalyzerTest.ReferenceAssembliesNet60,
3635
TestCode = testCode,

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/MaintainabilityRules/SA1119CSharp8UnitTests.cs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ namespace StyleCop.Analyzers.Test.CSharp8.MaintainabilityRules
88
using System.Threading;
99
using System.Threading.Tasks;
1010

11-
using Microsoft.CodeAnalysis.CSharp;
1211
using Microsoft.CodeAnalysis.Testing;
1312
using StyleCop.Analyzers.Test.CSharp7.MaintainabilityRules;
1413

@@ -38,7 +37,7 @@ public string TestMethod(int n, object a, object b)
3837
}
3938
";
4039

41-
await VerifyCSharpDiagnosticAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
40+
await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
4241
}
4342

4443
/// <summary>
@@ -76,7 +75,7 @@ public string TestMethod(int n, object a, object b)
7675
Diagnostic(ParenthesesDiagnosticId).WithLocation(6, 54),
7776
};
7877

79-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
78+
await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
8079
}
8180

8281
/// <summary>
@@ -99,7 +98,7 @@ public async Task<string> TestMethod(int n, Task<string> a, Task<string> b)
9998
}
10099
";
101100

102-
await VerifyCSharpDiagnosticAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
101+
await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
103102
}
104103

105104
/// <summary>
@@ -141,7 +140,7 @@ public async Task<string> TestMethod(int n, Task<string> a, Task<string> b)
141140
Diagnostic(ParenthesesDiagnosticId).WithLocation(2),
142141
};
143142

144-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
143+
await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
145144
}
146145

147146
/// <summary>
@@ -179,7 +178,7 @@ public void TestMethod(int n, object a, object b)
179178
Diagnostic(ParenthesesDiagnosticId).WithLocation(6, 48),
180179
};
181180

182-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
181+
await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
183182
}
184183

185184
[Theory]
@@ -200,7 +199,7 @@ public object TestMethod(int n, string a, string b)
200199
}}
201200
";
202201

203-
await VerifyCSharpDiagnosticAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
202+
await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
204203
}
205204

206205
[Fact]
@@ -217,7 +216,7 @@ public unsafe string TestMethod(int n, byte* a, byte* b)
217216
}
218217
";
219218

220-
await VerifyCSharpDiagnosticAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
219+
await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
221220
}
222221

223222
[Fact]
@@ -235,7 +234,7 @@ public unsafe void TestMethod()
235234
}
236235
";
237236

238-
await VerifyCSharpDiagnosticAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
237+
await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
239238
}
240239

241240
[Fact]
@@ -253,7 +252,7 @@ public void TestMethod()
253252
}
254253
";
255254

256-
await new CSharpTest(LanguageVersion.CSharp8)
255+
await new CSharpTest()
257256
{
258257
ReferenceAssemblies = ReferenceAssemblies.NetCore.NetCoreApp31,
259258
TestCode = testCode,
@@ -300,7 +299,7 @@ public void TestMethod()
300299
Diagnostic(ParenthesesDiagnosticId).WithLocation(9, 27),
301300
};
302301

303-
var test = new CSharpTest(LanguageVersion.CSharp8)
302+
var test = new CSharpTest()
304303
{
305304
ReferenceAssemblies = ReferenceAssemblies.NetCore.NetCoreApp31,
306305
TestCode = testCode,

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/MaintainabilityRules/SA1413CSharp8UnitTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace StyleCop.Analyzers.Test.CSharp8.MaintainabilityRules
77
{
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.CSharp;
1110
using Microsoft.CodeAnalysis.Testing;
1211
using StyleCop.Analyzers.Test.CSharp7.MaintainabilityRules;
1312
using Xunit;
@@ -57,7 +56,7 @@ public void TestMethod(int input)
5756
}
5857
";
5958

60-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
59+
await VerifyCSharpFixAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
6160
}
6261
}
6362
}

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1002CSharp8UnitTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
77
{
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.CSharp;
1110
using Microsoft.CodeAnalysis.Testing;
1211
using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
1312
using Xunit;
@@ -55,7 +54,7 @@ public void TestMethod(object?[] arguments)
5554
Diagnostic().WithArguments(" not", "preceded").WithLocation(9, 40),
5655
};
5756

58-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
57+
await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
5958
}
6059
}
6160
}

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1003CSharp8UnitTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
77
{
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.CSharp;
1110
using Microsoft.CodeAnalysis.Testing;
1211
using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
1312
using Xunit;
@@ -59,7 +58,7 @@ public void TestMethod()
5958
}
6059
";
6160

62-
await new CSharpTest(LanguageVersion.CSharp8)
61+
await new CSharpTest()
6362
{
6463
ReferenceAssemblies = ReferenceAssemblies.NetCore.NetCoreApp31,
6564
TestCode = testCode,

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1008CSharp8UnitTests.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
77
{
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.CSharp;
1110
using Microsoft.CodeAnalysis.Testing;
1211
using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
1312
using Xunit;
@@ -66,7 +65,7 @@ public void TestMethod()
6665
}
6766
";
6867

69-
await new CSharpTest(LanguageVersion.CSharp8)
68+
await new CSharpTest()
7069
{
7170
ReferenceAssemblies = ReferenceAssemblies.NetCore.NetCoreApp31,
7271
TestCode = testCode,
@@ -108,7 +107,6 @@ void M((string A, string B) tuple)
108107
};
109108

110109
await VerifyCSharpFixAsync(
111-
LanguageVersion.CSharp8,
112110
testCode,
113111
expectedResults,
114112
fixedCode,
@@ -146,7 +144,6 @@ void M((bool A, bool B) tuple)
146144
};
147145

148146
await VerifyCSharpFixAsync(
149-
LanguageVersion.CSharp8,
150147
testCode,
151148
expectedResults,
152149
fixedCode,

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1009CSharp8UnitTests.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
77
{
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.CSharp;
1110
using Microsoft.CodeAnalysis.Testing;
1211
using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
13-
using StyleCop.Analyzers.Test.Verifiers;
1412
using Xunit;
1513
using static StyleCop.Analyzers.SpacingRules.SA1009ClosingParenthesisMustBeSpacedCorrectly;
1614
using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
@@ -44,7 +42,7 @@ public void TestMethod<T>()
4442
}
4543
}";
4644

47-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
45+
await VerifyCSharpFixAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
4846
}
4947

5048
[Fact]
@@ -100,7 +98,7 @@ public Derived()
10098
Diagnostic(DescriptorNotPreceded).WithLocation(2),
10199
};
102100

103-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
101+
await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
104102
}
105103

106104
[Fact]
@@ -124,7 +122,7 @@ public class Foo
124122
public IDisposable Service => this.TestMethod<IDisposable>()!;
125123
}";
126124

127-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
125+
await VerifyCSharpFixAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
128126
}
129127

130128
[Fact]
@@ -154,7 +152,7 @@ public IDisposable Service()
154152
}
155153
}";
156154

157-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
155+
await VerifyCSharpFixAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
158156
}
159157

160158
/// <summary>
@@ -201,7 +199,7 @@ public string TestMethod()
201199
}
202200
";
203201

204-
await new CSharpTest(LanguageVersion.CSharp8)
202+
await new CSharpTest()
205203
{
206204
ReferenceAssemblies = ReferenceAssemblies.NetCore.NetCoreApp31,
207205
TestCode = testCode,

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1011CSharp8UnitTests.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
77
{
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.CSharp;
1110
using Microsoft.CodeAnalysis.Testing;
1211
using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
1312
using Xunit;
@@ -37,7 +36,7 @@ public void TestMethod()
3736
}
3837
";
3938

40-
await VerifyCSharpDiagnosticAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
39+
await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
4140
}
4241

4342
[Fact]
@@ -56,7 +55,7 @@ public class TestClass
5655
}
5756
";
5857

59-
await VerifyCSharpDiagnosticAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
58+
await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
6059
}
6160

6261
[Fact]
@@ -105,7 +104,7 @@ public void TestMethod(object?[] arguments)
105104
Diagnostic().WithArguments(" not", "followed").WithLocation(12, 36),
106105
};
107106

108-
await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
107+
await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
109108
}
110109
}
111110
}

‎StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1012CSharp8UnitTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
77
{
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using Microsoft.CodeAnalysis.CSharp;
1110
using Microsoft.CodeAnalysis.Testing;
1211
using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
1312
using Xunit;
@@ -56,7 +55,6 @@ void M((string A, string B) tuple)
5655
};
5756

5857
await VerifyCSharpFixAsync(
59-
LanguageVersion.CSharp8,
6058
testCode,
6159
expectedResults,
6260
fixedCode,

0 commit comments

Comments
 (0)