Skip to content

Commit a14119a

Browse files
wtgodbewtgodbe
committed
Merge remote-tracking branch 'internal/internal/release/3.1' into wtgodbe/315
2 parents bf9fbc0 + 35628a6 commit a14119a

File tree

7 files changed

+326
-220
lines changed

7 files changed

+326
-220
lines changed

‎NuGet.config

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-dotnet-extensions-cf04410" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-cf044102/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-efcore-7c74e87" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-7c74e87e/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-core-setup-57d5bbb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-57d5bbb5/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-corefx-282d5b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-282d5b9f/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-aspnetcore-tooling-5ecfad7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-5ecfad7e/nuget/v3/index.json" />
6+
<add key="darc-pub-dotnet-corefx-8a3ffed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-8a3ffed5/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-extensions-3b1f2b7" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-3b1f2b7c/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-efcore-0e7e329" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-0e7e329a/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-core-setup-0c2e69c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0c2e69ca/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-corefx-059a4a1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-059a4a19/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-aspnetcore-tooling-a8242d7" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-a8242d79/nuget/v3/index.json" />
1112
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1213
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1314
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 183 additions & 183 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->
6969
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.4</MicrosoftExtensionsDependencyModelPackageVersion>
70-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20181.2</MicrosoftNETCoreAppInternalPackageVersion>
70+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20221.3</MicrosoftNETCoreAppInternalPackageVersion>
7171
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
7272
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
7373
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
7474
<!-- Packages from dotnet/corefx -->
75-
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.0</MicrosoftBclAsyncInterfacesPackageVersion>
75+
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.1</MicrosoftBclAsyncInterfacesPackageVersion>
7676
<MicrosoftCSharpPackageVersion>4.7.0</MicrosoftCSharpPackageVersion>
7777
<MicrosoftWin32RegistryPackageVersion>4.7.0</MicrosoftWin32RegistryPackageVersion>
7878
<MicrosoftWin32SystemEventsPackageVersion>4.7.0</MicrosoftWin32SystemEventsPackageVersion>
@@ -81,34 +81,34 @@
8181
<SystemDrawingCommonPackageVersion>4.7.0</SystemDrawingCommonPackageVersion>
8282
<SystemIOPipelinesPackageVersion>4.7.1</SystemIOPipelinesPackageVersion>
8383
<SystemNetHttpWinHttpHandlerPackageVersion>4.7.0</SystemNetHttpWinHttpHandlerPackageVersion>
84-
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.7.0</SystemNetWebSocketsWebSocketProtocolPackageVersion>
85-
<SystemReflectionMetadataPackageVersion>1.8.0</SystemReflectionMetadataPackageVersion>
84+
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.7.1</SystemNetWebSocketsWebSocketProtocolPackageVersion>
85+
<SystemReflectionMetadataPackageVersion>1.8.1</SystemReflectionMetadataPackageVersion>
8686
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.7.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
8787
<SystemSecurityCryptographyCngPackageVersion>4.7.0</SystemSecurityCryptographyCngPackageVersion>
8888
<SystemSecurityCryptographyPkcsPackageVersion>4.7.0</SystemSecurityCryptographyPkcsPackageVersion>
8989
<SystemSecurityCryptographyXmlPackageVersion>4.7.0</SystemSecurityCryptographyXmlPackageVersion>
9090
<SystemSecurityPermissionsPackageVersion>4.7.0</SystemSecurityPermissionsPackageVersion>
9191
<SystemSecurityPrincipalWindowsPackageVersion>4.7.0</SystemSecurityPrincipalWindowsPackageVersion>
9292
<SystemServiceProcessServiceControllerPackageVersion>4.7.0</SystemServiceProcessServiceControllerPackageVersion>
93-
<SystemTextEncodingsWebPackageVersion>4.7.0</SystemTextEncodingsWebPackageVersion>
93+
<SystemTextEncodingsWebPackageVersion>4.7.1</SystemTextEncodingsWebPackageVersion>
9494
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
95-
<SystemThreadingChannelsPackageVersion>4.7.0</SystemThreadingChannelsPackageVersion>
95+
<SystemThreadingChannelsPackageVersion>4.7.1</SystemThreadingChannelsPackageVersion>
9696
<SystemWindowsExtensionsPackageVersion>4.7.0</SystemWindowsExtensionsPackageVersion>
9797
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
9898
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
9999
<!-- Packages from aspnet/Blazor -->
100100
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.1.0-preview4.19605.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
101101
<!-- Packages from aspnet/Extensions -->
102-
<InternalAspNetCoreAnalyzersPackageVersion>3.1.4-servicing.20181.5</InternalAspNetCoreAnalyzersPackageVersion>
103-
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.4-servicing.20181.5</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
104-
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.4-servicing.20181.5</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
105-
<MicrosoftAspNetCoreTestingPackageVersion>3.1.4-servicing.20181.5</MicrosoftAspNetCoreTestingPackageVersion>
106-
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.1.4-servicing.20181.5</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
102+
<InternalAspNetCoreAnalyzersPackageVersion>3.1.4-servicing.20221.11</InternalAspNetCoreAnalyzersPackageVersion>
103+
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.4-servicing.20221.11</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
104+
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
105+
<MicrosoftAspNetCoreTestingPackageVersion>3.1.4-servicing.20221.11</MicrosoftAspNetCoreTestingPackageVersion>
106+
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
107107
<MicrosoftExtensionsCachingAbstractionsPackageVersion>3.1.4</MicrosoftExtensionsCachingAbstractionsPackageVersion>
108108
<MicrosoftExtensionsCachingMemoryPackageVersion>3.1.4</MicrosoftExtensionsCachingMemoryPackageVersion>
109109
<MicrosoftExtensionsCachingSqlServerPackageVersion>3.1.4</MicrosoftExtensionsCachingSqlServerPackageVersion>
110110
<MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.1.4</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
111-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.4-servicing.20181.5</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
111+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
112112
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.1.4</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
113113
<MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.1.4</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
114114
<MicrosoftExtensionsConfigurationBinderPackageVersion>3.1.4</MicrosoftExtensionsConfigurationBinderPackageVersion>
@@ -131,10 +131,10 @@
131131
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.1.4</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
132132
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.1.4</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
133133
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.1.4</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
134-
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.4-servicing.20181.5</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
134+
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
135135
<MicrosoftExtensionsHostingAbstractionsPackageVersion>3.1.4</MicrosoftExtensionsHostingAbstractionsPackageVersion>
136136
<MicrosoftExtensionsHostingPackageVersion>3.1.4</MicrosoftExtensionsHostingPackageVersion>
137-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.4-servicing.20181.5</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
137+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
138138
<MicrosoftExtensionsHttpPackageVersion>3.1.4</MicrosoftExtensionsHttpPackageVersion>
139139
<MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.1.4</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
140140
<MicrosoftExtensionsLocalizationPackageVersion>3.1.4</MicrosoftExtensionsLocalizationPackageVersion>
@@ -146,16 +146,16 @@
146146
<MicrosoftExtensionsLoggingEventSourcePackageVersion>3.1.4</MicrosoftExtensionsLoggingEventSourcePackageVersion>
147147
<MicrosoftExtensionsLoggingEventLogPackageVersion>3.1.4</MicrosoftExtensionsLoggingEventLogPackageVersion>
148148
<MicrosoftExtensionsLoggingPackageVersion>3.1.4</MicrosoftExtensionsLoggingPackageVersion>
149-
<MicrosoftExtensionsLoggingTestingPackageVersion>3.1.4-servicing.20181.5</MicrosoftExtensionsLoggingTestingPackageVersion>
149+
<MicrosoftExtensionsLoggingTestingPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsLoggingTestingPackageVersion>
150150
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.1.4</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
151151
<MicrosoftExtensionsObjectPoolPackageVersion>3.1.4</MicrosoftExtensionsObjectPoolPackageVersion>
152152
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.1.4</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
153153
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.1.4</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
154154
<MicrosoftExtensionsOptionsPackageVersion>3.1.4</MicrosoftExtensionsOptionsPackageVersion>
155-
<MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.1.4-servicing.20181.5</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
155+
<MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
156156
<MicrosoftExtensionsPrimitivesPackageVersion>3.1.4</MicrosoftExtensionsPrimitivesPackageVersion>
157-
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.1.4-servicing.20181.5</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
158-
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.1.4-servicing.20181.5</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
157+
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
158+
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
159159
<MicrosoftExtensionsWebEncodersPackageVersion>3.1.4</MicrosoftExtensionsWebEncodersPackageVersion>
160160
<MicrosoftInternalExtensionsRefsPackageVersion>3.1.0-rtm.19565.4</MicrosoftInternalExtensionsRefsPackageVersion>
161161
<MicrosoftJSInteropPackageVersion>3.1.4</MicrosoftJSInteropPackageVersion>
@@ -168,10 +168,10 @@
168168
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.1.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
169169
<MicrosoftEntityFrameworkCorePackageVersion>3.1.4</MicrosoftEntityFrameworkCorePackageVersion>
170170
<!-- Packages from aspnet/AspNetCore-Tooling -->
171-
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.1.3</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
172-
<MicrosoftAspNetCoreRazorLanguagePackageVersion>3.1.3</MicrosoftAspNetCoreRazorLanguagePackageVersion>
173-
<MicrosoftCodeAnalysisRazorPackageVersion>3.1.3</MicrosoftCodeAnalysisRazorPackageVersion>
174-
<MicrosoftNETSdkRazorPackageVersion>3.1.3</MicrosoftNETSdkRazorPackageVersion>
171+
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.1.4</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
172+
<MicrosoftAspNetCoreRazorLanguagePackageVersion>3.1.4</MicrosoftAspNetCoreRazorLanguagePackageVersion>
173+
<MicrosoftCodeAnalysisRazorPackageVersion>3.1.4</MicrosoftCodeAnalysisRazorPackageVersion>
174+
<MicrosoftNETSdkRazorPackageVersion>3.1.4</MicrosoftNETSdkRazorPackageVersion>
175175
</PropertyGroup>
176176
<!--
177177
@@ -271,4 +271,4 @@
271271
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetcli.blob.core.windows.net/dotnet/</DotNetAssetRootUrl>
272272
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
273273
</PropertyGroup>
274-
</Project>
274+
</Project>

