diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91bc686..94bf411 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,7 @@ name: Build
 
 env:
   DOTNET_NOLOGO: 1
+  TreatWarningsAsErrors: true
 
 on:
   push:
@@ -18,20 +19,20 @@ jobs:
     env:
       EntityFrameworkCoreVersion: ${{matrix.efcore}}
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-dotnet@v4
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore /p:TreatWarningsAsErrors=true
+      run: dotnet build --configuration Release --no-restore
     - name: Run Tests
       run: dotnet test --configuration Release --no-build
 
   nupkg:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-dotnet@v4
     - name: Generate NuGet Packages
       run: dotnet pack --configuration Release --output nupkg
     - uses: actions/upload-artifact@v4
diff --git a/Directory.Build.props b/Directory.Build.props
index f7d55bc..23029ab 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,7 @@
 		<RepositoryUrl>https://github.com/polyadic/funcky-efcore</RepositoryUrl>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Messerli.CodeStyle" PrivateAssets="all" />
+		<PackageReference Include="Polyadic.CodeStyle" PrivateAssets="all" />
 		<PackageReference Include="Funcky.Analyzers" PrivateAssets="all" />
 	</ItemGroup>
 	<PropertyGroup Label="Code Style">
@@ -19,4 +19,7 @@
 		<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 	</PropertyGroup>
+	<PropertyGroup>
+		<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
+	</PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1cda610..011f8b9 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,7 +9,7 @@
 	</ItemGroup>
 	<ItemGroup Label="Build Dependencies">
 		<PackageVersion Include="Funcky.Analyzers" Version="1.4.0" />
-		<PackageVersion Include="Messerli.CodeStyle" Version="2.3.1" />
+		<PackageVersion Include="Polyadic.CodeStyle" Version="1.0.0" />
 		<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
 	</ItemGroup>
 	<ItemGroup Label="Test Dependencies">
diff --git a/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj b/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj
index 436afe7..a4ad29f 100644
--- a/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj
+++ b/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj
@@ -8,6 +8,7 @@
         <Description>Interoperability between Funcky and EF Core</Description>
         <PackageTags>Functional Monad EFCore EntityFramework</PackageTags>
         <Version>1.3.0</Version>
+        <PackageValidationBaselineVersion>1.0.0</PackageValidationBaselineVersion>
         <PackageReadmeFile>readme.md</PackageReadmeFile>
     </PropertyGroup>
     <PropertyGroup Label="Symbols">
@@ -18,6 +19,7 @@
     <PropertyGroup Label="Analyzers">
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
         <AnalysisModeReliability>All</AnalysisModeReliability>
+        <EnablePackageValidation>true</EnablePackageValidation>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Funcky" />
diff --git a/Funcky.EntityFrameworkCore/PublicAPI.Shipped.txt b/Funcky.EntityFrameworkCore/PublicAPI.Shipped.txt
index ab058de..25760c0 100644
--- a/Funcky.EntityFrameworkCore/PublicAPI.Shipped.txt
+++ b/Funcky.EntityFrameworkCore/PublicAPI.Shipped.txt
@@ -1 +1,8 @@
 #nullable enable
+Funcky.Extensions.EntityFrameworkQueryableExtensions
+static Funcky.Extensions.EntityFrameworkQueryableExtensions.FirstOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Linq.Expressions.Expression<System.Func<TSource, bool>!>! predicate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
+static Funcky.Extensions.EntityFrameworkQueryableExtensions.FirstOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
+static Funcky.Extensions.EntityFrameworkQueryableExtensions.LastOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Linq.Expressions.Expression<System.Func<TSource, bool>!>! predicate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
+static Funcky.Extensions.EntityFrameworkQueryableExtensions.LastOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
+static Funcky.Extensions.EntityFrameworkQueryableExtensions.SingleOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Linq.Expressions.Expression<System.Func<TSource, bool>!>! predicate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
+static Funcky.Extensions.EntityFrameworkQueryableExtensions.SingleOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
diff --git a/Funcky.EntityFrameworkCore/PublicAPI.Unshipped.txt b/Funcky.EntityFrameworkCore/PublicAPI.Unshipped.txt
index 25760c0..ab058de 100644
--- a/Funcky.EntityFrameworkCore/PublicAPI.Unshipped.txt
+++ b/Funcky.EntityFrameworkCore/PublicAPI.Unshipped.txt
@@ -1,8 +1 @@
 #nullable enable
-Funcky.Extensions.EntityFrameworkQueryableExtensions
-static Funcky.Extensions.EntityFrameworkQueryableExtensions.FirstOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Linq.Expressions.Expression<System.Func<TSource, bool>!>! predicate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
-static Funcky.Extensions.EntityFrameworkQueryableExtensions.FirstOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
-static Funcky.Extensions.EntityFrameworkQueryableExtensions.LastOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Linq.Expressions.Expression<System.Func<TSource, bool>!>! predicate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
-static Funcky.Extensions.EntityFrameworkQueryableExtensions.LastOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
-static Funcky.Extensions.EntityFrameworkQueryableExtensions.SingleOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Linq.Expressions.Expression<System.Func<TSource, bool>!>! predicate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!
-static Funcky.Extensions.EntityFrameworkQueryableExtensions.SingleOrNoneAsync<TSource>(this System.Linq.IQueryable<TSource>! source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Funcky.Monads.Option<TSource>>!