Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit ebf1c97

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from dotnet/coreclr (#35051)
* Update dependencies from https://github.com/dotnet/coreclr build 20190201.72 This change updates the following dependencies - Microsoft.NET.Sdk.IL - 3.0.0-preview-27401-72 - Microsoft.NETCore.ILAsm - 3.0.0-preview-27401-72 - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview-27401-72 * Update dependencies from https://github.com/dotnet/coreclr build 20190202.72 This change updates the following dependencies - Microsoft.NET.Sdk.IL - 3.0.0-preview-27402-72 - Microsoft.NETCore.ILAsm - 3.0.0-preview-27402-72 - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview-27402-72 * Fixing various tests that have new behavior due to the string formatting changes for double/float.
1 parent e572fa9 commit ebf1c97

File tree

18 files changed

+425
-98
lines changed

18 files changed

+425
-98
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
<Uri>https://github.com/dotnet/corefx</Uri>
1919
<Sha>381ad4365dcc8d901fc70cb80430e103f4606205</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview-27331-72">
21+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview-27402-72">
2222
<Uri>https://github.com/dotnet/coreclr</Uri>
23-
<Sha>193d5da27fecb7bf95e7342f1c4b9e2b63ce5313</Sha>
23+
<Sha>070b5d7a403e991777ead838975d58e66aec1264</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview-27331-72">
25+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview-27402-72">
2626
<Uri>https://github.com/dotnet/coreclr</Uri>
27-
<Sha>193d5da27fecb7bf95e7342f1c4b9e2b63ce5313</Sha>
27+
<Sha>070b5d7a403e991777ead838975d58e66aec1264</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview-27331-72">
29+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview-27402-72">
3030
<Uri>https://github.com/dotnet/coreclr</Uri>
31-
<Sha>193d5da27fecb7bf95e7342f1c4b9e2b63ce5313</Sha>
31+
<Sha>070b5d7a403e991777ead838975d58e66aec1264</Sha>
3232
</Dependency>
3333
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19081.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview-27330-4</MicrosoftNETCoreDotNetHostPackageVersion>
3232
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview-27330-4</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
3333
<!-- Coreclr dependencies -->
34-
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview-27331-72</MicrosoftNETCoreILAsmPackageVersion>
35-
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27331-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
34+
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview-27402-72</MicrosoftNETCoreILAsmPackageVersion>
35+
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27402-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
3636
<!-- Corefx dependencies -->
3737
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19102.2</MicrosoftNETCorePlatformsPackageVersion>
3838
<!-- Standard dependencies -->

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"msbuild-sdks": {
66
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19081.1",
77
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19081.1",
8-
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27331-72"
8+
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27402-72"
99
}
1010
}

