Fix some tests and throw an exception when trying to register an object in one domain that belongs to a different domain.

rstam · rstam · commit 76665ecbfc9e · 2025-09-18T17:21:52.000-07:00
diff --git a/src/MongoDB.Bson/Serialization/BsonClassMap.cs b/src/MongoDB.Bson/Serialization/BsonClassMap.cs
@@ -29,7 +29,7 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Represents a mapping between a class and a BSON document.
     /// </summary>
-    public class BsonClassMap
+    public class BsonClassMap : IHasSerializationDomain
     {
         // private fields
         private readonly Type _classType;
@@ -263,6 +263,8 @@ internal int ExtraElementsMemberMapIndex
 
         internal IBsonSerializationDomain SerializationDomain => _serializationDomain;
 
+        IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
         // public static methods
         /// <summary>
         /// Gets all registered class maps.
@@ -858,7 +860,7 @@ public BsonMemberMap MapMember(MemberInfo memberInfo)
             var memberMap = _declaredMemberMaps.Find(m => m.MemberInfo == memberInfo);
             if (memberMap == null)
             {
-                memberMap = new BsonMemberMap(this, memberInfo);
+                memberMap = new BsonMemberMap(_serializationDomain, this, memberInfo);
                 _declaredMemberMaps.Add(memberMap);
             }
             return memberMap;
diff --git a/src/MongoDB.Bson/Serialization/BsonClassMapRegistry.cs b/src/MongoDB.Bson/Serialization/BsonClassMapRegistry.cs
@@ -20,7 +20,7 @@
 
 namespace MongoDB.Bson.Serialization;
 
-internal class BsonClassMapRegistry : IBsonClassMapRegistry
+internal class BsonClassMapRegistry : IBsonClassMapRegistry, IHasSerializationDomain
 {
     // private fields
     private readonly Dictionary<Type, BsonClassMap> _classMaps = new();
@@ -31,6 +31,8 @@ public BsonClassMapRegistry(BsonSerializationDomain serializationDomain)
         _serializationDomain = serializationDomain;
     }
 
+    IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
     /// <summary>
     /// Gets all registered class maps.
     /// </summary>
@@ -142,7 +144,7 @@ public BsonClassMap<TClass> RegisterClassMap<TClass>()
     /// <returns>The class map.</returns>
     public BsonClassMap<TClass> RegisterClassMap<TClass>(Action<BsonClassMap<TClass>> classMapInitializer)
     {
-        var classMap = new BsonClassMap<TClass>(classMapInitializer);
+        var classMap = new BsonClassMap<TClass>(_serializationDomain, classMapInitializer);
         RegisterClassMap(classMap);
         return classMap;
     }
@@ -158,6 +160,11 @@ public void RegisterClassMap(BsonClassMap classMap)
             throw new ArgumentNullException("classMap");
         }
 
