diff --git a/StrongTypes.slnx b/StrongTypes.slnx
index 5aeda2f..79137c5 100644
--- a/StrongTypes.slnx
+++ b/StrongTypes.slnx
@@ -31,6 +31,7 @@
   </Folder>
   <Folder Name="/Main Package/">
     <Project Path="src/StrongTypes.Analyzers/StrongTypes.Analyzers.csproj" />
+    <Project Path="src/StrongTypes.Analyzers.CodeFixes/StrongTypes.Analyzers.CodeFixes.csproj" />
     <Project Path="src/StrongTypes.Analyzers.Tests/StrongTypes.Analyzers.Tests.csproj" />
     <Project Path="src/StrongTypes.Benchmarks/StrongTypes.Benchmarks.csproj" />
     <Project Path="src/StrongTypes.SourceGenerators/StrongTypes.SourceGenerators.csproj" />
diff --git a/codecov.yml b/codecov.yml
index 16fc2e9..15aab7b 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -13,7 +13,7 @@ component_management:
       paths: ["src/StrongTypes/**"]
     - component_id: analyzers
       name: StrongTypes.Analyzers
-      paths: ["src/StrongTypes.Analyzers/**"]
+      paths: ["src/StrongTypes.Analyzers/**", "src/StrongTypes.Analyzers.CodeFixes/**"]
     - component_id: efcore
       name: StrongTypes.EfCore
       paths: ["src/StrongTypes.EfCore/**"]
diff --git a/src/StrongTypes.Analyzers/AddEfCorePackageCodeFixProvider.cs b/src/StrongTypes.Analyzers.CodeFixes/AddEfCorePackageCodeFixProvider.cs
similarity index 100%
rename from src/StrongTypes.Analyzers/AddEfCorePackageCodeFixProvider.cs
rename to src/StrongTypes.Analyzers.CodeFixes/AddEfCorePackageCodeFixProvider.cs
diff --git a/src/StrongTypes.Analyzers/AddOpenApiPackageCodeFixProvider.cs b/src/StrongTypes.Analyzers.CodeFixes/AddOpenApiPackageCodeFixProvider.cs
similarity index 100%
rename from src/StrongTypes.Analyzers/AddOpenApiPackageCodeFixProvider.cs
rename to src/StrongTypes.Analyzers.CodeFixes/AddOpenApiPackageCodeFixProvider.cs
diff --git a/src/StrongTypes.Analyzers.CodeFixes/StrongTypes.Analyzers.CodeFixes.csproj b/src/StrongTypes.Analyzers.CodeFixes/StrongTypes.Analyzers.CodeFixes.csproj
new file mode 100644
index 0000000..d04cabe
--- /dev/null
+++ b/src/StrongTypes.Analyzers.CodeFixes/StrongTypes.Analyzers.CodeFixes.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <IsRoslynComponent>true</IsRoslynComponent>
+    <IsPackable>false</IsPackable>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\StrongTypes.Analyzers\StrongTypes.Analyzers.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/StrongTypes.Analyzers/UseBindStrongTypesCodeFixProvider.cs b/src/StrongTypes.Analyzers.CodeFixes/UseBindStrongTypesCodeFixProvider.cs
similarity index 100%
rename from src/StrongTypes.Analyzers/UseBindStrongTypesCodeFixProvider.cs
rename to src/StrongTypes.Analyzers.CodeFixes/UseBindStrongTypesCodeFixProvider.cs
diff --git a/src/StrongTypes.Analyzers.Tests/StrongTypes.Analyzers.Tests.csproj b/src/StrongTypes.Analyzers.Tests/StrongTypes.Analyzers.Tests.csproj
index 09a8d51..3d27985 100644
--- a/src/StrongTypes.Analyzers.Tests/StrongTypes.Analyzers.Tests.csproj
+++ b/src/StrongTypes.Analyzers.Tests/StrongTypes.Analyzers.Tests.csproj
@@ -12,8 +12,8 @@
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
@@ -21,11 +21,15 @@
     <PackageReference Include="xunit.v3" Version="3.2.2" />
   </ItemGroup>
   <ItemGroup>
