Merge pull request #811 from polyadic/update-analyzers

tautropfli · web-flow · commit f2ed2904e120 · 2025-01-21T09:58:48.000+01:00
diff --git a/Analyzers.props b/Analyzers.props
@@ -4,5 +4,6 @@
 		<ProjectReference Include="..\Funcky.Analyzers\Funcky.Analyzers\Funcky.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
 		<ProjectReference Include="..\Funcky.Analyzers\Funcky.Analyzers.CodeFixes\Funcky.Analyzers.CodeFixes.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
 		<ProjectReference Include="..\Funcky.Analyzers\Funcky.BuiltinAnalyzers\Funcky.BuiltinAnalyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
+		<ProjectReference Include="..\Funcky.Analyzers\Funcky.BuiltinAnalyzers.CodeFixes\Funcky.BuiltinAnalyzers.CodeFixes.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
 	</ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -28,10 +28,10 @@
 	<ItemGroup Label="Analyzer">
 		<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.0.1" />
 		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
-		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
-		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.0" />
-		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.0" />
-		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" Version="1.1.0" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" /><!-- We explicitly reference these analyzers to get the latest version even though we might not use the latest version of Microsoft.CodeAnalysis everywhere. -->
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.1.2" />
 		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
 		<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.0.1597"/>
 	</ItemGroup>
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj b/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj
@@ -16,16 +16,17 @@
         <PackageReference Include="xunit" />
         <PackageReference Include="xunit.runner.visualstudio" />
         <PackageReference Include="Microsoft.CodeAnalysis" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\Funcky\Funcky.csproj" />
         <ProjectReference Include="..\Funcky.Analyzers.CodeFixes\Funcky.Analyzers.CodeFixes.csproj" />
         <ProjectReference Include="..\Funcky.Analyzers\Funcky.Analyzers.csproj" />
         <ProjectReference Include="..\Funcky.BuiltinAnalyzers\Funcky.BuiltinAnalyzers.csproj" />
