From b346f0b40dd6a59e6d8b6b65788b9d35b6e402d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 May 2021 06:42:03 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/mono/linker build 20210507.2 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.5.21257.1 -> To Version 6.0.100-preview.5.21257.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bc501bae3f53..98bfe8ed5494b 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 + a5f4931bc577ca94d05cd6b64e810c5cc4f035bb https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 7a31583ff90b1..3c8a2b4fc26ff 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.21257.2 6.0.0-preview.5.21253.1 From 2f3914a15d8989fd66243efcfa5d1fef48d9e887 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 May 2021 09:29:55 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/mono/linker build 20210507.3 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.5.21257.1 -> To Version 6.0.100-preview.5.21257.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98bfe8ed5494b..871923acf69a0 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 - a5f4931bc577ca94d05cd6b64e810c5cc4f035bb + fafb6cf6a385a8c753faa174b9ab7c3600a9d494 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 3c8a2b4fc26ff..61321fbc26e51 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.2 + 6.0.100-preview.5.21257.3 6.0.0-preview.5.21253.1 From 3bb3af1fc234f3090d834938c1a053a038ebe365 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 May 2021 12:16:07 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/mono/linker build 20210510.2 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.5.21257.1 -> To Version 6.0.100-preview.5.21260.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 871923acf69a0..ed20554e65400 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 - fafb6cf6a385a8c753faa174b9ab7c3600a9d494 + 8a2996c96f9bbcfdf151d57534e05d1f24614242 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 61321fbc26e51..7117efddfe92c 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.3 + 6.0.100-preview.5.21260.2 6.0.0-preview.5.21253.1 From 60e8a1d2a6a3880f87bd1b58b63b13674c8e0b7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 May 2021 12:17:19 +0000 Subject: [PATCH 4/8] Update dependencies from https://github.com/mono/linker build 20210513.1 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.5.21257.1 -> To Version 6.0.100-preview.5.21263.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed20554e65400..d464cc7b059d4 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 - 8a2996c96f9bbcfdf151d57534e05d1f24614242 + 939d0ffd2720943149af7da0a922cf2913fb3e54 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 7117efddfe92c..944dfcc1c060d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.5.21260.2 + 6.0.100-preview.5.21263.1 6.0.0-preview.5.21253.1 From 746f101a76ae354e9019594677584b1c1538d014 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 May 2021 12:17:27 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/mono/linker build 20210513.3 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.5.21257.1 -> To Version 6.0.100-preview.5.21263.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d464cc7b059d4..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 - 939d0ffd2720943149af7da0a922cf2913fb3e54 + 82e3d7cf6256e9cf477ab011dba5812a1ccca49d https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 944dfcc1c060d..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.21263.1 + 6.0.100-preview.5.21263.3 6.0.0-preview.5.21253.1 From 0c5270b7987c081f05b6f1840e551439681ea4a7 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Fri, 14 May 2021 23:32:18 +0200 Subject: [PATCH 6/8] Throw ANE with actual parameter name and not null value --- .../Text/Json/Serialization/Metadata/JsonMetadataServices.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 61f58e278562a6db994bde26fa051cd64bcba54a Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Fri, 14 May 2021 23:38:37 +0200 Subject: [PATCH 7/8] Fixes test checking wrong parameter name --- .../MetadataTests/MetadataTests.JsonMetadataServices.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/MetadataTests/MetadataTests.JsonMetadataServices.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/MetadataTests/MetadataTests.JsonMetadataServices.cs index 9d93c2d8720e3..40feb1b20824e 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/MetadataTests/MetadataTests.JsonMetadataServices.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/MetadataTests/MetadataTests.JsonMetadataServices.cs @@ -224,7 +224,7 @@ public void CreateDictionaryInfo() keyInfo: null, valueInfo: JsonMetadataServices.CreateValueInfo(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>( From e0a3834d1473dca4871682a0a3731f5dbe94ff89 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Sat, 15 May 2021 09:19:27 +0200 Subject: [PATCH 8/8] Add explicit dependendecy to constructors which could be trimmed --- .../ConstructorTests/ConstructorTests.ParameterMatching.cs | 7 +++++++ 1 file changed, 7 insertions(+) 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