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

[master] Update dependencies from dotnet/coreclr #36922

Merged
tannergooding merged 6 commits into from
Apr 17, 2019
Merged

[master] Update dependencies from dotnet/coreclr #36922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38ceb0a
Update dependencies from https://github.com/dotnet/coreclr build 2019…
Apr 16, 2019
2fd8f3a
Merge branch 'master' into darc-master-497eebb2-f99e-499f-9700-3a5b53…
GrabYourPitchforks Apr 16, 2019
053f582
Merge branch 'master' into darc-master-497eebb2-f99e-499f-9700-3a5b53…
GrabYourPitchforks Apr 17, 2019
5943b02
Update dependencies from https://github.com/dotnet/coreclr build 2019…
Apr 17, 2019
048a700
Update CoreCLR dependencies to 3.0.0-preview5-27616-73
GrabYourPitchforks Apr 17, 2019
0c71051
Fixing the Min/Max and MinMagnitude/MaxMagnitude for System.Math and …
tannergooding Apr 16, 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
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview5-27614-72">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview5-27616-73">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>6c9438d58613267701396c7a25eae4c3a5e2c570</Sha>
<Sha>df2f4c4feb273545e91fd8d7d170dc424b741f19</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview5-27614-72">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview5-27616-73">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>6c9438d58613267701396c7a25eae4c3a5e2c570</Sha>
<Sha>df2f4c4feb273545e91fd8d7d170dc424b741f19</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview5-27614-72">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview5-27616-73">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>6c9438d58613267701396c7a25eae4c3a5e2c570</Sha>
<Sha>df2f4c4feb273545e91fd8d7d170dc424b741f19</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27614-10">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27617-05">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f9decfe63aadb21139c048ce3ea43982982e5000</Sha>
<Sha>232d4c4ce89ee15260f8001ff1d6aa7a8e63fbfb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0-preview5-27614-10">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0-preview5-27617-05">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f9decfe63aadb21139c048ce3ea43982982e5000</Sha>
<Sha>232d4c4ce89ee15260f8001ff1d6aa7a8e63fbfb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0-preview5-27614-10">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0-preview5-27617-05">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f9decfe63aadb21139c048ce3ea43982982e5000</Sha>
<Sha>232d4c4ce89ee15260f8001ff1d6aa7a8e63fbfb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19214.16">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19217.2">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>81e0e2cb79e272e6e270c6562017b64f9c773e99</Sha>
<Sha>18cd561127e35841db2775dc7a85adad70363e18</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19216.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>09e01af076175a6dbf19e442707722e751a7163b</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19214.1">
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19217.1">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>92f85005229d728cff057d52579560cd86a511a8</Sha>
<Sha>4ed1867803dd2fa96b671b45e1afd1c12d268627</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19216.2">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19216.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19216.2</MicrosoftDotNetVersionToolsTasksPackageVersion>
<!-- Core-setup dependencies -->
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27614-10</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview5-27614-10</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview5-27614-10</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27617-05</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview5-27617-05</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview5-27617-05</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<!-- Coreclr dependencies -->
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview5-27614-72</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview5-27614-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview5-27616-73</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview5-27616-73</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<!-- Corefx dependencies -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview5.19214.16</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview5.19217.2</MicrosoftNETCorePlatformsPackageVersion>
<!-- Standard dependencies -->
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19214.1</NETStandardLibraryPackageVersion>
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19217.1</NETStandardLibraryPackageVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64IBCCoreFxPackageVersion>99.99.99-master-20190313.3</optimizationwindows_ntx64IBCCoreFxPackageVersion>
</PropertyGroup>
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.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"
}
}
8 changes: 4 additions & 4 deletions src/System.Runtime.Extensions/tests/System/Math.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down
8 changes: 4 additions & 4 deletions src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down