@@ -5612,7 +5612,7 @@ public Rules WithDefaultRegistrationServiceKey(object serviceKey) =>
5612
5612
5613
5613
/// <summary>Sets <see cref="FactorySelector"/></summary>
5614
5614
public Rules WithFactorySelector(FactorySelectorRule rule) =>
5615
- new Rules(_settings | ( rule == SelectLastRegisteredFactory ? Settings.SelectLastRegisteredFactory : default( Settings) ),
5615
+ new Rules(rule == SelectLastRegisteredFactory ? (_settings | Settings.SelectLastRegisteredFactory) : (_settings & ~ Settings.SelectLastRegisteredFactory ),
5616
5616
rule, DefaultReuse, _made, DefaultIfAlreadyRegistered, DependencyCountInLambdaToSplitBigObjectGraph,
5617
5617
DependencyResolutionCallExprs, ItemToExpressionConverter,
5618
5618
DynamicRegistrationProviders, _dynamicRegistrationFlags, UnknownServiceResolvers, DefaultRegistrationServiceKey);
@@ -6252,7 +6252,7 @@ private Rules(Settings settings,
6252
6252
}
6253
6253
6254
6254
private Rules Clone(bool cloneMade) =>
6255
- new Rules(_settings, FactorySelector, DefaultReuse, cloneMade ? _made.Copy () : _made,
6255
+ new Rules(_settings, FactorySelector, DefaultReuse, cloneMade ? _made.Clone () : _made,
6256
6256
DefaultIfAlreadyRegistered, DependencyCountInLambdaToSplitBigObjectGraph,
6257
6257
DependencyResolutionCallExprs, ItemToExpressionConverter, DynamicRegistrationProviders,
6258
6258
_dynamicRegistrationFlags, UnknownServiceResolvers, DefaultRegistrationServiceKey);
@@ -6269,6 +6269,7 @@ private Rules WithSettings(Settings newSettings)
6269
6269
[Flags]
6270
6270
private enum Settings
6271
6271
{
6272
+ Empty = 0,
6272
6273
ThrowIfDependencyHasShorterReuseLifespan = 1 << 1,
6273
6274
ThrowOnRegisteringDisposableTransient = 1 << 2,
6274
6275
TrackingDisposableTransients = 1 << 3,
@@ -6904,8 +6905,7 @@ private Made(
6904
6905
_details = details;
6905
6906
}
6906
6907
6907
- internal Made Copy() =>
6908
- new Made(FactoryMethod, Parameters, PropertiesAndFields, FactoryMethodKnownResultType, _details);
6908
+ internal Made Clone() => new Made(FactoryMethod, Parameters, PropertiesAndFields, FactoryMethodKnownResultType, _details);
6909
6909
6910
6910
private static ParameterSelector ComposeParameterSelectorFromArgs(ref bool hasCustomValue,
6911
6911
System.Linq.Expressions.Expression wholeServiceExpr, ParameterInfo[] paramInfos,
0 commit comments