From 38ceb0aeb96d9d7d8d2dcf2d54c5b29b8abbfd67 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 16 Apr 2019 13:08:24 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/coreclr build 20190415.72 - Microsoft.NET.Sdk.IL - 3.0.0-preview5-27615-72 - Microsoft.NETCore.ILAsm - 3.0.0-preview5-27615-72 - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview5-27615-72 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3605c596c3d..242d8367b418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/coreclr - 6c9438d58613267701396c7a25eae4c3a5e2c570 + 47c6539dc73a23bf167e5eaadce475475c512f44 - + https://github.com/dotnet/coreclr - 6c9438d58613267701396c7a25eae4c3a5e2c570 + 47c6539dc73a23bf167e5eaadce475475c512f44 - + https://github.com/dotnet/coreclr - 6c9438d58613267701396c7a25eae4c3a5e2c570 + 47c6539dc73a23bf167e5eaadce475475c512f44 diff --git a/eng/Versions.props b/eng/Versions.props index 57e954b30de5..9e0aa7bedf44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,8 +41,8 @@ 3.0.0-preview5-27614-10 3.0.0-preview5-27614-10 - 3.0.0-preview5-27614-72 - 3.0.0-preview5-27614-72 + 3.0.0-preview5-27615-72 + 3.0.0-preview5-27615-72 3.0.0-preview5.19214.16 diff --git a/global.json b/global.json index 16bf4532d89a..8d0b4d5f91ee 100644 --- a/global.json +++ b/global.json @@ -5,6 +5,6 @@ "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19215.1", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19215.1", - "Microsoft.NET.Sdk.IL": "3.0.0-preview5-27614-72" + "Microsoft.NET.Sdk.IL": "3.0.0-preview5-27615-72" } } From 5943b022f255bd289371da519c7e243f09410dbc Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 17 Apr 2019 13:08:29 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/coreclr build 20190416.72 - Microsoft.NET.Sdk.IL - 3.0.0-preview5-27616-72 - Microsoft.NETCore.ILAsm - 3.0.0-preview5-27616-72 - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview5-27616-72 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd4971816f3d..d5147d50a80e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/coreclr - 47c6539dc73a23bf167e5eaadce475475c512f44 + f360bbc0cf893bcd612516563145729743d3af2b - + https://github.com/dotnet/coreclr - 47c6539dc73a23bf167e5eaadce475475c512f44 + f360bbc0cf893bcd612516563145729743d3af2b - + https://github.com/dotnet/coreclr - 47c6539dc73a23bf167e5eaadce475475c512f44 + f360bbc0cf893bcd612516563145729743d3af2b diff --git a/eng/Versions.props b/eng/Versions.props index aa6aacae6ab7..6aa012b4f9d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,8 +41,8 @@ 3.0.0-preview5-27614-10 3.0.0-preview5-27614-10 - 3.0.0-preview5-27615-72 - 3.0.0-preview5-27615-72 + 3.0.0-preview5-27616-72 + 3.0.0-preview5-27616-72 3.0.0-preview5.19214.16 diff --git a/global.json b/global.json index 869295574b26..b1f58ad69f7f 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-27615-72" + "Microsoft.NET.Sdk.IL": "3.0.0-preview5-27616-72" } } From 048a7000b97a635b57409586477cb35b6dc9c875 Mon Sep 17 00:00:00 2001 From: Levi Broderick Date: Wed, 17 Apr 2019 11:44:34 -0700 Subject: [PATCH 3/4] Update CoreCLR dependencies to 3.0.0-preview5-27616-73 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- global.json | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5147d50a80e..6f895aa54cf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + https://github.com/dotnet/coreclr - f360bbc0cf893bcd612516563145729743d3af2b + df2f4c4feb273545e91fd8d7d170dc424b741f19 - + https://github.com/dotnet/coreclr - f360bbc0cf893bcd612516563145729743d3af2b + df2f4c4feb273545e91fd8d7d170dc424b741f19 - + https://github.com/dotnet/coreclr - f360bbc0cf893bcd612516563145729743d3af2b + 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 6aa012b4f9d3..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-27616-72 - 3.0.0-preview5-27616-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 b1f58ad69f7f..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-27616-72" + "Microsoft.NET.Sdk.IL": "3.0.0-preview5-27616-73" } } From 0c710519165651f69d9062a6f85c2bde78efa353 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Tue, 16 Apr 2019 13:43:45 -0700 Subject: [PATCH 4/4] Fixing the Min/Max and MinMagnitude/MaxMagnitude for System.Math and System.MathF to expect NaN propagation --- src/System.Runtime.Extensions/tests/System/Math.cs | 8 ++++---- .../tests/System/MathF.netcoreapp.cs | 8 ++++---- .../tests/System/MathTests.netcoreapp.cs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) 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);