[main] Update dependencies from mono/linker (#52497)
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Sat, 15 May 2021 09:44:51 +0000 (09:44 +0000)
committerGitHub <noreply@github.com>
Sat, 15 May 2021 09:44:51 +0000 (09:44 +0000)
[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

eng/Version.Details.xml
eng/Versions.props
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonMetadataServices.cs
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/MetadataTests/MetadataTests.JsonMetadataServices.cs

index 8c66a98..2b31806 100644 (file)
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>e39196ffc9e50f3d8927622daaedcd50681d56f2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21257.1">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21263.3">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>17dd8b63f0f1752685575f920a3c3db00c51ecb9</Sha>
+      <Sha>82e3d7cf6256e9cf477ab011dba5812a1ccca49d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21263.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
index b841abb..1460812 100644 (file)
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
-    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21257.1</MicrosoftNETILLinkTasksVersion>
+    <MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21263.3</MicrosoftNETILLinkTasksVersion>
     <!-- ICU -->
     <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21260.1</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- Mono LLVM -->
index 70d6abf..27a2fe1 100644 (file)
@@ -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)
index ae8da63..932aad5 100644 (file)
@@ -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<Tuple<string, double>>(@"{""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<Tuple<int, int, int, int, int, int, int>>(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<Tuple<
                 SimpleTestClass,
                 SimpleTestClass,
index 9d93c2d..40feb1b 100644 (file)
@@ -224,7 +224,7 @@ namespace System.Text.Json.Tests.Serialization
                 keyInfo: null,
                 valueInfo: JsonMetadataServices.CreateValueInfo<int>(options, JsonMetadataServices.Int32Converter),
                 numberHandling: default));
-            Assert.Contains("valueInfo", ane.ToString());
+            Assert.Contains("keyInfo", ane.ToString());
 
             // Null value info
             ane = Assert.Throws<ArgumentNullException>(() => JsonMetadataServices.CreateDictionaryInfo<StringToGenericDictionaryWrapper<int>, string, int>(