diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcef779f4ef2..6f895aa54cf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + https://github.com/dotnet/coreclr - 6c9438d58613267701396c7a25eae4c3a5e2c570 + df2f4c4feb273545e91fd8d7d170dc424b741f19 - + https://github.com/dotnet/coreclr - 6c9438d58613267701396c7a25eae4c3a5e2c570 + df2f4c4feb273545e91fd8d7d170dc424b741f19 - + https://github.com/dotnet/coreclr - 6c9438d58613267701396c7a25eae4c3a5e2c570 + df2f4c4feb273545e91fd8d7d170dc424b741f19 - + https://github.com/dotnet/core-setup - f9decfe63aadb21139c048ce3ea43982982e5000 + 232d4c4ce89ee15260f8001ff1d6aa7a8e63fbfb - + https://github.com/dotnet/core-setup - f9decfe63aadb21139c048ce3ea43982982e5000 + 232d4c4ce89ee15260f8001ff1d6aa7a8e63fbfb - + https://github.com/dotnet/core-setup - f9decfe63aadb21139c048ce3ea43982982e5000 + 232d4c4ce89ee15260f8001ff1d6aa7a8e63fbfb - + https://github.com/dotnet/corefx - 81e0e2cb79e272e6e270c6562017b64f9c773e99 + 18cd561127e35841db2775dc7a85adad70363e18 https://github.com/dotnet/arcade 09e01af076175a6dbf19e442707722e751a7163b - + https://github.com/dotnet/standard - 92f85005229d728cff057d52579560cd86a511a8 + 4ed1867803dd2fa96b671b45e1afd1c12d268627 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 72f35fe878ad..c80825a4eac2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,16 +37,16 @@ 2.2.0-beta.19216.2 1.0.0-beta.19216.2 - 3.0.0-preview5-27614-10 - 3.0.0-preview5-27614-10 - 3.0.0-preview5-27614-10 + 3.0.0-preview5-27617-05 + 3.0.0-preview5-27617-05 + 3.0.0-preview5-27617-05 - 3.0.0-preview5-27614-72 - 3.0.0-preview5-27614-72 + 3.0.0-preview5-27616-73 + 3.0.0-preview5-27616-73 - 3.0.0-preview5.19214.16 + 3.0.0-preview5.19217.2 - 2.1.0-prerelease.19214.1 + 2.1.0-prerelease.19217.1 99.99.99-master-20190313.3 diff --git a/global.json b/global.json index 35260c47f30c..24c7ab83d22f 100644 --- a/global.json +++ b/global.json @@ -5,6 +5,6 @@ "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19216.2", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19216.2", - "Microsoft.NET.Sdk.IL": "3.0.0-preview5-27614-72" + "Microsoft.NET.Sdk.IL": "3.0.0-preview5-27616-73" } } diff --git a/src/System.Runtime.Extensions/tests/System/Math.cs b/src/System.Runtime.Extensions/tests/System/Math.cs index c066a1f8e0fc..c7ff12f1d066 100644 --- a/src/System.Runtime.Extensions/tests/System/Math.cs +++ b/src/System.Runtime.Extensions/tests/System/Math.cs @@ -1080,7 +1080,7 @@ public static void Max_Double_NetFramework() [InlineData(-0.0, 0.0, 0.0)] [InlineData(2.0, -3.0, 2.0)] [InlineData(3.0, -2.0, 3.0)] - [InlineData(double.PositiveInfinity, double.NaN, double.PositiveInfinity)] + [InlineData(double.PositiveInfinity, double.NaN, double.NaN)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void Max_Double_NotNetFramework(double x, double y, double expectedResult) { @@ -1133,7 +1133,7 @@ public static void Max_Single_NetFramework() [InlineData(-0.0f, 0.0f, 0.0f)] [InlineData(2.0f, -3.0f, 2.0f)] [InlineData(3.0f, -2.0f, 3.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void Max_Single_NotNetFramework(float x, float y, float expectedResult) { @@ -1193,7 +1193,7 @@ public static void Min_Double_NetFramework() [InlineData(-0.0, 0.0, -0.0)] [InlineData(2.0, -3.0, -3.0)] [InlineData(3.0, -2.0, -2.0)] - [InlineData(double.PositiveInfinity, double.NaN, double.PositiveInfinity)] + [InlineData(double.PositiveInfinity, double.NaN, double.NaN)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void Min_Double_NotNetFramework(double x, double y, double expectedResult) { @@ -1246,7 +1246,7 @@ public static void Min_Single_NetFramework() [InlineData(-0.0f, 0.0f, -0.0f)] [InlineData(2.0f, -3.0f, -3.0f)] [InlineData(3.0f, -2.0f, -2.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void Min_Single_NotNetFramework(float x, float y, float expectedResult) { diff --git a/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs b/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs index 905ebf9de7aa..89836e9c3a05 100644 --- a/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs +++ b/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs @@ -1208,7 +1208,7 @@ public static void Log10(float value, float expectedResult, float allowedVarianc [InlineData(-0.0f, 0.0f, 0.0f)] [InlineData(2.0f, -3.0f, 2.0f)] [InlineData(3.0f, -2.0f, 3.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] public static void Max(float x, float y, float expectedResult) { AssertEqual(expectedResult, MathF.Max(x, y), 0.0f); @@ -1221,7 +1221,7 @@ public static void Max(float x, float y, float expectedResult) [InlineData(-0.0f, 0.0f, 0.0f)] [InlineData(2.0f, -3.0f, -3.0f)] [InlineData(3.0f, -2.0f, 3.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] public static void MaxMagnitude(float x, float y, float expectedResult) { AssertEqual(expectedResult, MathF.MaxMagnitude(x, y), 0.0f); @@ -1234,7 +1234,7 @@ public static void MaxMagnitude(float x, float y, float expectedResult) [InlineData(-0.0f, 0.0f, -0.0f)] [InlineData(2.0f, -3.0f, -3.0f)] [InlineData(3.0f, -2.0f, -2.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] public static void Min(float x, float y, float expectedResult) { AssertEqual(expectedResult, MathF.Min(x, y), 0.0f); @@ -1247,7 +1247,7 @@ public static void Min(float x, float y, float expectedResult) [InlineData(-0.0f, 0.0f, -0.0f)] [InlineData(2.0f, -3.0f, 2.0f)] [InlineData(3.0f, -2.0f, -2.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] public static void MinMagnitude(float x, float y, float expectedResult) { AssertEqual(expectedResult, MathF.MinMagnitude(x, y), 0.0f); diff --git a/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs b/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs index 682c8a904364..71c5de3e3398 100644 --- a/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs +++ b/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs @@ -599,7 +599,7 @@ public static void Log2(double value, double expectedResult, double allowedVaria [InlineData(-0.0, 0.0, 0.0)] [InlineData(2.0, -3.0, -3.0)] [InlineData(3.0, -2.0, 3.0)] - [InlineData(double.PositiveInfinity, double.NaN, double.PositiveInfinity)] + [InlineData(double.PositiveInfinity, double.NaN, double.NaN)] public static void MaxMagnitude(double x, double y, double expectedResult) { AssertEqual(expectedResult, Math.MaxMagnitude(x, y), 0.0); @@ -612,7 +612,7 @@ public static void MaxMagnitude(double x, double y, double expectedResult) [InlineData(-0.0, 0.0, -0.0)] [InlineData(2.0, -3.0, 2.0)] [InlineData(3.0, -2.0, -2.0)] - [InlineData(double.PositiveInfinity, double.NaN, double.PositiveInfinity)] + [InlineData(double.PositiveInfinity, double.NaN, double.NaN)] public static void MinMagnitude(double x, double y, double expectedResult) { AssertEqual(expectedResult, Math.MinMagnitude(x, y), 0.0);