From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 15 May 2021 09:44:51 +0000 (+0000)
Subject: [main] Update dependencies from mono/linker (#52497)
X-Git-Tag: submit/tizen/20210909.063632~1367
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8194ffb2c0973cb1ec549a3c9f0633d0e3d6acad;p=platform%2Fupstream%2Fdotnet%2Fruntime.git
[main] Update dependencies from mono/linker (#52497)
[main] Update dependencies from mono/linker
- Throw ANE with actual parameter name and not null value
- Fixes test checking wrong parameter name
- Add explicit dependendecy to constructors which could be trimmed
---
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8c66a98..2b31806 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -174,9 +174,9 @@
https://github.com/dotnet/runtime
e39196ffc9e50f3d8927622daaedcd50681d56f2
-
+
https://github.com/mono/linker
- 17dd8b63f0f1752685575f920a3c3db00c51ecb9
+ 82e3d7cf6256e9cf477ab011dba5812a1ccca49d
https://github.com/dotnet/xharness
diff --git a/eng/Versions.props b/eng/Versions.props
index b841abb..1460812 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -161,7 +161,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.21260.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 70d6abf..27a2fe1 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 @@ namespace System.Text.Json.Serialization.Metadata
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 ae8da63..932aad5 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 @@ namespace System.Text.Json.Serialization.Tests
[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 @@ namespace System.Text.Json.Serialization.Tests
[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 @@ namespace System.Text.Json.Serialization.Tests
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>(