Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Update dependencies from dotnet/coreclr #35051

Merged
merged 3 commits into from
Feb 3, 2019
Merged

Update dependencies from dotnet/coreclr #35051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f11a344
Update dependencies from https://github.com/dotnet/coreclr build 2019…
Feb 2, 2019
b47f534
Update dependencies from https://github.com/dotnet/coreclr build 2019…
Feb 3, 2019
d5af9a1
Fixing various tests that have new behavior due to the string formatt…
tannergooding Feb 1, 2019
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>ba01d453ed29eedb7eaff990e2cecb83b4c17346</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview-27331-72">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview-27402-72">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>193d5da27fecb7bf95e7342f1c4b9e2b63ce5313</Sha>
<Sha>070b5d7a403e991777ead838975d58e66aec1264</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview-27331-72">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview-27402-72">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>193d5da27fecb7bf95e7342f1c4b9e2b63ce5313</Sha>
<Sha>070b5d7a403e991777ead838975d58e66aec1264</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview-27331-72">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview-27402-72">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>193d5da27fecb7bf95e7342f1c4b9e2b63ce5313</Sha>
<Sha>070b5d7a403e991777ead838975d58e66aec1264</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19081.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview-27330-4</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview-27330-4</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<!-- Coreclr dependencies -->
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview-27331-72</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27331-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview-27402-72</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27402-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<!-- Corefx dependencies -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19101.5</MicrosoftNETCorePlatformsPackageVersion>
<!-- Standard dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19081.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19081.1",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27331-72"
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27402-72"
}
}
60 changes: 30 additions & 30 deletions src/Microsoft.VisualBasic.Core/tests/ConversionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,7 @@ public static IEnumerable<object[]> ToSingle_String_TestData()
yield return new object[] { " &o5", (float)5 };
yield return new object[] { "&o0", (float)0 };
yield return new object[] { 1.1.ToString(), (float)1.1 };
yield return new object[] { "18446744073709551616", float.Parse("1.844674E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { "18446744073709551616", 18446744073709551616.0f };
yield return new object[] { double.PositiveInfinity.ToString(), float.PositiveInfinity };
yield return new object[] { double.NegativeInfinity.ToString(), float.NegativeInfinity };
yield return new object[] { double.NaN.ToString(), float.NaN };
Expand Down Expand Up @@ -1663,42 +1663,42 @@ public static IEnumerable<object[]> ToSingle_Object_TestData()
// uint.
yield return new object[] { uint.MinValue, (float)0 };
yield return new object[] { (uint)1, (float)1 };
yield return new object[] { uint.MaxValue, float.Parse("4.294967E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { uint.MaxValue, (float)uint.MaxValue };
yield return new object[] { (UIntEnum)uint.MinValue, (float)0 };
yield return new object[] { (UIntEnum)1, (float)1 };
yield return new object[] { (UIntEnum)uint.MaxValue, float.Parse("4.294967E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (UIntEnum)uint.MaxValue, (float)uint.MaxValue };

// int.
yield return new object[] { int.MinValue, float.Parse("-2.147484E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { int.MinValue, (float)int.MinValue };
yield return new object[] { -1, (float)(-1) };
yield return new object[] { 0, (float)0 };
yield return new object[] { 1, (float)1 };
yield return new object[] { int.MaxValue, float.Parse("2.147484E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (IntEnum)int.MinValue, float.Parse("-2.147484E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { int.MaxValue, (float)int.MaxValue };
yield return new object[] { (IntEnum)int.MinValue, (float)int.MinValue };
yield return new object[] { (IntEnum)(-1), (float)(-1) };
yield return new object[] { (IntEnum)0, (float)0 };
yield return new object[] { (IntEnum)1, (float)1 };
yield return new object[] { (IntEnum)int.MaxValue, float.Parse("2.147484E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (IntEnum)int.MaxValue, (float)int.MaxValue };

// ulong.
yield return new object[] { ulong.MinValue, (float)0 };
yield return new object[] { (ulong)1, (float)1 };
yield return new object[] { ulong.MaxValue, float.Parse("1.844674E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { ulong.MaxValue, (float)ulong.MaxValue };
yield return new object[] { (ULongEnum)ulong.MinValue, (float)0 };
yield return new object[] { (ULongEnum)1, (float)1 };
yield return new object[] { (ULongEnum)ulong.MaxValue, float.Parse("1.844674E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (ULongEnum)ulong.MaxValue, (float)ulong.MaxValue };

// long.
yield return new object[] { long.MinValue, float.Parse("-9.223372E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { long.MinValue, (float)long.MinValue };
yield return new object[] { (long)(-1), (float)(-1) };
yield return new object[] { (long)0, (float)0 };
yield return new object[] { (long)1, (float)1 };
yield return new object[] { long.MaxValue, float.Parse("9.223372E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (LongEnum)long.MinValue, float.Parse("-9.223372E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { long.MaxValue, (float)long.MaxValue };
yield return new object[] { (LongEnum)long.MinValue, (float)long.MinValue };
yield return new object[] { (LongEnum)(-1), (float)(-1) };
yield return new object[] { (LongEnum)0, (float)0 };
yield return new object[] { (LongEnum)1, (float)1 };
yield return new object[] { (LongEnum)long.MaxValue, float.Parse("9.223372E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (LongEnum)long.MaxValue, (float)long.MaxValue };

// float.
yield return new object[] { float.MinValue, float.MinValue };
Expand All @@ -1721,11 +1721,11 @@ public static IEnumerable<object[]> ToSingle_Object_TestData()
yield return new object[] { double.NaN, float.NaN };

// decimal.
yield return new object[] { decimal.MinValue, float.Parse("-7.922816E+28", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { decimal.MinValue, (float)decimal.MinValue };
yield return new object[] { (decimal)(-1), (float)(-1) };
yield return new object[] { (decimal)0, (float)0 };
yield return new object[] { (decimal)1, (float)1 };
yield return new object[] { decimal.MaxValue, float.Parse("7.922816E+28", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { decimal.MaxValue, (float)decimal.MaxValue };

// bool.
yield return new object[] { true, (float)(-1) };
Expand Down Expand Up @@ -1790,8 +1790,8 @@ public static IEnumerable<object[]> ToDouble_String_TestData()
yield return new object[] { " &o5", (double)5 };
yield return new object[] { "&o0", (double)0 };
yield return new object[] { 1.1.ToString(), (double)1.1 };
yield return new object[] { "18446744073709551616", double.Parse("1.84467440737096E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { "1844674407370955161618446744073709551616", double.Parse("1.84467440737096E+39", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { "18446744073709551616", 18446744073709551616.0 };
yield return new object[] { "1844674407370955161618446744073709551616", 1844674407370955161618446744073709551616.0 };
yield return new object[] { double.PositiveInfinity.ToString(), double.PositiveInfinity };
yield return new object[] { double.NegativeInfinity.ToString(), double.NegativeInfinity };
yield return new object[] { double.NaN.ToString(), double.NaN };
Expand Down Expand Up @@ -1876,29 +1876,29 @@ public static IEnumerable<object[]> ToDouble_Object_TestData()
// ulong.
yield return new object[] { ulong.MinValue, (double)0 };
yield return new object[] { (ulong)1, (double)1 };
yield return new object[] { ulong.MaxValue, double.Parse("1.84467440737096E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { ulong.MaxValue, (double)ulong.MaxValue };
yield return new object[] { (ULongEnum)ulong.MinValue, (double)0 };
yield return new object[] { (ULongEnum)1, (double)1 };
yield return new object[] { (ULongEnum)ulong.MaxValue, double.Parse("1.84467440737096E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (ULongEnum)ulong.MaxValue, (double)ulong.MaxValue };

// long.
yield return new object[] { long.MinValue, double.Parse("-9.22337203685478E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { long.MinValue, (double)long.MinValue };
yield return new object[] { (long)(-1), (double)(-1) };
yield return new object[] { (long)0, (double)0 };
yield return new object[] { (long)1, (double)1 };
yield return new object[] { long.MaxValue, double.Parse("9.22337203685478E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (LongEnum)long.MinValue, double.Parse("-9.22337203685478E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { long.MaxValue, (double)long.MaxValue };
yield return new object[] { (LongEnum)long.MinValue, (double)long.MinValue };
yield return new object[] { (LongEnum)(-1), (double)(-1) };
yield return new object[] { (LongEnum)0, (double)0 };
yield return new object[] { (LongEnum)1, (double)1 };
yield return new object[] { (LongEnum)long.MaxValue, double.Parse("9.22337203685478E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { (LongEnum)long.MaxValue, (double)long.MaxValue };

// float.
yield return new object[] { float.MinValue, double.Parse("-3.40282346638529E+38", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { float.MinValue, (double)float.MinValue };
yield return new object[] { (float)(-1), (double)(-1) };
yield return new object[] { (float)0, (double)0 };
yield return new object[] { (float)1, (double)1 };
yield return new object[] { float.MaxValue, double.Parse("3.40282346638529E+38", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { float.MaxValue, (double)float.MaxValue };
yield return new object[] { float.PositiveInfinity, double.PositiveInfinity };
yield return new object[] { float.NegativeInfinity, double.NegativeInfinity };
yield return new object[] { float.NaN, double.NaN };
Expand All @@ -1914,11 +1914,11 @@ public static IEnumerable<object[]> ToDouble_Object_TestData()
yield return new object[] { double.NaN, double.NaN };

// decimal.
yield return new object[] { decimal.MinValue, double.Parse("-7.92281625142643E+28", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { decimal.MinValue, (double)decimal.MinValue };
yield return new object[] { (decimal)(-1), (double)(-1) };
yield return new object[] { (decimal)0, (double)0 };
yield return new object[] { (decimal)1, (double)1 };
yield return new object[] { decimal.MaxValue, double.Parse("7.92281625142643E+28", NumberStyles.Any, CultureInfo.InvariantCulture) };
yield return new object[] { decimal.MaxValue, (double)decimal.MaxValue };

// bool.
yield return new object[] { true, (double)(-1) };
Expand Down Expand Up @@ -1980,7 +1980,7 @@ public static IEnumerable<object[]> ToDecimal_String_TestData()
yield return new object[] { " &o5", (decimal)5 };
yield return new object[] { "&o0", (decimal)0 };
yield return new object[] { 1.1.ToString(), (decimal)1.1 };
yield return new object[] { "18446744073709551616", decimal.Parse("18446744073709551616", CultureInfo.InvariantCulture) };
yield return new object[] { "18446744073709551616", 18446744073709551616.0m };
}

[Theory]
Expand Down Expand Up @@ -2082,10 +2082,10 @@ public static IEnumerable<object[]> ToDecimal_Object_TestData()
// ulong.
yield return new object[] { ulong.MinValue, (decimal)0 };
yield return new object[] { (ulong)1, (decimal)1 };
yield return new object[] { ulong.MaxValue, decimal.Parse("18446744073709551615", CultureInfo.InvariantCulture) };
yield return new object[] { ulong.MaxValue, (decimal)ulong.MaxValue };
yield return new object[] { (ULongEnum)ulong.MinValue, (decimal)0 };
yield return new object[] { (ULongEnum)1, (decimal)1 };
yield return new object[] { (ULongEnum)ulong.MaxValue, decimal.Parse("18446744073709551615", CultureInfo.InvariantCulture) };
yield return new object[] { (ULongEnum)ulong.MaxValue, (decimal)ulong.MaxValue };

// long.
yield return new object[] { long.MinValue, (decimal)(-9223372036854775808) };
Expand Down
36 changes: 33 additions & 3 deletions src/System.ComponentModel.TypeConverter/tests/Drawing/SizeFConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,21 @@ public void ConvertFrom_NotSupported(object value)

[Theory]
[MemberData(nameof(SizeFData))]
public void ConvertTo(float width, float height)
[SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)]
public void ConvertTo_NetFramework(float width, float height)
{
TestConvertToString(new SizeF(width, height), FormattableString.Invariant($"{width:G9}, {height:G9}"));
}


[Theory]
[MemberData(nameof(SizeFData))]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
public void ConvertTo_NotNetFramework(float width, float height)
{
TestConvertToString(new SizeF(width, height), FormattableString.Invariant($"{width}, {height}"));
}

[Theory]
[InlineData(typeof(Size))]
[InlineData(typeof(SizeF))]
Expand Down Expand Up @@ -252,18 +262,38 @@ public void ConvertFromString_FormatException()

[Theory]
[MemberData(nameof(SizeFData))]
public void ConvertToInvariantString(float width, float height)
[SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)]
public void ConvertToInvariantString_NetFramework(float width, float height)
{
var str = Converter.ConvertToInvariantString(new SizeF(width, height));
Assert.Equal(FormattableString.Invariant($"{width:G9}, {height:G9}"), str);
}

[Theory]
[MemberData(nameof(SizeFData))]
public void ConvertToString(float width, float height)
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
public void ConvertToInvariantString_NotNetFramework(float width, float height)
{
var str = Converter.ConvertToInvariantString(new SizeF(width, height));
Assert.Equal(FormattableString.Invariant($"{width}, {height}"), str);
}

[Theory]
[MemberData(nameof(SizeFData))]
[SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)]
public void ConvertToString_NetFramework(float width, float height)
{
var str = Converter.ConvertToString(new SizeF(width, height));
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "{0:G9}{2} {1:G9}", width, height, CultureInfo.CurrentCulture.TextInfo.ListSeparator), str);
}

[Theory]
[MemberData(nameof(SizeFData))]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
public void ConvertToString_NotNetFramework(float width, float height)
{
var str = Converter.ConvertToString(new SizeF(width, height));
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "{0}{2} {1}", width, height, CultureInfo.CurrentCulture.TextInfo.ListSeparator), str);
}
}
}
4 changes: 2 additions & 2 deletions src/System.Data.Common/tests/System/Data/DataColumnTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,8 +550,8 @@ public void ExpressionAggregates()
Assert.Equal("60", T.Rows[60][3]);

C.Expression = "stdev (Child.age)";
Assert.Equal((1.4142135623731).ToString(T.Locale), T.Rows[0][3]);
Assert.Equal((1.4142135623731).ToString(T.Locale), T.Rows[60][3]);
Assert.Equal((1.4142135623730951).ToString(T.Locale), T.Rows[0][3]);
Assert.Equal((1.4142135623730951).ToString(T.Locale), T.Rows[60][3]);

C.Expression = "var (Child.age)";
Assert.Equal("2", T.Rows[0][3]);
Expand Down
Loading