Skip to content

Commit

Permalink
[main] Update dependencies from mono/linker (#52497)
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
dotnet-maestro[bot] committed May 15, 2021
1 parent 67c5e8b commit 8194ffb
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 5 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@
<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>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<!-- 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 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static partial class JsonMetadataServices

if (propertyName == null)
{
throw new ArgumentNullException(propertyName);
throw new ArgumentNullException(nameof(propertyName));
}

if (converter == null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Tuple<string, double>>(@"{""Item1"":""New York"",""Item2"":32.68}");
Assert.Equal("New York", tuple.Item1);
Assert.Equal(32.68, tuple.Item2);
Expand All @@ -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<Tuple<int, int, int, int, int, int, int>>(json);
Expand Down Expand Up @@ -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<Tuple<
SimpleTestClass,
SimpleTestClass,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public void CreateDictionaryInfo()
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>(
Expand Down

0 comments on commit 8194ffb

Please sign in to comment.