+        if (classMap.SerializationDomain != _serializationDomain)
+        {
+            throw new ArgumentException($"Expected class map to be for serialization domain {_serializationDomain.Name}, but was for serialization domain {classMap.SerializationDomain.Name}.");
+        }
+
         _serializationDomain.ConfigLock.EnterWriteLock();
         try
         {
diff --git a/src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs b/src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs
@@ -21,7 +21,7 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Represents the class map serialization provider.
     /// </summary>
-    internal class BsonClassMapSerializationProvider : BsonSerializationProviderBase
+    internal class BsonClassMapSerializationProvider : BsonSerializationProviderBase, IHasSerializationDomain
     {
         private readonly IBsonSerializationDomain _serializationDomain;
 
diff --git a/src/MongoDB.Bson/Serialization/BsonMemberMap.cs b/src/MongoDB.Bson/Serialization/BsonMemberMap.cs
@@ -23,7 +23,7 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Represents the mapping between a field or property and a BSON element.
     /// </summary>
-    public class BsonMemberMap
+    public class BsonMemberMap : IHasSerializationDomain
     {
         // private fields
         private readonly BsonClassMap _classMap;
@@ -141,6 +141,8 @@ public Func<object, object> Getter
             }
         }
 
+        IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
         /// <summary>
         /// Gets the setter function.
         /// </summary>
diff --git a/src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs b/src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs
@@ -692,6 +692,11 @@ public void RegisterDiscriminatorConvention(Type type, IDiscriminatorConvention
             {
                 if (!_discriminatorConventions.ContainsKey(type))
                 {
+                    if (convention is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != this)
+                    {
+                        throw new ArgumentException($"Expected discriminator convention to be for serialization domain {Name} but was for serialization domain {hasSerializationDomain.SerializationDomain.Name}.");
+                    }
+
                     _discriminatorConventions.Add(type, convention);
                 }
                 else
diff --git a/src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs b/src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs
@@ -22,7 +22,7 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Default, global implementation of an <see cref="IBsonSerializerRegistry"/>.
     /// </summary>
-    public sealed class BsonSerializerRegistry : IBsonSerializerRegistry
+    public sealed class BsonSerializerRegistry : IBsonSerializerRegistry, IHasSerializationDomain
     {
         // private fields
         private readonly ConcurrentDictionary<Type, IBsonSerializer> _cache;
@@ -49,6 +49,8 @@ internal BsonSerializerRegistry(IBsonSerializationDomain domain)
 
         internal IBsonSerializationDomain SerializationDomain => _serializationDomain;
 
+        IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
         // public methods
         /// <summary>
         /// Gets the serializer for the specified <paramref name="type" />.
@@ -103,6 +105,10 @@ public void RegisterSerializer(Type type, IBsonSerializer serializer)
                 throw new ArgumentNullException("serializer");
             }
             EnsureRegisteringASerializerForThisTypeIsAllowed(type);
+            if (serializer is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != _serializationDomain)
+            {
+                throw new ArgumentException($"Expected serializer to be for serialization domain {_serializationDomain.Name} but was for  serialization domain {hasSerializationDomain.SerializationDomain.Name}.");
+            }
 
             if (!_cache.TryAdd(type, serializer))
             {
@@ -143,6 +149,10 @@ public bool TryRegisterSerializer(Type type, IBsonSerializer serializer)
                 throw new ArgumentNullException(nameof(serializer));
             }
             EnsureRegisteringASerializerForThisTypeIsAllowed(type);
+            if (serializer is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != _serializationDomain)
+            {
+                throw new ArgumentException($"Expected serializer to be for serialization domain {_serializationDomain.Name} but was for  serialization domain {hasSerializationDomain.SerializationDomain.Name}.");
+            }
 
             if (_cache.TryAdd(type, serializer))
             {
@@ -179,6 +189,11 @@ private IBsonSerializer CreateSerializer(Type type)
 
                 if (serializer != null)
                 {
+                    if (serializer is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != _serializationDomain)
+                    {
+                        throw new ArgumentException($"Expected serializer to be for serialization domain {_serializationDomain.Name} but was for serialization domain {hasSerializationDomain.SerializationDomain.Name}.", "serializer");
+                    }
+
                     return serializer;
                 }
             }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/ConventionPack.cs b/src/MongoDB.Bson/Serialization/Conventions/ConventionPack.cs
@@ -22,17 +22,24 @@ namespace MongoDB.Bson.Serialization.Conventions
     /// <summary>
     /// A mutable pack of conventions.
     /// </summary>
-    public class ConventionPack : IConventionPack, IEnumerable<IConvention>
+    public class ConventionPack : IConventionPack, IEnumerable<IConvention>, IHasSerializationDomain
     {
         // private fields
         private readonly List<IConvention> _conventions;
+        private readonly IBsonSerializationDomain _serializationDomain;
 
         // constructors
         /// <summary>
         /// Initializes a new instance of the <see cref="ConventionPack" /> class.
         /// </summary>
         public ConventionPack()
+            : this(BsonSerializationDomain.Default)
         {
+        }
+
+        internal ConventionPack(IBsonSerializationDomain serializationDomain)
+        {
+            _serializationDomain = serializationDomain;
             _conventions = new List<IConvention>();
         }
 
@@ -45,6 +52,8 @@ public IEnumerable<IConvention> Conventions
             get { return _conventions; }
         }
 
+        IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
         // public methods
         /// <summary>
         /// Adds the specified convention.
diff --git a/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistryInstance.cs b/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistryInstance.cs
@@ -18,7 +18,7 @@
 
 namespace MongoDB.Bson.Serialization.Conventions
 {
-    internal class ConventionRegistryInstance : IConventionRegistry
+    internal class ConventionRegistryInstance : IConventionRegistry, IHasSerializationDomain
     {
         private readonly List<ConventionPackContainer> _conventionPacks = new();
         private readonly object _lock = new();
@@ -34,6 +34,8 @@ internal ConventionRegistryInstance(IBsonSerializationDomain serializationDomain
             Register("__attributes__", AttributeConventionPack.Instance, t => true);
         }
 
+        IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
         // public static methods
         /// <summary>
         /// Looks up the effective set of conventions that apply to a type.
@@ -49,7 +51,7 @@ public IConventionPack Lookup(Type type)
 
             lock (_lock)
             {
-                var pack = new ConventionPack();
+                var pack = new ConventionPack(_serializationDomain);
 
                 // append any attribute packs (usually just one) at the end so attributes are processed last
                 var attributePacks = new List<IConventionPack>();
@@ -101,6 +103,11 @@ public void Register(string name, IConventionPack conventions, Func<Type, bool>
                 throw new ArgumentNullException("filter");
             }
 
+            if (conventions is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != _serializationDomain)
+            {
+                throw new ArgumentException($"Expected convention pack to be for serialization domain {_serializationDomain.Name}, but was for serialization domain {hasSerializationDomain.SerializationDomain.Name}.");
+            }
+
             lock (_lock)
             {
                 var container = new ConventionPackContainer
diff --git a/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs
@@ -21,7 +21,7 @@ namespace MongoDB.Bson.Serialization.Conventions
     /// <summary>
     /// A convention that looks up an id generator for the id member.
     /// </summary>
-    public class LookupIdGeneratorConvention : ConventionBase, IPostProcessingConvention
+    public class LookupIdGeneratorConvention : ConventionBase, IPostProcessingConvention, IHasSerializationDomain
     {
         private readonly IBsonSerializationDomain _serializationDomain;
 
@@ -38,6 +38,8 @@ internal LookupIdGeneratorConvention(IBsonSerializationDomain serializationDomai
             _serializationDomain = serializationDomain;
         }
 
+        IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
         // public methods
         /// <summary>
         /// Applies a post processing modification to the class map.
diff --git a/src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization.Conventions
     /// <summary>
     /// Represents the object discriminator convention.
     /// </summary>
-    public class ObjectDiscriminatorConvention : IDiscriminatorConvention
+    public class ObjectDiscriminatorConvention : IDiscriminatorConvention, IHasSerializationDomain
     {
         // private static fields
         private static ObjectDiscriminatorConvention __instance = new ObjectDiscriminatorConvention("_t");
@@ -80,6 +80,8 @@ public string ElementName
             get { return _elementName; }
         }
 
+        IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
         // public methods
         /// <inheritdoc/>
         public override bool Equals(object obj)
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/MongoQueryProvider.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/MongoQueryProvider.cs
@@ -57,7 +57,7 @@ protected MongoQueryProvider(
         public abstract ExpressionTranslationOptions GetTranslationOptions();
     }
 
-    internal sealed class MongoQueryProvider<TDocument> : MongoQueryProvider
+    internal sealed class MongoQueryProvider<TDocument> : MongoQueryProvider, IHasSerializationDomain
     {
         // private fields
         private readonly IMongoCollection<TDocument> _collection;
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AppendStageMethodToPipelineTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AppendStageMethodToPipelineTranslator.cs
@@ -39,7 +39,7 @@ public static TranslatedPipeline Translate(TranslationContext context, MethodCal
 
                 var sourceSerializer = pipeline.OutputSerializer;
                 var stageExpression = arguments[1];
-                var renderedStage = TranslateStage(expression, stageExpression, sourceSerializer, BsonSerializer.SerializerRegistry, context.TranslationOptions);
+                var renderedStage = TranslateStage(expression, stageExpression, sourceSerializer, context.SerializationDomain.SerializerRegistry, context.TranslationOptions);
                 var stage = AstStage.Universal(renderedStage.Document);
 
                 var resultSerializerExpression = arguments[2];
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/OfTypeMethodToPipelineTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/OfTypeMethodToPipelineTranslator.cs
@@ -73,7 +73,7 @@ public static TranslatedPipeline Translate(TranslationContext context, MethodCal
                     _ => throw new ExpressionNotSupportedException(expression, because: "OfType is not supported with the configured discriminator convention")
                 };
 
-                var resultSerializer = BsonSerializer.LookupSerializer(actualType);
+                var resultSerializer = pipeline.OutputSerializer.GetSerializerForDerivedType(actualType);
                 if (wrappedValueOutputSerializer != null)
                 {
                     resultSerializer = WrappedValueSerializer.Create(wrappedValueOutputSerializer.FieldName, resultSerializer);
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs
@@ -21,7 +21,7 @@
 
 namespace MongoDB.Driver.Linq.Linq3Implementation.Translators
 {
-    internal class TranslationContext
+    internal class TranslationContext : IHasSerializationDomain
     {
         #region static
         public static TranslationContext Create(
diff --git a/src/MongoDB.Driver/RenderArgs.cs b/src/MongoDB.Driver/RenderArgs.cs
@@ -29,7 +29,7 @@ public record struct PathRenderArgs(string PathPrefix = null, bool AllowScalarVa
     /// Encapsulates settings needed for rendering Builder definitions.
     /// </summary>
     /// <typeparam name="TDocument">The type of the document.</typeparam>
-    public record struct RenderArgs<TDocument>
+    public record struct RenderArgs<TDocument> : IHasSerializationDomain
     {
         private readonly IBsonSerializer<TDocument> _documentSerializer = default;
         private readonly PathRenderArgs _pathRenderArgs = default;
@@ -143,6 +143,8 @@ internal readonly IBsonSerializationDomain SerializationDomain
             init => _serializationDomain = Ensure.IsNotNull(value, nameof(value));
         }
 
+        IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;
+
         /// <summary>
         /// Gets the translation options used when translation Expressions to MQL.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`namespace MongoDB.Bson.Serialization;`
`22`	`22`
`23`		`-internal class BsonClassMapRegistry : IBsonClassMapRegistry`
	`23`	`+internal class BsonClassMapRegistry : IBsonClassMapRegistry, IHasSerializationDomain`
`24`	`24`	`{`
`25`	`25`	`// private fields`
`26`	`26`	`private readonly Dictionary<Type, BsonClassMap> _classMaps = new();`
`@@ -31,6 +31,8 @@ public BsonClassMapRegistry(BsonSerializationDomain serializationDomain)`
`31`	`31`	`_serializationDomain = serializationDomain;`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;`
	`35`	`+`
`34`	`36`	`/// <summary>`
`35`	`37`	`/// Gets all registered class maps.`
`36`	`38`	`/// </summary>`
`@@ -142,7 +144,7 @@ public BsonClassMap<TClass> RegisterClassMap<TClass>()`
`142`	`144`	`/// <returns>The class map.</returns>`
`143`	`145`	`public BsonClassMap<TClass> RegisterClassMap<TClass>(Action<BsonClassMap<TClass>> classMapInitializer)`
`144`	`146`	`{`
`145`		`- var classMap = new BsonClassMap<TClass>(classMapInitializer);`
	`147`	`+ var classMap = new BsonClassMap<TClass>(_serializationDomain, classMapInitializer);`
`146`	`148`	`RegisterClassMap(classMap);`
`147`	`149`	`return classMap;`
`148`	`150`	`}`
`@@ -158,6 +160,11 @@ public void RegisterClassMap(BsonClassMap classMap)`
`158`	`160`	`throw new ArgumentNullException("classMap");`
`159`	`161`	`}`
`160`	`162`
	`163`	`+ if (classMap.SerializationDomain != _serializationDomain)`
	`164`	`+ {`
	`165`	`+ throw new ArgumentException($"Expected class map to be for serialization domain {_serializationDomain.Name}, but was for serialization domain {classMap.SerializationDomain.Name}.");`
	`166`	`+ }`
	`167`	`+`
`161`	`168`	`_serializationDomain.ConfigLock.EnterWriteLock();`
`162`	`169`	`try`
`163`	`170`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace MongoDB.Bson.Serialization`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Represents the class map serialization provider.`
`23`	`23`	`/// </summary>`
`24`		`- internal class BsonClassMapSerializationProvider : BsonSerializationProviderBase`
	`24`	`+ internal class BsonClassMapSerializationProvider : BsonSerializationProviderBase, IHasSerializationDomain`
`25`	`25`	`{`
`26`	`26`	`private readonly IBsonSerializationDomain _serializationDomain;`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace MongoDB.Bson.Serialization`
`23`	`23`	`/// <summary>`
`24`	`24`	`/// Represents the mapping between a field or property and a BSON element.`
`25`	`25`	`/// </summary>`
`26`		`- public class BsonMemberMap`
	`26`	`+ public class BsonMemberMap : IHasSerializationDomain`
`27`	`27`	`{`
`28`	`28`	`// private fields`
`29`	`29`	`private readonly BsonClassMap _classMap;`
`@@ -141,6 +141,8 @@ public Func<object, object> Getter`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;`
	`145`	`+`
`144`	`146`	`/// <summary>`
`145`	`147`	`/// Gets the setter function.`
`146`	`148`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -692,6 +692,11 @@ public void RegisterDiscriminatorConvention(Type type, IDiscriminatorConvention`
`692`	`692`	`{`
`693`	`693`	`if (!_discriminatorConventions.ContainsKey(type))`
`694`	`694`	`{`
	`695`	`+ if (convention is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != this)`
	`696`	`+ {`
	`697`	`+ throw new ArgumentException($"Expected discriminator convention to be for serialization domain {Name} but was for serialization domain {hasSerializationDomain.SerializationDomain.Name}.");`
	`698`	`+ }`
	`699`	`+`
`695`	`700`	`_discriminatorConventions.Add(type, convention);`
`696`	`701`	`}`
`697`	`702`	`else`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace MongoDB.Bson.Serialization`
`22`	`22`	`/// <summary>`
`23`	`23`	`/// Default, global implementation of an <see cref="IBsonSerializerRegistry"/>.`
`24`	`24`	`/// </summary>`
`25`		`- public sealed class BsonSerializerRegistry : IBsonSerializerRegistry`
	`25`	`+ public sealed class BsonSerializerRegistry : IBsonSerializerRegistry, IHasSerializationDomain`
`26`	`26`	`{`
`27`	`27`	`// private fields`
`28`	`28`	`private readonly ConcurrentDictionary<Type, IBsonSerializer> _cache;`
`@@ -49,6 +49,8 @@ internal BsonSerializerRegistry(IBsonSerializationDomain domain)`
`49`	`49`
`50`	`50`	`internal IBsonSerializationDomain SerializationDomain => _serializationDomain;`
`51`	`51`
	`52`	`+ IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;`
	`53`	`+`
`52`	`54`	`// public methods`
`53`	`55`	`/// <summary>`
`54`	`56`	`/// Gets the serializer for the specified <paramref name="type" />.`
`@@ -103,6 +105,10 @@ public void RegisterSerializer(Type type, IBsonSerializer serializer)`
`103`	`105`	`throw new ArgumentNullException("serializer");`
`104`	`106`	`}`
`105`	`107`	`EnsureRegisteringASerializerForThisTypeIsAllowed(type);`
	`108`	`+ if (serializer is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != _serializationDomain)`
	`109`	`+ {`
	`110`	`+ throw new ArgumentException($"Expected serializer to be for serialization domain {_serializationDomain.Name} but was for serialization domain {hasSerializationDomain.SerializationDomain.Name}.");`
	`111`	`+ }`
`106`	`112`
`107`	`113`	`if (!_cache.TryAdd(type, serializer))`
`108`	`114`	`{`
`@@ -143,6 +149,10 @@ public bool TryRegisterSerializer(Type type, IBsonSerializer serializer)`
`143`	`149`	`throw new ArgumentNullException(nameof(serializer));`
`144`	`150`	`}`
`145`	`151`	`EnsureRegisteringASerializerForThisTypeIsAllowed(type);`
	`152`	`+ if (serializer is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != _serializationDomain)`
	`153`	`+ {`
	`154`	`+ throw new ArgumentException($"Expected serializer to be for serialization domain {_serializationDomain.Name} but was for serialization domain {hasSerializationDomain.SerializationDomain.Name}.");`
	`155`	`+ }`
`146`	`156`
`147`	`157`	`if (_cache.TryAdd(type, serializer))`
`148`	`158`	`{`
`@@ -179,6 +189,11 @@ private IBsonSerializer CreateSerializer(Type type)`
`179`	`189`
`180`	`190`	`if (serializer != null)`
`181`	`191`	`{`
	`192`	`+ if (serializer is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != _serializationDomain)`
	`193`	`+ {`
	`194`	`+ throw new ArgumentException($"Expected serializer to be for serialization domain {_serializationDomain.Name} but was for serialization domain {hasSerializationDomain.SerializationDomain.Name}.", "serializer");`
	`195`	`+ }`
	`196`	`+`
`182`	`197`	`return serializer;`
`183`	`198`	`}`
`184`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`namespace MongoDB.Bson.Serialization.Conventions`
`20`	`20`	`{`
`21`		`- internal class ConventionRegistryInstance : IConventionRegistry`
	`21`	`+ internal class ConventionRegistryInstance : IConventionRegistry, IHasSerializationDomain`
`22`	`22`	`{`
`23`	`23`	`private readonly List<ConventionPackContainer> _conventionPacks = new();`
`24`	`24`	`private readonly object _lock = new();`
`@@ -34,6 +34,8 @@ internal ConventionRegistryInstance(IBsonSerializationDomain serializationDomain`
`34`	`34`	`Register("__attributes__", AttributeConventionPack.Instance, t => true);`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ IBsonSerializationDomain IHasSerializationDomain.SerializationDomain => _serializationDomain;`
	`38`	`+`
`37`	`39`	`// public static methods`
`38`	`40`	`/// <summary>`
`39`	`41`	`/// Looks up the effective set of conventions that apply to a type.`
`@@ -49,7 +51,7 @@ public IConventionPack Lookup(Type type)`
`49`	`51`
`50`	`52`	`lock (_lock)`
`51`	`53`	`{`
`52`		`- var pack = new ConventionPack();`
	`54`	`+ var pack = new ConventionPack(_serializationDomain);`
`53`	`55`
`54`	`56`	`// append any attribute packs (usually just one) at the end so attributes are processed last`
`55`	`57`	`var attributePacks = new List<IConventionPack>();`
`@@ -101,6 +103,11 @@ public void Register(string name, IConventionPack conventions, Func<Type, bool>`
`101`	`103`	`throw new ArgumentNullException("filter");`
`102`	`104`	`}`
`103`	`105`
	`106`	`+ if (conventions is IHasSerializationDomain hasSerializationDomain && hasSerializationDomain.SerializationDomain != _serializationDomain)`
	`107`	`+ {`
	`108`	`+ throw new ArgumentException($"Expected convention pack to be for serialization domain {_serializationDomain.Name}, but was for serialization domain {hasSerializationDomain.SerializationDomain.Name}.");`
	`109`	`+ }`
	`110`	`+`
`104`	`111`	`lock (_lock)`
`105`	`112`	`{`
`106`	`113`	`var container = new ConventionPackContainer`