‎src/Http/Routing/src/Matching/DfaMatcherBuilder.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -429,7 +429,10 @@ private int AddNode(
429429
candidates,
430430
endpointSelectorPolicies?.ToArray() ?? Array.Empty<IEndpointSelectorPolicy>(),
431431
JumpTableBuilder.Build(currentDefaultDestination, currentExitDestination, pathEntries),
432-
BuildPolicy(currentExitDestination, node.NodeBuilder, policyEntries));
432+
// Use the final exit destination when building the policy state.
433+
// We don't want to use either of the current destinations because they refer routing states,
434+
// and a policy state should never transition back to a routing state.
435+
BuildPolicy(exitDestination, node.NodeBuilder, policyEntries));
433436

434437
return currentStateIndex;
435438

‎src/Http/Routing/test/UnitTests/Matching/HostMatcherPolicyIntegrationTestBase.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,38 @@ public async Task Match_WildcardHostAndWildcardPort_MatchesAnyHost()
273273
MatcherAssert.AssertMatch(httpContext, endpoint);
274274
}
275275

276+
[Fact]
277+
public async Task Match_CatchAllRouteWithMatchingHost_Success()
278+
{
279+
// Arrange
280+
var endpoint = CreateEndpoint("/{**path}", hosts: new string[] { "contoso.com", });
281+
282+
var matcher = CreateMatcher(endpoint);
283+
var httpContext = CreateContext("/hello", "contoso.com");
284+
285+
// Act
286+
await matcher.MatchAsync(httpContext);
287+
288+
// Assert
289+
MatcherAssert.AssertMatch(httpContext, endpoint, new { path = "hello" });
290+
}
291+
292+
[Fact]
293+
public async Task Match_CatchAllRouteFailureHost_NoMatch()
294+
{
295+
// Arrange
296+
var endpoint = CreateEndpoint("/{**path}", hosts: new string[] { "contoso.com", });
297+
298+
var matcher = CreateMatcher(endpoint);
299+
var httpContext = CreateContext("/hello", "nomatch.com");
300+
301+
// Act
302+
await matcher.MatchAsync(httpContext);
303+
304+
// Assert
305+
MatcherAssert.AssertNotMatch(httpContext);
306+
}
307+
276308
private static Matcher CreateMatcher(params RouteEndpoint[] endpoints)
277309
{
278310
var services = new ServiceCollection()

‎src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonOutputFormatter.cs

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ public class NewtonsoftJsonOutputFormatter : TextOutputFormatter
2020
{
2121
private readonly IArrayPool<char> _charPool;
2222
private readonly MvcOptions _mvcOptions;
23-
24-
// Perf: JsonSerializers are relatively expensive to create, and are thread safe. We cache
25-
// the serializer and invalidate it when the settings change.
26-
private JsonSerializer _serializer;
23+
private JsonSerializerSettings _serializerSettings;
2724

2825
/// <summary>
2926
/// Initializes a new <see cref="NewtonsoftJsonOutputFormatter"/> instance.
@@ -99,12 +96,13 @@ protected virtual JsonWriter CreateJsonWriter(TextWriter writer)
9996
/// <returns>The <see cref="JsonSerializer"/> used during serialization and deserialization.</returns>
10097
protected virtual JsonSerializer CreateJsonSerializer()
10198
{
102-
if (_serializer == null)
99+
if (_serializerSettings == null)
103100
{
104-
_serializer = JsonSerializer.Create(SerializerSettings);
101+
// Lock the serializer settings once the first serialization has been initiated.
102+
_serializerSettings = ShallowCopy(SerializerSettings);
105103
}
106104

107-
return _serializer;
105+
return JsonSerializer.Create(_serializerSettings);
108106
}
109107

110108
/// <summary>
@@ -166,5 +164,43 @@ public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext co
166164
}
167165
}
168166
}
167+
168+
private static JsonSerializerSettings ShallowCopy(JsonSerializerSettings settings)
169+
{
170+
var copiedSettings = new JsonSerializerSettings
171+
{
172+
FloatParseHandling = settings.FloatParseHandling,
173+
FloatFormatHandling = settings.FloatFormatHandling,
174+
DateParseHandling = settings.DateParseHandling,
175+
DateTimeZoneHandling = settings.DateTimeZoneHandling,
176+
DateFormatHandling = settings.DateFormatHandling,
177+
Formatting = settings.Formatting,
178+
MaxDepth = settings.MaxDepth,
179+
DateFormatString = settings.DateFormatString,
180+
Context = settings.Context,
181+
Error = settings.Error,
182+
SerializationBinder = settings.SerializationBinder,
183+
TraceWriter = settings.TraceWriter,
184+
Culture = settings.Culture,
185+
ReferenceResolverProvider = settings.ReferenceResolverProvider,
186+
EqualityComparer = settings.EqualityComparer,
187+
ContractResolver = settings.ContractResolver,
188+
ConstructorHandling = settings.ConstructorHandling,
189+
TypeNameAssemblyFormatHandling = settings.TypeNameAssemblyFormatHandling,
190+
MetadataPropertyHandling = settings.MetadataPropertyHandling,
191+
TypeNameHandling = settings.TypeNameHandling,
192+
PreserveReferencesHandling = settings.PreserveReferencesHandling,
193+
Converters = settings.Converters,
194+
DefaultValueHandling = settings.DefaultValueHandling,
195+
NullValueHandling = settings.NullValueHandling,
196+
ObjectCreationHandling = settings.ObjectCreationHandling,
197+
MissingMemberHandling = settings.MissingMemberHandling,
198+
ReferenceLoopHandling = settings.ReferenceLoopHandling,
199+
CheckAdditionalContent = settings.CheckAdditionalContent,
200+
StringEscapeHandling = settings.StringEscapeHandling,
201+
};
202+
203+
return copiedSettings;
204+
}
169205
}
170206
}

0 commit comments

Comments
 (0)