Cleanup System.Runtime and System.Runtime.Extensions refs (dotnet/corefx#35704)

Commit migrated from https://github.com/dotnet/corefx/commit/d733469bd423e48ded1a34fad15c062738954437

diff --git a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.Manual.cs b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.Forwards.cs
similarity index 62%
rename from src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.Manual.cs
rename to src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.Forwards.cs
index 7e71c11..502b515 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.Manual.cs
+++ b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.Forwards.cs
@@ -6,17 +6,3 @@
 // ------------------------------------------------------------------------------
 
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.MidpointRounding))]
-
-namespace System
-{
-    public static partial class Math
-    {
-        public const double E = 2.7182818284590451;
-        public const double PI = 3.1415926535897931;
-    }
-    public static partial class MathF
-    {
-        public const float E = 2.71828175f;
-        public const float PI = 3.14159274f;
-    }
-}

diff --git a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs
index 52e3378..a0dd941 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs
+++ b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.cs
@@ -772,6 +772,8 @@ namespace System
     }
     public static partial class Math
     {
+        public const double E = 2.7182818284590451;
+        public const double PI = 3.1415926535897931;
         public static decimal Abs(decimal value) { throw null; }
         public static double Abs(double value) { throw null; }
         public static short Abs(short value) { throw null; }
@@ -883,6 +885,8 @@ namespace System
     }
     public static partial class MathF
     {
+        public const float E = 2.71828175f;
+        public const float PI = 3.14159274f;
         public static float Abs(float x) { throw null; }
         public static float Acos(float x) { throw null; }
         public static float Acosh(float x) { throw null; }

diff --git a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
index 896b25f..dcda5f5 100644 (file)
--- a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
+++ b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Extensions.cs" />
-    <Compile Include="System.Runtime.Extensions.Manual.cs" />
+    <Compile Include="System.Runtime.Extensions.Forwards.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />

diff --git a/src/libraries/System.Runtime/ref/System.Runtime.Manual.cs b/src/libraries/System.Runtime/ref/System.Runtime.Manual.cs
index b5f4565..b3ffb93 100644 (file)
--- a/src/libraries/System.Runtime/ref/System.Runtime.Manual.cs
+++ b/src/libraries/System.Runtime/ref/System.Runtime.Manual.cs
@@ -5,15 +5,6 @@
 // Changes to this file must follow the http://aka.ms/api-review process.
 // ------------------------------------------------------------------------------
 
-
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Security;
-
-// This is required for ProjectN to extend reflection. Once we make extensibility via contracts work on desktop, this can be removed.
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.Private.Reflection.Extensibility, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")]
-
 namespace System
 {
     public partial struct Single
@@ -38,12 +29,3 @@ namespace System
         public const double NaN = (double)0.0 / (double)0.0;
     }
 }
-namespace System.Reflection
-{
-    // These should be made public when reflection extensibility via contracts is supported on all platforms.
-    // In the meantime, these will be exposed via wrapper factory methods in System.Private.Reflection.Extensibility.
-    public partial struct CustomAttributeNamedArgument
-    {
-        internal CustomAttributeNamedArgument(Type attributeType, string memberName, bool isField, CustomAttributeTypedArgument typedValue) { throw null; }
-    }
-}