-    <!-- Reference the analyzer as a plain library so tests can instantiate and drive it directly.
-         Must NOT be applied as an analyzer on this project — we're testing it, not running it. -->
+    <!-- Reference the analyzers and code fixes as plain libraries so tests can instantiate and
+         drive them directly. Must NOT be applied as analyzers on this project — we're testing
+         them, not running them. -->
     <ProjectReference Include="..\StrongTypes.Analyzers\StrongTypes.Analyzers.csproj"
                       ReferenceOutputAssembly="true"
                       OutputItemType="None" />
+    <ProjectReference Include="..\StrongTypes.Analyzers.CodeFixes\StrongTypes.Analyzers.CodeFixes.csproj"
+                      ReferenceOutputAssembly="true"
+                      OutputItemType="None" />
     <ProjectReference Include="..\StrongTypes\StrongTypes.csproj" />
     <!-- Needed to test the "silent when StrongTypes.EfCore is referenced" case. -->
     <ProjectReference Include="..\StrongTypes.Configuration\StrongTypes.Configuration.csproj" />
diff --git a/src/StrongTypes.Analyzers/StrongTypes.Analyzers.csproj b/src/StrongTypes.Analyzers/StrongTypes.Analyzers.csproj
index 64ea48e..adc49a1 100644
--- a/src/StrongTypes.Analyzers/StrongTypes.Analyzers.csproj
+++ b/src/StrongTypes.Analyzers/StrongTypes.Analyzers.csproj
@@ -10,8 +10,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
diff --git a/src/StrongTypes.SourceGenerators/StrongTypes.SourceGenerators.csproj b/src/StrongTypes.SourceGenerators/StrongTypes.SourceGenerators.csproj
index d6d5a6d..dfbd3fd 100644
--- a/src/StrongTypes.SourceGenerators/StrongTypes.SourceGenerators.csproj
+++ b/src/StrongTypes.SourceGenerators/StrongTypes.SourceGenerators.csproj
@@ -10,6 +10,6 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/StrongTypes/StrongTypes.csproj b/src/StrongTypes/StrongTypes.csproj
index aeeb95c..a8b1b57 100644
--- a/src/StrongTypes/StrongTypes.csproj
+++ b/src/StrongTypes/StrongTypes.csproj
@@ -27,14 +27,17 @@
   <ItemGroup>
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
-  <!-- Pack the Roslyn analyzer DLL inside this NuGet package under the standard
-       analyzers/dotnet/cs/ folder so consumers get it automatically without
-       referencing a separate package. Build-dependency on the analyzer project
-       keeps the DLL output in sync without exposing its publicly-unused types. -->
+  <!-- Pack the Roslyn analyzer and code-fix DLLs inside this NuGet package under
+       the standard analyzers/dotnet/cs/ folder so consumers get them automatically
+       without referencing a separate package. Build-dependency on the projects
+       keeps the DLL outputs in sync without exposing their publicly-unused types. -->
   <ItemGroup>
     <ProjectReference Include="..\StrongTypes.Analyzers\StrongTypes.Analyzers.csproj"
                       PrivateAssets="all"
                       ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\StrongTypes.Analyzers.CodeFixes\StrongTypes.Analyzers.CodeFixes.csproj"
+                      PrivateAssets="all"
+                      ReferenceOutputAssembly="false" />
   </ItemGroup>
   <Target Name="IncludeAnalyzerInPackage" BeforeTargets="_GetPackageFiles">
     <ItemGroup>
@@ -42,6 +45,10 @@
             Pack="true"
             PackagePath="analyzers/dotnet/cs"
             Visible="false" />
+      <None Include="..\StrongTypes.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\StrongTypes.Analyzers.CodeFixes.dll"
+            Pack="true"
+            PackagePath="analyzers/dotnet/cs"
+            Visible="false" />
     </ItemGroup>
   </Target>
   <ItemGroup>