Skip to content

Commit 427f4c2

Browse files
bradwilsonbradwilson
committed
Remove Roslyn 4.2 support as VS2022 17.2 is out of support https://learn.microsoft.com/en-us/visualstudio/productinfo/vs-servicing 
1 parent 2c7d34f commit 427f4c2

9 files changed

Lines changed: 7 additions & 81 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This project contains source code analysis and cleanup rules for xUnit.net. Analysis and fixes are only supported with C#.
44

5-
**Requirements**: xUnit.net v2 2.0+. Supported in Visual Studio 2019 16.11+ or 2022 17.2+ (as well as via command line builds with Roslyn 3.11+).
5+
**Requirements**: xUnit.net v2 2.0+. Supported in Visual Studio 2019 16.11+ or 2022 17.4+ (as well as via command line builds with Roslyn 3.11+).
66
Other environments (such as Mono or JetBrains Rider) may be able to use these analyzers as well; support and issue resolution will be provided by
77
those third parties and not by xUnit.net itself.
88

‎src/Directory.Build.props‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,18 @@
3636
<RoslynVersion>3.11.0</RoslynVersion>
3737
</PropertyGroup>
3838

39-
<PropertyGroup Condition="$(MSBuildProjectName.Contains('roslyn42'))">
40-
<DefineConstants>$(DefineConstants);ROSLYN_4_2;ROSLYN_3_11_OR_GREATER;ROSLYN_4_2_OR_GREATER</DefineConstants>
41-
<RoslynVersion>4.2.0</RoslynVersion>
42-
</PropertyGroup>
43-
4439
<PropertyGroup Condition="$(MSBuildProjectName.Contains('roslyn44'))">
45-
<DefineConstants>$(DefineConstants);ROSLYN_4_4;ROSLYN_3_11_OR_GREATER;ROSLYN_4_2_OR_GREATER;ROSLYN_4_4_OR_GREATER</DefineConstants>
40+
<DefineConstants>$(DefineConstants);ROSLYN_4_4;ROSLYN_3_11_OR_GREATER;ROSLYN_4_4_OR_GREATER</DefineConstants>
4641
<RoslynVersion>4.4.0</RoslynVersion>
4742
</PropertyGroup>
4843

4944
<PropertyGroup Condition="$(MSBuildProjectName.Contains('roslyn46'))">
50-
<DefineConstants>$(DefineConstants);ROSLYN_4_6;ROSLYN_3_11_OR_GREATER;ROSLYN_4_2_OR_GREATER;ROSLYN_4_4_OR_GREATER;ROSLYN_4_6_OR_GREATER</DefineConstants>
45+
<DefineConstants>$(DefineConstants);ROSLYN_4_6;ROSLYN_3_11_OR_GREATER;ROSLYN_4_4_OR_GREATER;ROSLYN_4_6_OR_GREATER</DefineConstants>
5146
<RoslynVersion>4.6.0</RoslynVersion>
5247
</PropertyGroup>
5348

5449
<PropertyGroup Condition=" '$(RoslynVersion)' == '4.8.0' ">
55-
<DefineConstants>$(DefineConstants);ROSLYN_4_8;ROSLYN_3_11_OR_GREATER;ROSLYN_4_2_OR_GREATER;ROSLYN_4_4_OR_GREATER;ROSLYN_4_6_OR_GREATER;ROSLYN_4_8_OR_GREATER</DefineConstants>
50+
<DefineConstants>$(DefineConstants);ROSLYN_4_8;ROSLYN_3_11_OR_GREATER;ROSLYN_4_4_OR_GREATER;ROSLYN_4_6_OR_GREATER;ROSLYN_4_8_OR_GREATER</DefineConstants>
5651
</PropertyGroup>
5752

5853
<ItemGroup>