+        <ProjectReference Include="..\Funcky.BuiltinAnalyzers.CodeFixes\Funcky.BuiltinAnalyzers.CodeFixes.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1+Test.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1+Test.cs
@@ -1,13 +1,13 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
+using Microsoft.CodeAnalysis.Testing;
 
 namespace Funcky.Analyzers.Test;
 
 public static partial class CSharpAnalyzerVerifier<TAnalyzer>
     where TAnalyzer : DiagnosticAnalyzer, new()
 {
-    public class Test : CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>
+    public class Test : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
     {
         public Test()
         {
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1.cs
@@ -2,7 +2,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Funcky.Analyzers.Test;
 
@@ -11,15 +10,15 @@ public static partial class CSharpAnalyzerVerifier<TAnalyzer>
 {
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic()"/>
     public static DiagnosticResult Diagnostic()
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic();
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic();
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(string)"/>
     public static DiagnosticResult Diagnostic(string diagnosticId)
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(diagnosticId);
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(diagnosticId);
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
     public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(descriptor);
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(descriptor);
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
     public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2+Test.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2+Test.cs
@@ -1,15 +1,15 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
+using Microsoft.CodeAnalysis.Testing;
 
 namespace Funcky.Analyzers.Test;
 
 public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
     where TAnalyzer : DiagnosticAnalyzer, new()
     where TCodeFix : CodeFixProvider, new()
 {
-    public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
+    public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
     {
         public Test()
         {
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2.cs
@@ -4,7 +4,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Funcky.Analyzers.Test;
 
@@ -14,15 +13,15 @@ public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
 {
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic()"/>
     public static DiagnosticResult Diagnostic()
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic();
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic();
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(string)"/>
     public static DiagnosticResult Diagnostic(string diagnosticId)
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(diagnosticId);
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic(diagnosticId);
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
     public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(descriptor);
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic(descriptor);
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
     public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs
@@ -1,13 +1,13 @@
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
+using Microsoft.CodeAnalysis.Testing;
 
 namespace Funcky.Analyzers.Test;
 
 public static partial class CSharpCodeRefactoringVerifier<TCodeRefactoring>
     where TCodeRefactoring : CodeRefactoringProvider, new()
 {
-    public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, XUnitVerifier>
+    public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, DefaultVerifier>
     {
         public Test()
         {
diff --git a/Funcky.Analyzers/Funcky.Analyzers/AlternativeMonadAnalyzer/AlternativeMonadAnalyzer.GetOrElse.cs b/Funcky.Analyzers/Funcky.Analyzers/AlternativeMonadAnalyzer/AlternativeMonadAnalyzer.GetOrElse.cs
@@ -7,7 +7,7 @@ namespace Funcky.Analyzers;
 
 public partial class AlternativeMonadAnalyzer
 {
-    public static readonly DiagnosticDescriptor PreferGetOrElse = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor PreferGetOrElse = new(
         id: $"{DiagnosticName.Prefix}{DiagnosticName.Usage}05",
         title: $"Prefer {GetOrElseMethodName} over {MatchMethodName}",
         messageFormat: $"Prefer {GetOrElseMethodName} over {MatchMethodName}",
diff --git a/Funcky.Analyzers/Funcky.Analyzers/AlternativeMonadAnalyzer/AlternativeMonadAnalyzer.OrElse.cs b/Funcky.Analyzers/Funcky.Analyzers/AlternativeMonadAnalyzer/AlternativeMonadAnalyzer.OrElse.cs
@@ -7,7 +7,7 @@ namespace Funcky.Analyzers;
 
 public partial class AlternativeMonadAnalyzer
 {
-    public static readonly DiagnosticDescriptor PreferOrElse = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor PreferOrElse = new(
         id: $"{DiagnosticName.Prefix}{DiagnosticName.Usage}06",
         title: $"Prefer {OrElseMethodName} over {MatchMethodName}",
         messageFormat: $"Prefer {OrElseMethodName} over {MatchMethodName}",
diff --git a/Funcky.Analyzers/Funcky.Analyzers/AlternativeMonadAnalyzer/AlternativeMonadAnalyzer.SelectMany.cs b/Funcky.Analyzers/Funcky.Analyzers/AlternativeMonadAnalyzer/AlternativeMonadAnalyzer.SelectMany.cs
@@ -7,7 +7,7 @@ namespace Funcky.Analyzers;
 
 public partial class AlternativeMonadAnalyzer
 {
-    public static readonly DiagnosticDescriptor PreferSelectMany = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor PreferSelectMany = new(
         id: $"{DiagnosticName.Prefix}{DiagnosticName.Usage}07",
         title: $"Prefer {SelectManyMethodName} over {MatchMethodName}",
         messageFormat: $"Prefer {SelectManyMethodName} over {MatchMethodName}",
diff --git a/Funcky.Analyzers/Funcky.Analyzers/AlternativeMonadAnalyzer/AlternativeMonadAnalyzer.ToNullable.cs b/Funcky.Analyzers/Funcky.Analyzers/AlternativeMonadAnalyzer/AlternativeMonadAnalyzer.ToNullable.cs
@@ -8,7 +8,7 @@ namespace Funcky.Analyzers;
 
 public partial class AlternativeMonadAnalyzer
 {
-    public static readonly DiagnosticDescriptor PreferToNullable = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor PreferToNullable = new(
         id: $"{DiagnosticName.Prefix}{DiagnosticName.Usage}08",
         title: $"Prefer {ToNullableMethodName} over {MatchMethodName}",
         messageFormat: $"Prefer {ToNullableMethodName} over {MatchMethodName}",
diff --git a/Funcky.Analyzers/Funcky.Analyzers/EnumerableRepeatNeverAnalyzer.cs b/Funcky.Analyzers/Funcky.Analyzers/EnumerableRepeatNeverAnalyzer.cs
@@ -21,7 +21,7 @@ public sealed class EnumerableRepeatNeverAnalyzer : DiagnosticAnalyzer
     private static readonly LocalizableString MessageFormat = LoadFromResource(nameof(EnumerableRepeatNeverAnalyzerMessageFormat));
     private static readonly LocalizableString Description = LoadFromResource(nameof(EnumerableRepeatNeverAnalyzerDescription));
 
-    private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
+    private static readonly DiagnosticDescriptor Rule = new(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
 
diff --git a/Funcky.Analyzers/Funcky.Analyzers/EnumerableRepeatOnceAnalyzer.cs b/Funcky.Analyzers/Funcky.Analyzers/EnumerableRepeatOnceAnalyzer.cs
@@ -21,7 +21,7 @@ public sealed class EnumerableRepeatOnceAnalyzer : DiagnosticAnalyzer
     private static readonly LocalizableString MessageFormat = LoadFromResource(nameof(EnumerableRepeatOnceAnalyzerMessageFormat));
     private static readonly LocalizableString Description = LoadFromResource(nameof(EnumerableRepeatOnceAnalyzerDescription));
 
-    private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
+    private static readonly DiagnosticDescriptor Rule = new(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
 
diff --git a/Funcky.Analyzers/Funcky.Analyzers/Funcky.Analyzers.csproj b/Funcky.Analyzers/Funcky.Analyzers/Funcky.Analyzers.csproj
@@ -10,6 +10,7 @@
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
         <AnalysisLevel>5</AnalysisLevel>
+        <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Funcky.Analyzers/Funcky.Analyzers/JoinToStringEmptyAnalyzer.cs b/Funcky.Analyzers/Funcky.Analyzers/JoinToStringEmptyAnalyzer.cs
@@ -22,7 +22,7 @@ public sealed class JoinToStringEmptyAnalyzer : DiagnosticAnalyzer
 
     private static readonly LocalizableString Description = LoadFromResource(nameof(JoinToStringEmptyAnalyzerDescription));
 
-    private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
+    private static readonly DiagnosticDescriptor Rule = new(DiagnosticId, Title, MessageFormat, Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description);
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
 
diff --git a/Funcky.Analyzers/Funcky.Analyzers/NonDefaultableAnalyzer.cs b/Funcky.Analyzers/Funcky.Analyzers/NonDefaultableAnalyzer.cs
@@ -8,7 +8,7 @@ namespace Funcky.Analyzers;
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class NonDefaultableAnalyzer : DiagnosticAnalyzer
 {
-    public static readonly DiagnosticDescriptor DoNotUseDefault = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor DoNotUseDefault = new(
         id: $"{DiagnosticName.Prefix}{DiagnosticName.Usage}09",
         title: "Do not use default to instantiate this type",
         messageFormat: "Do not use default(...) to instantiate '{0}'",
diff --git a/Funcky.Analyzers/Funcky.Analyzers/UseWithArgumentNamesAnalyzer.cs b/Funcky.Analyzers/Funcky.Analyzers/UseWithArgumentNamesAnalyzer.cs
@@ -14,7 +14,7 @@ public sealed class UseWithArgumentNamesAnalyzer : DiagnosticAnalyzer
 
     private const string AttributeFullName = "Funcky.CodeAnalysis.UseWithArgumentNamesAttribute";
 
-    private static readonly DiagnosticDescriptor Descriptor = new DiagnosticDescriptor(
+    private static readonly DiagnosticDescriptor Descriptor = new(
         id: DiagnosticId,
         title: Resources.UseWithArgumentNamesAnalyzerAnalyzerTitle,
         messageFormat: Resources.UseWithArgumentNamesAnalyzerMessageFormat,
diff --git a/Funcky.Analyzers/Funcky.BuiltinAnalyzers.CodeFixes/Funcky.BuiltinAnalyzers.CodeFixes.csproj b/Funcky.Analyzers/Funcky.BuiltinAnalyzers.CodeFixes/Funcky.BuiltinAnalyzers.CodeFixes.csproj
@@ -0,0 +1,19 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <IsPackable>false</IsPackable>
+        <LangVersion>preview</LangVersion>
+        <Nullable>enable</Nullable>
+        <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+        <RootNamespace>Funcky.BuiltinAnalyzers</RootNamespace>
+    </PropertyGroup>
+    <ItemGroup>
+        <!-- We use 2.7.0 for compatibility with VS 2019 and .NET Core SDK 3.x.
+             See https://docs.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support for VS compatibility.-->
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="3.7.0" />
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\Funcky.BuiltinAnalyzers\CompilationExtensions.cs" />
+        <Compile Include="..\Funcky.BuiltinAnalyzers\WellKnownMemberNames.cs" />
+    </ItemGroup>
+</Project>
diff --git a/Funcky.Analyzers/Funcky.BuiltinAnalyzers.CodeFixes/OptionNoneInvocationCodeFix.cs b/Funcky.Analyzers/Funcky.BuiltinAnalyzers.CodeFixes/OptionNoneInvocationCodeFix.cs
diff --git a/Funcky.Analyzers/Funcky.BuiltinAnalyzers/Funcky.BuiltinAnalyzers.csproj b/Funcky.Analyzers/Funcky.BuiltinAnalyzers/Funcky.BuiltinAnalyzers.csproj
@@ -4,13 +4,12 @@
         <IsPackable>false</IsPackable>
         <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
+        <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     </PropertyGroup>
     <ItemGroup>
         <!-- We use 2.7.0 for compatibility with VS 2019 and .NET Core SDK 3.x.
              See https://docs.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support for VS compatibility.-->
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="3.7.0" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="3.7.0" />
-        <!-- Microsoft.CodeAnalysis.CSharp 3.7.0 comes with an older, buggy version of Microsoft.CodeAnalysis.Analyzers -->
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" VersionOverride="3.3.3" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
     </ItemGroup>
 </Project>
diff --git a/Funcky.Analyzers/Funcky.BuiltinAnalyzers/TryGetValueAnalyzer.cs b/Funcky.Analyzers/Funcky.BuiltinAnalyzers/TryGetValueAnalyzer.cs
@@ -9,7 +9,7 @@ namespace Funcky.BuiltinAnalyzers;
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class TryGetValueAnalyzer : DiagnosticAnalyzer
 {
-    private static readonly DiagnosticDescriptor Descriptor = new DiagnosticDescriptor(
+    private static readonly DiagnosticDescriptor Descriptor = new(
         id: "λ0001",
         title: "Disallowed use of TryGetValue",
         messageFormat: "Disallowed use of TryGetValue",
diff --git a/Funcky.SourceGenerator/Funcky.SourceGenerator.csproj b/Funcky.SourceGenerator/Funcky.SourceGenerator.csproj
@@ -10,7 +10,7 @@
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" VersionOverride="3.11.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="4.12.0" />
         <PackageReference Include="PolySharp" PrivateAssets="all" />
     </ItemGroup>
diff --git a/Funcky.sln b/Funcky.sln
@@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Config", "Build Confi
 		GlobalUsings.Test.props = GlobalUsings.Test.props
 		NuGet.config = NuGet.config
 		typos.toml = typos.toml
+		Analyzers.props = Analyzers.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Funcky.Xunit", "Funcky.Xunit\Funcky.Xunit.csproj", "{F2E98B0D-CC17-4576-89DE-065FF475BE6E}"
@@ -61,6 +62,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Funcky.FsCheck", "Funcky.Fs
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Funcky.TrimmingTest", "Funcky.TrimmingTest\Funcky.TrimmingTest.csproj", "{F35DB62D-22A8-41E8-B3BB-CD9064974190}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Funcky.BuiltinAnalyzers.CodeFixes", "Funcky.Analyzers\Funcky.BuiltinAnalyzers.CodeFixes\Funcky.BuiltinAnalyzers.CodeFixes.csproj", "{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -135,6 +138,10 @@ Global
 		{F35DB62D-22A8-41E8-B3BB-CD9064974190}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F35DB62D-22A8-41E8-B3BB-CD9064974190}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F35DB62D-22A8-41E8-B3BB-CD9064974190}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -148,6 +155,7 @@ Global
 		{1EE94F73-967E-49D1-BA68-EA2783EA0244} = {18ED7503-3198-455D-861E-84841C48069C}
 		{C1412F64-1D24-4245-8DC7-F4AF01815F58} = {18ED7503-3198-455D-861E-84841C48069C}
 		{539432B9-1257-4237-91FD-5D237855765E} = {BBE35279-7416-4B9D-B89D-B6D1FF369681}
+		{82BAB120-6F95-4B5A-83EA-C7BCFB1C03C2} = {BBE35279-7416-4B9D-B89D-B6D1FF369681}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1F800283-D010-4227-94C9-09C02B0411DE}
diff --git a/Funcky/Funcky.csproj b/Funcky/Funcky.csproj
@@ -50,6 +50,7 @@
         <None Include="build/Funcky.targets" Pack="true" PackagePath="buildTransitive" />
         <None Include="..\README.md" Pack="true" PackagePath="\" />
         <None Include="$(ArtifactsPath)\bin\Funcky.BuiltinAnalyzers\$(Configuration.ToLowerInvariant())\Funcky.BuiltinAnalyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Link="analyzers/dotnet/cs/%(Filename)%(Extension)" />
+        <None Include="$(ArtifactsPath)\bin\Funcky.BuiltinAnalyzers.CodeFixes\$(Configuration.ToLowerInvariant())\Funcky.BuiltinAnalyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Link="analyzers/dotnet/cs/%(Filename)%(Extension)" />
         <None Include="..\Funcky.Analyzers\Funcky.Analyzers.Package\tools\*.ps1" Pack="true" PackagePath="tools\%(FileName)%(Extension)" Link="analyzers/dotnet/cs/%(Filename)%(Extension)" />
     </ItemGroup>
     <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`using Microsoft.CodeAnalysis.CSharp.Testing;`
`2`	`2`	`using Microsoft.CodeAnalysis.Diagnostics;`
`3`		`-using Microsoft.CodeAnalysis.Testing.Verifiers;`
	`3`	`+using Microsoft.CodeAnalysis.Testing;`
`4`	`4`
`5`	`5`	`namespace Funcky.Analyzers.Test;`
`6`	`6`
`7`	`7`	`public static partial class CSharpAnalyzerVerifier<TAnalyzer>`
`8`	`8`	`where TAnalyzer : DiagnosticAnalyzer, new()`
`9`	`9`	`{`
`10`		`- public class Test : CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>`
	`10`	`+ public class Test : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>`
`11`	`11`	`{`
`12`	`12`	`public Test()`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`using Microsoft.CodeAnalysis.CodeFixes;`
`2`	`2`	`using Microsoft.CodeAnalysis.CSharp.Testing;`
`3`	`3`	`using Microsoft.CodeAnalysis.Diagnostics;`
`4`		`-using Microsoft.CodeAnalysis.Testing.Verifiers;`
	`4`	`+using Microsoft.CodeAnalysis.Testing;`
`5`	`5`
`6`	`6`	`namespace Funcky.Analyzers.Test;`
`7`	`7`
`8`	`8`	`public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>`
`9`	`9`	`where TAnalyzer : DiagnosticAnalyzer, new()`
`10`	`10`	`where TCodeFix : CodeFixProvider, new()`
`11`	`11`	`{`
`12`		`- public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>`
	`12`	`+ public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>`
`13`	`13`	`{`
`14`	`14`	`public Test()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`using Microsoft.CodeAnalysis.CodeRefactorings;`
`2`	`2`	`using Microsoft.CodeAnalysis.CSharp.Testing;`
`3`		`-using Microsoft.CodeAnalysis.Testing.Verifiers;`
	`3`	`+using Microsoft.CodeAnalysis.Testing;`
`4`	`4`
`5`	`5`	`namespace Funcky.Analyzers.Test;`
`6`	`6`
`7`	`7`	`public static partial class CSharpCodeRefactoringVerifier<TCodeRefactoring>`
`8`	`8`	`where TCodeRefactoring : CodeRefactoringProvider, new()`
`9`	`9`	`{`
`10`		`- public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, XUnitVerifier>`
	`10`	`+ public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, DefaultVerifier>`
`11`	`11`	`{`
`12`	`12`	`public Test()`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Funcky.Analyzers;`
`7`	`7`
`8`	`8`	`public partial class AlternativeMonadAnalyzer`
`9`	`9`	`{`
`10`		`- public static readonly DiagnosticDescriptor PreferGetOrElse = new DiagnosticDescriptor(`
	`10`	`+ public static readonly DiagnosticDescriptor PreferGetOrElse = new(`
`11`	`11`	`id: $"{DiagnosticName.Prefix}{DiagnosticName.Usage}05",`
`12`	`12`	`title: $"Prefer {GetOrElseMethodName} over {MatchMethodName}",`
`13`	`13`	`messageFormat: $"Prefer {GetOrElseMethodName} over {MatchMethodName}",`