Merge pull request #12183 from tannergooding/math

Updating the 'System.Runtime.Extensions' contracts to include the new single-precision Math APIs.

Author: mellinoe

pkg/descriptions.json

@@ -1251,6 +1251,7 @@
     "Description": "Provides commonly-used classes for performing mathematical functions, conversions, string comparisons and querying environment information.",
     "CommonTypes": [
       "System.Math",
+      "System.MathF",
       "System.Environment",
       "System.Random",
       "System.Progress<T>",

src/System.Runtime.Extensions/ref/System.Runtime.Extensions.Manual.cs

@@ -14,4 +14,11 @@ public static partial class Math
         public const double PI = 3.14159265358979323846;
         public const double E = 2.7182818284590452354;
     }
+#if netcoreapp11
+    public static partial class MathF
+    {
+        public const float PI = 3.14159265f;
+        public const float E = 2.71828183f;
+    }
+#endif
 }

src/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs

@@ -134,7 +134,13 @@ public static partial class BitConverter
         public static byte[] GetBytes(uint value) { throw null; }
         [System.CLSCompliantAttribute(false)]
         public static byte[] GetBytes(ulong value) { throw null; }
+#if netcoreapp11
+        public static float Int32BitsToSingle(int value) { throw null; }
+#endif
         public static double Int64BitsToDouble(long value) { throw null; }
+#if netcoreapp11
+        public static int SingleToInt32Bits(float value) { throw null; }
+#endif
         public static bool ToBoolean(byte[] value, int startIndex) { throw null; }
         public static char ToChar(byte[] value, int startIndex) { throw null; }
         public static double ToDouble(byte[] value, int startIndex) { throw null; }
@@ -790,6 +796,39 @@ public static partial class Math
         public static decimal Truncate(decimal d) { throw null; }
         public static double Truncate(double d) { throw null; }
     }
+#if netcoreapp11
+    public static partial class MathF
+    {
+        public static float Abs(float x) { throw null; }
+        public static float Acos(float x) { throw null; }
+        public static float Asin(float x) { throw null; }
+        public static float Atan(float x) { throw null; }
+        public static float Atan2(float y, float x) { throw null; }
+        public static float Ceiling(float x) { throw null; }
+        public static float Cos(float x) { throw null; }
+        public static float Cosh(float x) { throw null; }
+        public static float Exp(float x) { throw null; }
+        public static float Floor(float x) { throw null; }
+        public static float IEEERemainder(float x, float y) { throw null; }
+        public static float Log(float x) { throw null; }
+        public static float Log(float x, float y) { throw null; }
+        public static float Log10(float x) { throw null; }        
+        public static float Max(float x, float y) { throw null; }
+        public static float Min(float x, float y) { throw null; }
+        public static float Pow(float x, float y) { throw null; }
+        public static float Round(float x) { throw null; }
+        public static float Round(float x, int digits) { throw null; }
+        public static float Round(float x, int digits, System.MidpointRounding mode) { throw null; }
+        public static float Round(float x, System.MidpointRounding mode) { throw null; }
+        public static int Sign(float x) { return default(int); }
+        public static float Sin(float x) { throw null; }
+        public static float Sinh(float x) { throw null; }
+        public static float Sqrt(float x) { throw null; }
+        public static float Tan(float x) { throw null; }
+        public static float Tanh(float x) { throw null; }
+        public static float Truncate(float x) { throw null; }
+    }
+#endif
     public sealed class OperatingSystem : System.ICloneable, System.Runtime.Serialization.ISerializable
     {
         private OperatingSystem() { }

src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj

@@ -45,6 +45,7 @@
     <Compile Include="System\Environment.SpecialFolder.cs" />
     <Compile Include="System\Environment.SpecialFolderOption.cs" />
     <Compile Include="System\EnvironmentVariableTarget.cs" />
+    <Compile Include="System\MathF.cs" /> <!-- https://github.com/dotnet/buildtools/issues/1041 -->
     <Compile Include="System\OperatingSystem.cs" />
     <Compile Include="System\PlatformID.cs" />
     <Compile Include="System\IO\Path.cs" />

src/System.Runtime.Extensions/src/System/BitConverter.cs

@@ -453,6 +453,18 @@ public static unsafe double Int64BitsToDouble(long value)
             return *((double*)&value);
         }
 
+        [SecuritySafeCritical]
+        public static unsafe int SingleToInt32Bits(float value)
+        {
+            return *((int*)&value);
+        }
+
+        [SecuritySafeCritical]
+        public static unsafe float Int32BitsToSingle(int value)
+        {
+            return *((float*)&value);
+        }
+
         private static void ThrowValueArgumentNull()
         {
             throw new ArgumentNullException("value");

src/System.Runtime.Extensions/src/System/MathF.cs

@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+
+// We normally shouldn't have to manually specify the
+// TypeForwardedToAttribute. The following bug is tracking
+// this: https://github.com/dotnet/buildtools/issues/1041
+[assembly: TypeForwardedTo(typeof(MathF))]

src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj

@@ -48,8 +48,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp1.1'">
+    <Compile Include="System\BitConverter.netcoreapp1.1.cs" />
     <Compile Include="System\IO\Path.GetRelativePath.cs" />
     <Compile Include="System\MathTests.netcoreapp1.1.cs" />
+    <Compile Include="System\MathF.netcoreapp1.1.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="System\Diagnostics\Stopwatch.cs" />

src/System.Runtime.Extensions/tests/System/BitConverter.cs

@@ -8,7 +8,7 @@
 
 namespace System.Tests
 {
-    public static class BitConverterTests
+    public static partial class BitConverterTests
     {
         [Fact]
         public static unsafe void IsLittleEndian()

src/System.Runtime.Extensions/tests/System/BitConverter.netcoreapp1.1.cs

@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace System.Tests
+{
+    public static partial class BitConverterTests
+    {
+        [Fact]
+        public static void SingleToInt32Bits()
+        {
+            Single input = 12345.63f;
+            Int32 result = BitConverter.SingleToInt32Bits(input);
+            Assert.Equal(1178658437, result);
+            Single roundtripped = BitConverter.Int32BitsToSingle(result);
+            Assert.Equal(input, roundtripped);
+        }
+    }
+}