‎src/Microsoft.VisualBasic.Core/tests/ConversionsTests.cs‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,7 +1586,7 @@ public static IEnumerable<object[]> ToSingle_String_TestData()
15861586
yield return new object[] { " &o5", (float)5 };
15871587
yield return new object[] { "&o0", (float)0 };
15881588
yield return new object[] { 1.1.ToString(), (float)1.1 };
1589-
yield return new object[] { "18446744073709551616", float.Parse("1.844674E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
1589+
yield return new object[] { "18446744073709551616", 18446744073709551616.0f };
15901590
yield return new object[] { double.PositiveInfinity.ToString(), float.PositiveInfinity };
15911591
yield return new object[] { double.NegativeInfinity.ToString(), float.NegativeInfinity };
15921592
yield return new object[] { double.NaN.ToString(), float.NaN };
@@ -1663,42 +1663,42 @@ public static IEnumerable<object[]> ToSingle_Object_TestData()
16631663
// uint.
16641664
yield return new object[] { uint.MinValue, (float)0 };
16651665
yield return new object[] { (uint)1, (float)1 };
1666-
yield return new object[] { uint.MaxValue, float.Parse("4.294967E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
1666+
yield return new object[] { uint.MaxValue, (float)uint.MaxValue };
16671667
yield return new object[] { (UIntEnum)uint.MinValue, (float)0 };
16681668
yield return new object[] { (UIntEnum)1, (float)1 };
1669-
yield return new object[] { (UIntEnum)uint.MaxValue, float.Parse("4.294967E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
1669+
yield return new object[] { (UIntEnum)uint.MaxValue, (float)uint.MaxValue };
16701670

16711671
// int.
1672-
yield return new object[] { int.MinValue, float.Parse("-2.147484E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
1672+
yield return new object[] { int.MinValue, (float)int.MinValue };
16731673
yield return new object[] { -1, (float)(-1) };
16741674
yield return new object[] { 0, (float)0 };
16751675
yield return new object[] { 1, (float)1 };
1676-
yield return new object[] { int.MaxValue, float.Parse("2.147484E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
1677-
yield return new object[] { (IntEnum)int.MinValue, float.Parse("-2.147484E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
1676+
yield return new object[] { int.MaxValue, (float)int.MaxValue };
1677+
yield return new object[] { (IntEnum)int.MinValue, (float)int.MinValue };
16781678
yield return new object[] { (IntEnum)(-1), (float)(-1) };
16791679
yield return new object[] { (IntEnum)0, (float)0 };
16801680
yield return new object[] { (IntEnum)1, (float)1 };
1681-
yield return new object[] { (IntEnum)int.MaxValue, float.Parse("2.147484E+09", NumberStyles.Any, CultureInfo.InvariantCulture) };
1681+
yield return new object[] { (IntEnum)int.MaxValue, (float)int.MaxValue };
16821682

16831683
// ulong.
16841684
yield return new object[] { ulong.MinValue, (float)0 };
16851685
yield return new object[] { (ulong)1, (float)1 };
1686-
yield return new object[] { ulong.MaxValue, float.Parse("1.844674E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
1686+
yield return new object[] { ulong.MaxValue, (float)ulong.MaxValue };
16871687
yield return new object[] { (ULongEnum)ulong.MinValue, (float)0 };
16881688
yield return new object[] { (ULongEnum)1, (float)1 };
1689-
yield return new object[] { (ULongEnum)ulong.MaxValue, float.Parse("1.844674E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
1689+
yield return new object[] { (ULongEnum)ulong.MaxValue, (float)ulong.MaxValue };
16901690

16911691
// long.
1692-
yield return new object[] { long.MinValue, float.Parse("-9.223372E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
1692+
yield return new object[] { long.MinValue, (float)long.MinValue };
16931693
yield return new object[] { (long)(-1), (float)(-1) };
16941694
yield return new object[] { (long)0, (float)0 };
16951695
yield return new object[] { (long)1, (float)1 };
1696-
yield return new object[] { long.MaxValue, float.Parse("9.223372E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
1697-
yield return new object[] { (LongEnum)long.MinValue, float.Parse("-9.223372E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
1696+
yield return new object[] { long.MaxValue, (float)long.MaxValue };
1697+
yield return new object[] { (LongEnum)long.MinValue, (float)long.MinValue };
16981698
yield return new object[] { (LongEnum)(-1), (float)(-1) };
16991699
yield return new object[] { (LongEnum)0, (float)0 };
17001700
yield return new object[] { (LongEnum)1, (float)1 };
1701-
yield return new object[] { (LongEnum)long.MaxValue, float.Parse("9.223372E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
1701+
yield return new object[] { (LongEnum)long.MaxValue, (float)long.MaxValue };
17021702

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

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

17301730
// bool.
17311731
yield return new object[] { true, (float)(-1) };
@@ -1790,8 +1790,8 @@ public static IEnumerable<object[]> ToDouble_String_TestData()
17901790
yield return new object[] { " &o5", (double)5 };
17911791
yield return new object[] { "&o0", (double)0 };
17921792
yield return new object[] { 1.1.ToString(), (double)1.1 };
1793-
yield return new object[] { "18446744073709551616", double.Parse("1.84467440737096E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
1794-
yield return new object[] { "1844674407370955161618446744073709551616", double.Parse("1.84467440737096E+39", NumberStyles.Any, CultureInfo.InvariantCulture) };
1793+
yield return new object[] { "18446744073709551616", 18446744073709551616.0 };
1794+
yield return new object[] { "1844674407370955161618446744073709551616", 1844674407370955161618446744073709551616.0 };
17951795
yield return new object[] { double.PositiveInfinity.ToString(), double.PositiveInfinity };
17961796
yield return new object[] { double.NegativeInfinity.ToString(), double.NegativeInfinity };
17971797
yield return new object[] { double.NaN.ToString(), double.NaN };
@@ -1876,29 +1876,29 @@ public static IEnumerable<object[]> ToDouble_Object_TestData()
18761876
// ulong.
18771877
yield return new object[] { ulong.MinValue, (double)0 };
18781878
yield return new object[] { (ulong)1, (double)1 };
1879-
yield return new object[] { ulong.MaxValue, double.Parse("1.84467440737096E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
1879+
yield return new object[] { ulong.MaxValue, (double)ulong.MaxValue };
18801880
yield return new object[] { (ULongEnum)ulong.MinValue, (double)0 };
18811881
yield return new object[] { (ULongEnum)1, (double)1 };
1882-
yield return new object[] { (ULongEnum)ulong.MaxValue, double.Parse("1.84467440737096E+19", NumberStyles.Any, CultureInfo.InvariantCulture) };
1882+
yield return new object[] { (ULongEnum)ulong.MaxValue, (double)ulong.MaxValue };
18831883

18841884
// long.
1885-
yield return new object[] { long.MinValue, double.Parse("-9.22337203685478E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
1885+
yield return new object[] { long.MinValue, (double)long.MinValue };
18861886
yield return new object[] { (long)(-1), (double)(-1) };
18871887
yield return new object[] { (long)0, (double)0 };
18881888
yield return new object[] { (long)1, (double)1 };
1889-
yield return new object[] { long.MaxValue, double.Parse("9.22337203685478E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
1890-
yield return new object[] { (LongEnum)long.MinValue, double.Parse("-9.22337203685478E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
1889+
yield return new object[] { long.MaxValue, (double)long.MaxValue };
1890+
yield return new object[] { (LongEnum)long.MinValue, (double)long.MinValue };
18911891
yield return new object[] { (LongEnum)(-1), (double)(-1) };
18921892
yield return new object[] { (LongEnum)0, (double)0 };
18931893
yield return new object[] { (LongEnum)1, (double)1 };
1894-
yield return new object[] { (LongEnum)long.MaxValue, double.Parse("9.22337203685478E+18", NumberStyles.Any, CultureInfo.InvariantCulture) };
1894+
yield return new object[] { (LongEnum)long.MaxValue, (double)long.MaxValue };
18951895

18961896
// float.
1897-
yield return new object[] { float.MinValue, double.Parse("-3.40282346638529E+38", NumberStyles.Any, CultureInfo.InvariantCulture) };
1897+
yield return new object[] { float.MinValue, (double)float.MinValue };
18981898
yield return new object[] { (float)(-1), (double)(-1) };
18991899
yield return new object[] { (float)0, (double)0 };
19001900
yield return new object[] { (float)1, (double)1 };
1901-
yield return new object[] { float.MaxValue, double.Parse("3.40282346638529E+38", NumberStyles.Any, CultureInfo.InvariantCulture) };
1901+
yield return new object[] { float.MaxValue, (double)float.MaxValue };
19021902
yield return new object[] { float.PositiveInfinity, double.PositiveInfinity };
19031903
yield return new object[] { float.NegativeInfinity, double.NegativeInfinity };
19041904
yield return new object[] { float.NaN, double.NaN };
@@ -1914,11 +1914,11 @@ public static IEnumerable<object[]> ToDouble_Object_TestData()
19141914
yield return new object[] { double.NaN, double.NaN };
19151915

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

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

19861986
[Theory]
@@ -2082,10 +2082,10 @@ public static IEnumerable<object[]> ToDecimal_Object_TestData()
20822082
// ulong.
20832083
yield return new object[] { ulong.MinValue, (decimal)0 };
20842084
yield return new object[] { (ulong)1, (decimal)1 };
2085-
yield return new object[] { ulong.MaxValue, decimal.Parse("18446744073709551615", CultureInfo.InvariantCulture) };
2085+
yield return new object[] { ulong.MaxValue, (decimal)ulong.MaxValue };
20862086
yield return new object[] { (ULongEnum)ulong.MinValue, (decimal)0 };
20872087
yield return new object[] { (ULongEnum)1, (decimal)1 };
2088-
yield return new object[] { (ULongEnum)ulong.MaxValue, decimal.Parse("18446744073709551615", CultureInfo.InvariantCulture) };
2088+
yield return new object[] { (ULongEnum)ulong.MaxValue, (decimal)ulong.MaxValue };
20892089

20902090
// long.
20912091
yield return new object[] { long.MinValue, (decimal)(-9223372036854775808) };

‎src/System.ComponentModel.TypeConverter/tests/Drawing/SizeFConverterTests.cs‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,21 @@ public void ConvertFrom_NotSupported(object value)
134134

135135
[Theory]
136136
[MemberData(nameof(SizeFData))]
137-
public void ConvertTo(float width, float height)
137+
[SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)]
138+
public void ConvertTo_NetFramework(float width, float height)
138139
{
139140
TestConvertToString(new SizeF(width, height), FormattableString.Invariant($"{width:G9}, {height:G9}"));
140141
}
141142

143+
144+
[Theory]
145+
[MemberData(nameof(SizeFData))]
146+
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
147+
public void ConvertTo_NotNetFramework(float width, float height)
148+
{
149+
TestConvertToString(new SizeF(width, height), FormattableString.Invariant($"{width}, {height}"));
150+
}
151+
142152
[Theory]
143153
[InlineData(typeof(Size))]
144154
[InlineData(typeof(SizeF))]
@@ -252,18 +262,38 @@ public void ConvertFromString_FormatException()
252262

253263
[Theory]
254264
[MemberData(nameof(SizeFData))]
255-
public void ConvertToInvariantString(float width, float height)
265+
[SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)]
266+
public void ConvertToInvariantString_NetFramework(float width, float height)
256267
{
257268
var str = Converter.ConvertToInvariantString(new SizeF(width, height));
258269
Assert.Equal(FormattableString.Invariant($"{width:G9}, {height:G9}"), str);
259270
}
260271

261272
[Theory]
262273
[MemberData(nameof(SizeFData))]
263-
public void ConvertToString(float width, float height)
274+
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
275+
public void ConvertToInvariantString_NotNetFramework(float width, float height)
276+
{
277+
var str = Converter.ConvertToInvariantString(new SizeF(width, height));
278+
Assert.Equal(FormattableString.Invariant($"{width}, {height}"), str);
279+
}
280+
281+
[Theory]
282+
[MemberData(nameof(SizeFData))]
283+
[SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)]
284+
public void ConvertToString_NetFramework(float width, float height)
264285
{
265286
var str = Converter.ConvertToString(new SizeF(width, height));
266287
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "{0:G9}{2} {1:G9}", width, height, CultureInfo.CurrentCulture.TextInfo.ListSeparator), str);
267288
}
289+
290+
[Theory]
291+
[MemberData(nameof(SizeFData))]
292+
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
293+
public void ConvertToString_NotNetFramework(float width, float height)
294+
{
295+
var str = Converter.ConvertToString(new SizeF(width, height));
296+
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "{0}{2} {1}", width, height, CultureInfo.CurrentCulture.TextInfo.ListSeparator), str);
297+
}
268298
}
269299
}

‎src/System.Data.Common/tests/System/Data/DataColumnTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,8 +550,8 @@ public void ExpressionAggregates()
550550
Assert.Equal("60", T.Rows[60][3]);
551551

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

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

0 commit comments

Comments
 (0)