From f363aa05abdc644557f836639813d99af6ed1edc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 19:39:21 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/efcore dotnet/runtime (#47110) [main] Update dependencies from dotnet/efcore dotnet/runtime - React to exception type in XmlDictionaryReaderQuotas.MaxDepth setter - Try moving workarounds into generated d.b.t - Revert "Try moving workarounds into generated d.b.t" This reverts commit 038f8e2e3e4557a41fe2cee23e2743dd5d14842a. - Set RequestServices in tests - Fix data annotations test failures --- eng/Version.Details.xml | 280 +++++++++--------- eng/Versions.props | 140 ++++----- ...ndlerEndpointRouteBuilderExtensionsTest.cs | 1 + .../Binders/BinderTypeModelBinderTest.cs | 2 +- .../DataAnnotationsMetadataProviderTest.cs | 24 +- ...ataContractSerializerInputFormatterTest.cs | 2 +- .../test/XmlSerializerInputFormatterTest.cs | 2 +- 7 files changed, 226 insertions(+), 225 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 214ba616e382..c5ff6794b0d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,290 +9,290 @@ --> - + https://github.com/dotnet/efcore - 32fe1fd7afa3fa6c9af14c4f0da51068202491a1 + 16201e9542be26daad03a3757393faae4065e4bf - + https://github.com/dotnet/efcore - 32fe1fd7afa3fa6c9af14c4f0da51068202491a1 + 16201e9542be26daad03a3757393faae4065e4bf - + https://github.com/dotnet/efcore - 32fe1fd7afa3fa6c9af14c4f0da51068202491a1 + 16201e9542be26daad03a3757393faae4065e4bf - + https://github.com/dotnet/efcore - 32fe1fd7afa3fa6c9af14c4f0da51068202491a1 + 16201e9542be26daad03a3757393faae4065e4bf - + https://github.com/dotnet/efcore - 32fe1fd7afa3fa6c9af14c4f0da51068202491a1 + 16201e9542be26daad03a3757393faae4065e4bf - + https://github.com/dotnet/efcore - 32fe1fd7afa3fa6c9af14c4f0da51068202491a1 + 16201e9542be26daad03a3757393faae4065e4bf - + https://github.com/dotnet/efcore - 32fe1fd7afa3fa6c9af14c4f0da51068202491a1 + 16201e9542be26daad03a3757393faae4065e4bf - + https://github.com/dotnet/efcore - 32fe1fd7afa3fa6c9af14c4f0da51068202491a1 + 16201e9542be26daad03a3757393faae4065e4bf - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae https://github.com/dotnet/source-build-externals dcd0eca339b5c64b5816c111f583c82062ce4c74 - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae https://github.com/dotnet/xdt @@ -302,9 +302,9 @@ - + https://github.com/dotnet/runtime - faa1d0993afad9d751b2dca6bcfe356369ec6c08 + 7500625bd9303a48d0500b6123cec604e49039ae https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 7280ef821c8e..53832a0e1639 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,78 +63,78 @@ --> - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 - 8.0.0-preview.3.23158.1 - 8.0.0-preview.3.23158.1 + 8.0.0-preview.4.23172.1 + 8.0.0-preview.4.23172.1 - 8.0.0-preview.3.23152.4 - 8.0.0-preview.3.23152.4 - 8.0.0-preview.3.23152.4 - 8.0.0-preview.3.23152.4 - 8.0.0-preview.3.23152.4 - 8.0.0-preview.3.23152.4 - 8.0.0-preview.3.23152.4 - 8.0.0-preview.3.23152.4 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.1 8.0.0-beta.23168.1 8.0.0-beta.23168.1 diff --git a/src/Http/Routing/test/UnitTests/Builder/RouteHandlerEndpointRouteBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/Builder/RouteHandlerEndpointRouteBuilderExtensionsTest.cs index dfcd66ea30dd..79f0c72217c8 100644 --- a/src/Http/Routing/test/UnitTests/Builder/RouteHandlerEndpointRouteBuilderExtensionsTest.cs +++ b/src/Http/Routing/test/UnitTests/Builder/RouteHandlerEndpointRouteBuilderExtensionsTest.cs @@ -892,6 +892,7 @@ private static async Task AssertIdAsync(Endpoint endpoint, string expectedPatter Assert.Equal(expectedPattern, routeEndpoint.RoutePattern.RawText); var httpContext = new DefaultHttpContext(); + httpContext.RequestServices = new ServiceCollection().BuildServiceProvider(); httpContext.Request.RouteValues["id"] = "2"; var outStream = new MemoryStream(); httpContext.Response.Body = outStream; diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/BinderTypeModelBinderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/BinderTypeModelBinderTest.cs index 1f3f3750b67e..7a37ca632406 100644 --- a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/BinderTypeModelBinderTest.cs +++ b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/BinderTypeModelBinderTest.cs @@ -74,7 +74,7 @@ private static DefaultModelBindingContext GetBindingContext(Type modelType, Type { ActionContext = new ActionContext() { - HttpContext = new DefaultHttpContext(), + HttpContext = new DefaultHttpContext() { RequestServices = new ServiceCollection().BuildServiceProvider() }, }, ModelMetadata = metadataProvider.GetMetadataForType(modelType), ModelName = "someName", diff --git a/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs index 17f18190cd6f..d80737ab4a83 100644 --- a/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs +++ b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs @@ -817,12 +817,12 @@ public void CreateDisplayMetadata_DisplayName_LocalizeWithStringLocalizer() // Arrange var expectedKeyValuePairs = new List> { - new KeyValuePair(new EnumGroupAndName(string.Empty, "name from resources"), "-2"), - new KeyValuePair(new EnumGroupAndName("Negatives", "menos uno value"), "-1"), new KeyValuePair(new EnumGroupAndName("Zero", string.Empty), "0"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayNames.One)), "1"), new KeyValuePair(new EnumGroupAndName(string.Empty, "dos value"), "2"), new KeyValuePair(new EnumGroupAndName(string.Empty, "tres value"), "3"), + new KeyValuePair(new EnumGroupAndName(string.Empty, "name from resources"), "-2"), + new KeyValuePair(new EnumGroupAndName("Negatives", "menos uno value"), "-1"), }; var type = typeof(EnumWithDisplayNames); @@ -870,24 +870,24 @@ public static TheoryData> { - new KeyValuePair(new EnumGroupAndName(string.Empty, "name from resources"), "-2"), - new KeyValuePair(new EnumGroupAndName("Negatives", "menos uno"), "-1"), new KeyValuePair(new EnumGroupAndName("Zero", string.Empty), "0"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayNames.One)), "1"), new KeyValuePair(new EnumGroupAndName(string.Empty, "dos"), "2"), new KeyValuePair(new EnumGroupAndName(string.Empty, "tres"), "3"), + new KeyValuePair(new EnumGroupAndName(string.Empty, "name from resources"), "-2"), + new KeyValuePair(new EnumGroupAndName("Negatives", "menos uno"), "-1"), } }, { typeof(EnumWithDisplayNames?), new List> { - new KeyValuePair(new EnumGroupAndName(string.Empty, "name from resources"), "-2"), - new KeyValuePair(new EnumGroupAndName("Negatives", "menos uno"), "-1"), new KeyValuePair(new EnumGroupAndName("Zero", string.Empty), "0"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayNames.One)), "1"), new KeyValuePair(new EnumGroupAndName(string.Empty, "dos"), "2"), new KeyValuePair(new EnumGroupAndName(string.Empty, "tres"), "3"), + new KeyValuePair(new EnumGroupAndName(string.Empty, "name from resources"), "-2"), + new KeyValuePair(new EnumGroupAndName("Negatives", "menos uno"), "-1"), } }, { @@ -922,46 +922,46 @@ public static TheoryData> { - new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.All)), "-1"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Zero)), "0"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.One)), "1"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Two)), "2"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Four)), "4"), + new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.All)), "-1"), } }, { typeof(EnumWithFlags?), new List> { - new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.All)), "-1"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Zero)), "0"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.One)), "1"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Two)), "2"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Four)), "4"), + new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.All)), "-1"), } }, { typeof(EnumWithFields), new List> { - new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusTwo)), "-2"), - new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusOne)), "-1"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Zero)), "0"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.One)), "1"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Two)), "2"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Three)), "3"), + new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusTwo)), "-2"), + new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusOne)), "-1"), } }, { typeof(EnumWithFields?), new List> { - new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusTwo)), "-2"), - new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusOne)), "-1"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Zero)), "0"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.One)), "1"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Two)), "2"), new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Three)), "3"), + new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusTwo)), "-2"), + new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusOne)), "-1"), } }, }; diff --git a/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerInputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerInputFormatterTest.cs index a4ebddf109e4..119174ff661b 100644 --- a/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerInputFormatterTest.cs +++ b/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerInputFormatterTest.cs @@ -449,7 +449,7 @@ public void SetMaxDepth_ThrowsWhenMaxDepthIsBelowOne() var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions()); // Act & Assert - Assert.Throws(() => formatter.MaxDepth = 0); + Assert.Throws(() => formatter.MaxDepth = 0); } [Fact] diff --git a/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs index 050b6fbfd956..f7f6d685540c 100644 --- a/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs +++ b/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs @@ -466,7 +466,7 @@ public void SetMaxDepth_ThrowsWhenMaxDepthIsBelowOne() var formatter = new XmlSerializerInputFormatter(new MvcOptions()); // Act & Assert - Assert.Throws(() => formatter.MaxDepth = 0); + Assert.Throws(() => formatter.MaxDepth = 0); } [Fact]