diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bc501bae3f53..d041cec1fd73e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,9 +174,9 @@ https://github.com/dotnet/runtime e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/mono/linker - 17dd8b63f0f1752685575f920a3c3db00c51ecb9 + 82e3d7cf6256e9cf477ab011dba5812a1ccca49d https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 7a31583ff90b1..dc9d4c99cc433 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.5.21257.1 + 6.0.100-preview.5.21263.3 6.0.0-preview.5.21253.1 diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonMetadataServices.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonMetadataServices.cs index 70d6abf8d90fe..27a2fe109cd3f 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonMetadataServices.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonMetadataServices.cs @@ -47,7 +47,7 @@ public static partial class JsonMetadataServices if (propertyName == null) { - throw new ArgumentNullException(propertyName); + throw new ArgumentNullException(nameof(propertyName)); } if (converter == null) diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs index ae8da63d622d0..932aad596949d 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs @@ -496,6 +496,8 @@ public async Task ClassWithPrimitivesPerf() [Fact] public async Task TupleDeserializationWorks() { + var dont_trim_ctor = typeof(Tuple<,>).GetConstructors(); + var tuple = await Serializer.DeserializeWrapper>(@"{""Item1"":""New York"",""Item2"":32.68}"); Assert.Equal("New York", tuple.Item1); Assert.Equal(32.68, tuple.Item2); @@ -514,6 +516,9 @@ public async Task TupleDeserializationWorks() [Fact] public async Task TupleDeserialization_MoreThanSevenItems() { + var dont_trim_ctor = typeof(Tuple<,,,,,,>).GetConstructors(); + dont_trim_ctor = typeof(Tuple<,,,,,,,>).GetConstructors(); + // Seven is okay string json = JsonSerializer.Serialize(Tuple.Create(1, 2, 3, 4, 5, 6, 7)); var obj = await Serializer.DeserializeWrapper>(json); @@ -610,6 +615,8 @@ public async Task TupleDeserializationWorks_ClassWithParameterlessCtor() string complexTupleJson = sb.ToString(); + var dont_trim_ctor = typeof(Tuple<,,,,,,>).GetConstructors(); + var complexTuple = await Serializer.DeserializeWrapper(options, JsonMetadataServices.Int32Converter), numberHandling: default)); - Assert.Contains("valueInfo", ane.ToString()); + Assert.Contains("keyInfo", ane.ToString()); // Null value info ane = Assert.Throws(() => JsonMetadataServices.CreateDictionaryInfo, string, int>(