JasperFx · jeremydmiller · May 20, 2026 · May 20, 2026 · May 20, 2026 · May 20, 2026
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,4 +16,14 @@
         <PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
     </ItemGroup>
 
+    <!-- Critter Stack 2026 dedupe pillar (jasperfx#214): centralized global-using
+         aliases mapping the old Marten names to the lifted JasperFx / Weasel.Core
+         types. Linked as a shared compile (not via MSBuild <Using>, since
+         ImplicitUsings is off repo-wide) into every JasperFx-referencing project.
+         F# projects (.fsproj), netstandard2.0 (the source generator), and any
+         project setting IncludeMartenDedupeAliases=false are excluded. -->
+    <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj' and '$(IncludeMartenDedupeAliases)' != 'false' and '$(TargetFramework)' != 'netstandard2.0'">
+        <Compile Include="$(MSBuildThisFileDirectory)src/Shared/DedupeAliases.cs" Link="Shared/DedupeAliases.cs" />
+    </ItemGroup>
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -13,13 +13,13 @@
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="FSharp.Core" Version="9.0.100" />
     <PackageVersion Include="FSharp.SystemTextJson" Version="1.3.13" />
-    <PackageVersion Include="JasperFx" Version="2.0.0-alpha.20" />
-    <PackageVersion Include="JasperFx.Events" Version="2.0.0-alpha.21" />
-    <PackageVersion Include="JasperFx.Events.SourceGenerator" Version="2.0.0-alpha.13">
+    <PackageVersion Include="JasperFx" Version="2.0.0-rc.2" />
+    <PackageVersion Include="JasperFx.Events" Version="2.0.0-rc.2" />
+    <PackageVersion Include="JasperFx.Events.SourceGenerator" Version="2.0.0-rc.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="JasperFx.SourceGeneration" Version="2.0.0-alpha.9" />
+    <PackageVersion Include="JasperFx.SourceGeneration" Version="2.0.0-rc.2" />
     <PackageVersion Include="Jil" Version="3.0.0-alpha2" />
     <PackageVersion Include="Lamar" Version="7.1.1" />
     <PackageVersion Include="Lamar.Microsoft.DependencyInjection" Version="15.0.0" />
@@ -66,8 +66,8 @@
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageVersion Include="System.IO.Hashing" Version="10.0.3" />
     <PackageVersion Include="Vogen" Version="7.0.0" />
-    <PackageVersion Include="Weasel.EntityFrameworkCore" Version="9.0.0-alpha.7" />
-    <PackageVersion Include="Weasel.Postgresql" Version="9.0.0-alpha.7" />
+    <PackageVersion Include="Weasel.EntityFrameworkCore" Version="9.0.0-alpha.8" />
+    <PackageVersion Include="Weasel.Postgresql" Version="9.0.0-alpha.8" />
     <PackageVersion Include="WolverineFx.Marten" Version="4.2.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />

diff --git a/src/CoreTests/Bugs/Bug_4190_archived_partitioning_with_strong_typed_id.cs b/src/CoreTests/Bugs/Bug_4190_archived_partitioning_with_strong_typed_id.cs
@@ -89,7 +89,7 @@ public async Task can_create_schema_with_archived_partitioning_conjoined_tenancy
         StoreOptions(opts =>
         {
             opts.Events.UseArchivedStreamPartitioning = true;
-            opts.Events.TenancyStyle = Marten.Storage.TenancyStyle.Conjoined;
+            opts.Events.TenancyStyle = TenancyStyle.Conjoined;
             opts.Events.RegisterTagType<EntityId>("entity");
         });
 

diff --git a/src/CoreTests/GlobalUsings.cs b/src/CoreTests/GlobalUsings.cs
diff --git a/src/CoreTests/retry_mechanism.cs b/src/CoreTests/retry_mechanism.cs
@@ -10,10 +10,6 @@
 using Npgsql;
 using Shouldly;
 using Weasel.Postgresql;
-// OperationRole moved to Weasel.Core per the dedup audit (#4350 / pillar #214).
-// Use a file-local alias to avoid pulling in Weasel.Core wholesale (which
-// would collide with Marten.Internal.Operations.IStorageOperation).
-using OperationRole = Weasel.Core.OperationRole;
 using Xunit;
 
 namespace CoreTests;

diff --git a/src/DaemonTests/GlobalUsings.cs b/src/DaemonTests/GlobalUsings.cs
diff --git a/src/DocumentDbTests/SessionMechanics/UnitOfWorkExtensions.cs b/src/DocumentDbTests/SessionMechanics/UnitOfWorkExtensions.cs
@@ -4,8 +4,6 @@
 using Marten.Linq.SqlGeneration;
 using Marten.Testing.Documents;
 using Shouldly;
-// OperationRole moved to Weasel.Core per the dedup audit (#4350 / pillar #214).
-using OperationRole = Weasel.Core.OperationRole;
 
 namespace DocumentDbTests.SessionMechanics;
 

diff --git a/src/EventSourcingTests/GlobalUsings.cs b/src/EventSourcingTests/GlobalUsings.cs
diff --git a/src/EventSourcingTests/Projections/custom_transformation_of_events.cs b/src/EventSourcingTests/Projections/custom_transformation_of_events.cs
@@ -39,7 +39,7 @@ public async Task updateonly_event_for_custom_view_projection_should_not_create_
         StoreOptions(opts =>
         {
             opts.AutoCreateSchemaObjects = AutoCreate.All;
-            opts.Events.TenancyStyle = Marten.Storage.TenancyStyle.Conjoined;
+            opts.Events.TenancyStyle = TenancyStyle.Conjoined;
             opts.Schema.For<NewsletterSubscription>().MultiTenanted();
             opts.Projections.Add(new NewsletterSubscriptionProjection(), ProjectionLifecycle.Inline);
 

diff --git a/src/EventSourcingTests/start_stream_should_enforce_that_it_is_a_new_stream.cs b/src/EventSourcingTests/start_stream_should_enforce_that_it_is_a_new_stream.cs
@@ -57,7 +57,7 @@ await Should.ThrowAsync<ExistingStreamIdCollisionException>(async () =>
     [Fact]
     public async Task does_not_throw_exception_if_start_stream_is_called_on_existing_stream_with_the_same_tenant_and_tenancy_style_conjoined()
     {
-        StoreOptions(_ => _.Events.TenancyStyle = Marten.Storage.TenancyStyle.Conjoined);
+        StoreOptions(_ => _.Events.TenancyStyle = TenancyStyle.Conjoined);
 
         var stream = Guid.NewGuid();
         const string tenantName = "Tenant";
@@ -82,7 +82,7 @@ await Should.ThrowAsync<ExistingStreamIdCollisionException>(async () =>
     [Fact]
     public async Task does_not_throw_exception_if_start_stream_is_called_on_existing_stream_with_different_tenant_and_tenancy_style_conjoined()
     {
-        StoreOptions(_ => _.Events.TenancyStyle = Marten.Storage.TenancyStyle.Conjoined);
+        StoreOptions(_ => _.Events.TenancyStyle = TenancyStyle.Conjoined);
 
         var stream = Guid.NewGuid();
 

diff --git a/src/IssueService/GlobalUsings.cs b/src/IssueService/GlobalUsings.cs
diff --git a/src/LinqTestsTypes/LinqTestsTypes.csproj b/src/LinqTestsTypes/LinqTestsTypes.csproj
@@ -4,6 +4,9 @@
         <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <!-- References only the base JasperFx package (no Marten / Weasel / JasperFx.Events),
+             so the shared dedupe-alias file would not resolve. Opt out. -->
+        <IncludeMartenDedupeAliases>false</IncludeMartenDedupeAliases>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Marten/DocumentStore.EventStore.cs b/src/Marten/DocumentStore.EventStore.cs
@@ -275,7 +275,7 @@ IEventLoader IEventStore<IDocumentOperations, IQuerySession>.BuildEventLoader(IE
     {
         var filters = buildEventLoaderFilters(filtering).ToArray();
         var inner = new EventLoader(this, (MartenDatabase)database, shardOptions, filters);
-        return new ResilientEventLoader(Options.ResiliencePipeline, inner);
+        return new ResilientEventLoader(Options.ResiliencePipeline, inner, database);
     }
 
     private IEnumerable<ISqlFragment> buildEventLoaderFilters(EventFilterable filterable)

diff --git a/src/Marten/Events/Daemon/HighWater/SkippedEventsCountObserver.cs b/src/Marten/Events/Daemon/HighWater/SkippedEventsCountObserver.cs
diff --git a/src/Marten/Events/Daemon/Internals/EventLoaderException.cs b/src/Marten/Events/Daemon/Internals/EventLoaderException.cs
diff --git a/src/Marten/Events/Daemon/Internals/ResilientEventLoader.cs b/src/Marten/Events/Daemon/Internals/ResilientEventLoader.cs
diff --git a/src/Marten/Events/Dcb/DcbConcurrencyException.cs b/src/Marten/Events/Dcb/DcbConcurrencyException.cs
diff --git a/src/Marten/Events/EventStore.cs b/src/Marten/Events/EventStore.cs
@@ -64,7 +64,7 @@ public void AssignTagWhere(Expression<Func<IEvent, bool>> expression, object tag
             _ => CompoundWhereFragment.And(holder.Fragments)
         };
 
-        var isConjoined = _store.Events.TenancyStyle == Storage.TenancyStyle.Conjoined;
+        var isConjoined = _store.Events.TenancyStyle == TenancyStyle.Conjoined;
 
         if (_store.Events.DcbStorageMode == DcbStorageMode.HStore)
         {

diff --git a/src/Marten/Events/Fetching/FetchNaturalKeyPlan.cs b/src/Marten/Events/Fetching/FetchNaturalKeyPlan.cs
@@ -45,7 +45,7 @@ public FetchNaturalKeyPlan(EventGraph events, NaturalKeyDefinition naturalKey,
         _naturalKeyTableName =
             $"{events.DatabaseSchemaName}.mt_natural_key_{naturalKey.AggregateType.Name.ToLowerInvariant()}";
         _streamIdColumn = events.StreamIdentity == StreamIdentity.AsGuid ? "stream_id" : "stream_key";
-        _isConjoined = events.TenancyStyle == Storage.TenancyStyle.Conjoined;
+        _isConjoined = events.TenancyStyle == TenancyStyle.Conjoined;
         _isGlobal = events.GlobalAggregates.Contains(typeof(TDoc));
     }
 

diff --git a/src/Marten/Events/Querying/StreamStateSelector.cs b/src/Marten/Events/Querying/StreamStateSelector.cs
@@ -14,7 +14,7 @@ namespace Marten.Events.Querying;
 /// <summary>
 ///     Internal base class for generated stream state query handling. Only the
 ///     <c>ConfigureCommand</c> step (which varies by <see cref="JasperFx.Events.StreamIdentity"/>
-///     and <see cref="Marten.Storage.TenancyStyle"/>) is codegen'd; the row read is delegated
+///     and <see cref="JasperFx.MultiTenancy.TenancyStyle"/>) is codegen'd; the row read is delegated
 ///     to <see cref="IEventStorage"/>'s <see cref="ISelector{StreamState}"/> implementation so
 ///     <see cref="DocumentStore"/>'s <c>FetchStreamStateAsync</c> shares the same reader as
 ///     any other call site (e.g. the <c>IEventStore</c> explorer) that needs a

diff --git a/src/Marten/GlobalUsings.cs b/src/Marten/GlobalUsings.cs
diff --git a/src/Marten/IDocumentSchemaResolver.cs b/src/Marten/IDocumentSchemaResolver.cs