‎src/xunit.analyzers.fixes.roslyn42/xunit.analyzers.fixes.roslyn42.csproj‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/xunit.analyzers.roslyn42/xunit.analyzers.roslyn42.csproj‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/xunit.analyzers.tests.roslyn42/xunit.analyzers.tests.roslyn42.csproj‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/xunit.analyzers.tests/Analyzers/X2000/SetEqualityAnalyzerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void TestMethod() {{
140140
await Verify.VerifyAnalyzer(LanguageVersion.CSharp7, new[] { code, customSetAndComparer }, expected);
141141
}
142142

143-
#if ROSLYN_4_2_OR_GREATER // No C# 10 in Roslyn 3.11, so no local functions
143+
#if ROSLYN_4_4_OR_GREATER // No C# 10 in Roslyn 3.11, so no local functions
144144

145145
public static MatrixTheoryData<string, string, string, string> ComparerFunctionData() =>
146146
new(

‎src/xunit.analyzers/Utility/CodeAnalysisExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
using Microsoft.CodeAnalysis.CSharp.Syntax;
77
using Microsoft.CodeAnalysis.Operations;
88

9-
#if !ROSLYN_4_2_OR_GREATER
9+
#if !ROSLYN_4_4_OR_GREATER
1010
using System.Collections.Generic;
1111
#endif
1212

1313
namespace Xunit.Analyzers;
1414

1515
static class CodeAnalysisExtensions
1616
{
17-
#if ROSLYN_4_2_OR_GREATER
17+
#if ROSLYN_4_4_OR_GREATER
1818
[MethodImpl(MethodImplOptions.AggressiveInlining)]
1919
public static IOperation.OperationList Children(this IOperation operation) =>
2020
operation.ChildOperations;

‎src/xunit.analyzers/xunit.analyzers.nuspec‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ Installing this package provides code analyzers to help developers find and fix
2525
<file target="analyzers\dotnet\roslyn3.11\cs\" src="..\xunit.analyzers.fixes.roslyn311\bin\$Configuration$\netstandard2.0\xunit.analyzers.dll" />
2626
<file target="analyzers\dotnet\roslyn3.11\cs\" src="..\xunit.analyzers.fixes.roslyn311\bin\$Configuration$\netstandard2.0\xunit.analyzers.fixes.dll" />
2727

28-
<file target="analyzers\dotnet\roslyn4.2\cs\" src="..\xunit.analyzers.fixes.roslyn42\bin\$Configuration$\netstandard2.0\xunit.analyzers.dll" />
29-
<file target="analyzers\dotnet\roslyn4.2\cs\" src="..\xunit.analyzers.fixes.roslyn42\bin\$Configuration$\netstandard2.0\xunit.analyzers.fixes.dll" />
30-
3128
<file target="analyzers\dotnet\roslyn4.4\cs\" src="..\xunit.analyzers.fixes.roslyn44\bin\$Configuration$\netstandard2.0\xunit.analyzers.dll" />
3229
<file target="analyzers\dotnet\roslyn4.4\cs\" src="..\xunit.analyzers.fixes.roslyn44\bin\$Configuration$\netstandard2.0\xunit.analyzers.fixes.dll" />
3330

‎xunit.analyzers.sln‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "analyzers", "analyzers", "{
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.roslyn311", "src\xunit.analyzers.roslyn311\xunit.analyzers.roslyn311.csproj", "{13521751-D0A2-4A84-B33B-69B1702A7591}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.roslyn42", "src\xunit.analyzers.roslyn42\xunit.analyzers.roslyn42.csproj", "{43BC75E4-B83E-4D7D-9524-DD0B9B0DB2E5}"
25-
EndProject
2624
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.roslyn44", "src\xunit.analyzers.roslyn44\xunit.analyzers.roslyn44.csproj", "{A89F4654-C781-4AA4-A393-D5D96B5E0D2E}"
2725
EndProject
2826
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.roslyn46", "src\xunit.analyzers.roslyn46\xunit.analyzers.roslyn46.csproj", "{6F037C90-CC16-434F-9606-030CB964ED5C}"
@@ -31,8 +29,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fixes", "fixes", "{1E750125
3129
EndProject
3230
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.fixes.roslyn311", "src\xunit.analyzers.fixes.roslyn311\xunit.analyzers.fixes.roslyn311.csproj", "{A2A4B1CE-F18C-49C1-B9ED-8135A20FCABC}"
3331
EndProject
34-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.fixes.roslyn42", "src\xunit.analyzers.fixes.roslyn42\xunit.analyzers.fixes.roslyn42.csproj", "{A99C3FF5-8516-4319-9794-3ED97416648C}"
35-
EndProject
3632
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.fixes.roslyn44", "src\xunit.analyzers.fixes.roslyn44\xunit.analyzers.fixes.roslyn44.csproj", "{7A76CBD5-79FD-4C48-8CF1-13D997C39226}"
3733
EndProject
3834
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.fixes.roslyn46", "src\xunit.analyzers.fixes.roslyn46\xunit.analyzers.fixes.roslyn46.csproj", "{2BA85D1F-069C-431E-BFC3-E4E45D1A6D53}"
@@ -41,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4A3555C8
4137
EndProject
4238
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.tests.roslyn311", "src\xunit.analyzers.tests.roslyn311\xunit.analyzers.tests.roslyn311.csproj", "{4F93916E-6CBE-4C13-8DA5-7A15B8932CCC}"
4339
EndProject
44-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.tests.roslyn42", "src\xunit.analyzers.tests.roslyn42\xunit.analyzers.tests.roslyn42.csproj", "{1BFF7EA4-93B6-4393-A423-144C89F99EC5}"
45-
EndProject
4640
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.tests.roslyn44", "src\xunit.analyzers.tests.roslyn44\xunit.analyzers.tests.roslyn44.csproj", "{35B25ECA-F4B4-452B-9C11-5DFFB79F45EA}"
4741
EndProject
4842
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.analyzers.tests.roslyn46", "src\xunit.analyzers.tests.roslyn46\xunit.analyzers.tests.roslyn46.csproj", "{39499892-5815-4619-9FAC-47410D32A305}"
@@ -69,10 +63,6 @@ Global
6963
{13521751-D0A2-4A84-B33B-69B1702A7591}.Debug|Any CPU.Build.0 = Debug|Any CPU
7064
{13521751-D0A2-4A84-B33B-69B1702A7591}.Release|Any CPU.ActiveCfg = Release|Any CPU
7165
{13521751-D0A2-4A84-B33B-69B1702A7591}.Release|Any CPU.Build.0 = Release|Any CPU
72-
{43BC75E4-B83E-4D7D-9524-DD0B9B0DB2E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73-
{43BC75E4-B83E-4D7D-9524-DD0B9B0DB2E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
74-
{43BC75E4-B83E-4D7D-9524-DD0B9B0DB2E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
75-
{43BC75E4-B83E-4D7D-9524-DD0B9B0DB2E5}.Release|Any CPU.Build.0 = Release|Any CPU
7666
{A89F4654-C781-4AA4-A393-D5D96B5E0D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7767
{A89F4654-C781-4AA4-A393-D5D96B5E0D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
7868
{A89F4654-C781-4AA4-A393-D5D96B5E0D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -85,10 +75,6 @@ Global
8575
{A2A4B1CE-F18C-49C1-B9ED-8135A20FCABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
8676
{A2A4B1CE-F18C-49C1-B9ED-8135A20FCABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
8777
{A2A4B1CE-F18C-49C1-B9ED-8135A20FCABC}.Release|Any CPU.Build.0 = Release|Any CPU
88-
{A99C3FF5-8516-4319-9794-3ED97416648C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
89-
{A99C3FF5-8516-4319-9794-3ED97416648C}.Debug|Any CPU.Build.0 = Debug|Any CPU
90-
{A99C3FF5-8516-4319-9794-3ED97416648C}.Release|Any CPU.ActiveCfg = Release|Any CPU
91-
{A99C3FF5-8516-4319-9794-3ED97416648C}.Release|Any CPU.Build.0 = Release|Any CPU
9278
{7A76CBD5-79FD-4C48-8CF1-13D997C39226}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9379
{7A76CBD5-79FD-4C48-8CF1-13D997C39226}.Debug|Any CPU.Build.0 = Debug|Any CPU
9480
{7A76CBD5-79FD-4C48-8CF1-13D997C39226}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -101,10 +87,6 @@ Global
10187
{4F93916E-6CBE-4C13-8DA5-7A15B8932CCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
10288
{4F93916E-6CBE-4C13-8DA5-7A15B8932CCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
10389
{4F93916E-6CBE-4C13-8DA5-7A15B8932CCC}.Release|Any CPU.Build.0 = Release|Any CPU
104-
{1BFF7EA4-93B6-4393-A423-144C89F99EC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105-
{1BFF7EA4-93B6-4393-A423-144C89F99EC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
106-
{1BFF7EA4-93B6-4393-A423-144C89F99EC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
107-
{1BFF7EA4-93B6-4393-A423-144C89F99EC5}.Release|Any CPU.Build.0 = Release|Any CPU
10890
{35B25ECA-F4B4-452B-9C11-5DFFB79F45EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10991
{35B25ECA-F4B4-452B-9C11-5DFFB79F45EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
11092
{35B25ECA-F4B4-452B-9C11-5DFFB79F45EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -124,17 +106,14 @@ Global
124106
{2FECC9B4-D904-49ED-B312-04065BEABA39} = {3CAA9D63-0806-4CB1-8C32-AA8045E1F441}
125107
{6468A58D-1469-46CF-B467-B4A20D2B85D9} = {2FECC9B4-D904-49ED-B312-04065BEABA39}
126108
{13521751-D0A2-4A84-B33B-69B1702A7591} = {6468A58D-1469-46CF-B467-B4A20D2B85D9}
127-
{43BC75E4-B83E-4D7D-9524-DD0B9B0DB2E5} = {6468A58D-1469-46CF-B467-B4A20D2B85D9}
128109
{A89F4654-C781-4AA4-A393-D5D96B5E0D2E} = {6468A58D-1469-46CF-B467-B4A20D2B85D9}
129110
{6F037C90-CC16-434F-9606-030CB964ED5C} = {6468A58D-1469-46CF-B467-B4A20D2B85D9}
130111
{1E750125-279C-4F03-ABF7-FD8F4800703F} = {2FECC9B4-D904-49ED-B312-04065BEABA39}
131112
{A2A4B1CE-F18C-49C1-B9ED-8135A20FCABC} = {1E750125-279C-4F03-ABF7-FD8F4800703F}
132-
{A99C3FF5-8516-4319-9794-3ED97416648C} = {1E750125-279C-4F03-ABF7-FD8F4800703F}
133113
{7A76CBD5-79FD-4C48-8CF1-13D997C39226} = {1E750125-279C-4F03-ABF7-FD8F4800703F}
134114
{2BA85D1F-069C-431E-BFC3-E4E45D1A6D53} = {1E750125-279C-4F03-ABF7-FD8F4800703F}
135115
{4A3555C8-A35E-4990-B1DB-E86A33F07C29} = {2FECC9B4-D904-49ED-B312-04065BEABA39}
136116
{4F93916E-6CBE-4C13-8DA5-7A15B8932CCC} = {4A3555C8-A35E-4990-B1DB-E86A33F07C29}
137-
{1BFF7EA4-93B6-4393-A423-144C89F99EC5} = {4A3555C8-A35E-4990-B1DB-E86A33F07C29}
138117
{35B25ECA-F4B4-452B-9C11-5DFFB79F45EA} = {4A3555C8-A35E-4990-B1DB-E86A33F07C29}
139118
{39499892-5815-4619-9FAC-47410D32A305} = {4A3555C8-A35E-4990-B1DB-E86A33F07C29}
140119
EndGlobalSection

0 commit comments

Comments
 (0)