Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from mono/linker #52497

Merged
merged 8 commits into from
May 15, 2021
Merged

[main] Update dependencies from mono/linker #52497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b346f0b
Update dependencies from https://github.com/mono/linker build 20210507.2
dotnet-maestro[bot] May 8, 2021
2f3914a
Update dependencies from https://github.com/mono/linker build 20210507.3
dotnet-maestro[bot] May 8, 2021
3bb3af1
Update dependencies from https://github.com/mono/linker build 20210510.2
dotnet-maestro[bot] May 11, 2021
60e8a1d
Update dependencies from https://github.com/mono/linker build 20210513.1
dotnet-maestro[bot] May 13, 2021
746f101
Update dependencies from https://github.com/mono/linker build 20210513.3
dotnet-maestro[bot] May 14, 2021
0c5270b
Throw ANE with actual parameter name and not null value
marek-safar May 14, 2021
61f58e2
Fixes test checking wrong parameter name
marek-safar May 14, 2021
e0a3834
Add explicit dependendecy to constructors which could be trimmed
marek-safar May 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e6bb456e608ad24a55f3fef2d1ee4ede07d6c729</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.21255.1">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,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.21253.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM -->
Expand Down
2 changes: 1 addition & 1 deletion ...ries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonMetadataServices.cs
View file
Open in desktop
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
7 changes: 7 additions & 0 deletions ...stem.Text.Json.Tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion .../System.Text.Json.Tests/Serialization/MetadataTests/MetadataTests.JsonMetadataServices.cs
View file
Open in desktop
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