[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

7 files changed, 41 insertions, 12 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/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))]
diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 42c8ab7ff8b..c31adb99769 100644
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -27,7 +27,8 @@ endif
 RESX_RESOURCE_STRING = \
 	../../../external/corert/src/System.Private.CoreLib/src/Resources/Strings.resx \
 	../../../external/corefx/src/System.Collections.Concurrent/src/Resources/Strings.resx \
-	../../../external/corefx/src/System.Memory/src/Resources/Strings.resx
+	../../../external/corefx/src/System.Memory/src/Resources/Strings.resx \
+	../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx \
 
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs b/mcs/class/corlib/System.Runtime.InteropServices.RuntimeInformation/RuntimeInformation.cs
index 4a515083c48..4a515083c48 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices/RuntimeInformation.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices.RuntimeInformation/RuntimeInformation.cs
diff --git a/mcs/class/corlib/corefx/SR.cs b/mcs/class/corlib/corefx/SR.cs
index 0c602b29c08..e8440853154 100644
--- a/mcs/class/corlib/corefx/SR.cs
+++ b/mcs/class/corlib/corefx/SR.cs
@@ -821,4 +821,6 @@ partial class SR
 	public const string ArrayTypeMustBeExactMatch = "The array type must be exactly {0}.";
 	public const string CannotCallEqualsOnSpan = "Equals() on Span and ReadOnlySpan is not supported. Use operator== instead.";
 	public const string CannotCallGetHashCodeOnSpan = "GetHashCode() on Span and ReadOnlySpan is not supported.";
+	public const string Argument_EmptyValue = "Value cannot be empty.";
+	public const string PlatformNotSupported_RuntimeInformation = "RuntimeInformation is not supported for Portable Class Libraries.";
 }
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index c6d48c39413..cebf502d0d2 100644
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -409,6 +409,9 @@ System.Runtime.InteropServices.WindowsRuntime/DesignerNamespaceResolveEventArgs.
 System.Runtime.InteropServices.WindowsRuntime/NamespaceResolveEventArgs.cs
 System.Runtime.InteropServices.WindowsRuntime/UnsafeNativeMethods.cs
 System.Runtime.InteropServices.WindowsRuntime/WindowsRuntimeMetadata.cs
+
+System.Runtime.InteropServices.RuntimeInformation/RuntimeInformation.cs
+
 System.Runtime.Remoting/ActivatedClientTypeEntry.cs
 System.Runtime.Remoting/ActivatedServiceTypeEntry.cs
 System.Runtime.Remoting/CustomErrorsModes.cs
@@ -1684,6 +1687,8 @@ corefx/SR.cs
 ../../../external/corefx/src/System.Memory/src/System/SpanHelpers.Clear.cs
 ../../../external/corefx/src/System.Memory/src/System/ThrowHelper.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
 
 System.Security.Cryptography.X509Certificates/X509CertificateImplApple.cs
 System.Security.Cryptography.X509Certificates/X509Helper.Apple.cs