[corlib] Move System.Runtime.InteropServices.RuntimeInformation to co… (#6060)

* [corlib] Move System.Runtime.InteropServices.RuntimeInformation to corlib to match .net 4.7.1 api

* Bump API snapshot submodule

4 files changed, 32 insertions, 96 deletions

diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile
index b8d2105de84..d12212f8694 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile
+++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile
@@ -9,12 +9,12 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
 
 LIBRARY = System.Runtime.InteropServices.RuntimeInformation.dll
 
-RESX_RESOURCE_STRING = ../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx
-
 KEYFILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /nowarn:1616,1699,436
-LIB_REFS = System
-LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
+LIB_REFS =
+LIB_MCS_FLAGS = $(SIGN_FLAGS)
+
+PLATFORM_DEBUG_FLAGS =
 
 NO_TEST = yes
 
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources
index 925b488b0df..6d141ac1745 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources
+++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.dll.sources
@@ -1,7 +1,2 @@
 AssemblyInfo.cs
-System.Runtime.InteropServices/RuntimeInformation.cs
-
-corefx/SR.cs
-
-../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/OSPlatform.cs
-../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/Architecture.cs
+TypeForwarders.cs
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs
deleted file mode 100644
index 4a515083c48..00000000000
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// RuntimeInformation.cs
-//
-// Author:
-//   Alexander Köplinger (alexander.koeplinger@xamarin.com)
-//
-// (C) 2016 Xamarin, Inc.
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.IO;
-using System.Reflection;
-
-namespace System.Runtime.InteropServices
-{
-	public static class RuntimeInformation
-	{
-		public static string FrameworkDescription {
-			get {
-				return "Mono " + Mono.Runtime.GetDisplayName ();
-			}
-		}
-
-		public static bool IsOSPlatform (OSPlatform osPlatform)
-		{
-			switch (Environment.OSVersion.Platform) {
-			case PlatformID.Win32NT:
-				return osPlatform == OSPlatform.Windows;
-			case PlatformID.Unix:
-				if (File.Exists ("/usr/lib/libc.dylib"))
-					return osPlatform == OSPlatform.OSX;
-
-				return osPlatform == OSPlatform.Linux;
-			default:
-				return false;
-			}
-		}
-
-		public static string OSDescription
-		{
-			get
-			{
-				return Environment.OSVersion.VersionString;
-			}
-		}
-
-		public static Architecture OSArchitecture
-		{
-			get
-			{
-				// TODO: very barebones implementation, doesn't respect ARM
-				return Environment.Is64BitOperatingSystem ? Architecture.X64 : Architecture.X86;
-			}
-		}
-
-		public static Architecture ProcessArchitecture
-		{
-			get
-			{
-				// TODO: very barebones implementation, doesn't respect ARM			
-				return Environment.Is64BitProcess ? Architecture.X64 : Architecture.X86;
-			}
-		}
-	}
-}
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/TypeForwarders.cs b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/TypeForwarders.cs
new file mode 100644
index 00000000000..e71582c659e
--- /dev/null
+++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/TypeForwarders.cs
@@ -0,0 +1,26 @@
+//
+// Copyright (C) 2017 Microsoft Corporation (http://www.microsoft.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.Architecture))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.OSPlatform))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.RuntimeInformation))]