Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/corlib/Microsoft.Win32/IRegistryApi.cs

@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if WIN_PLATFORM
+#if WIN_PLATFORM || XAMMAC_4_5
 
 using System;
 using System.Text;

mcs/class/corlib/Microsoft.Win32/RegistryKey.cs

@@ -55,6 +55,10 @@ namespace Microsoft.Win32
 		{
 		}
 
+		public void Close ()
+		{
+		}
+
 		public RegistryKey CreateSubKey (string subkey)
 		{
 			throw new PlatformNotSupportedException ();
@@ -70,6 +74,26 @@ namespace Microsoft.Win32
 			throw new PlatformNotSupportedException ();
 		}
 
+		public RegistryKey CreateSubKey (string subkey, RegistryKeyPermissionCheck permissionCheck)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public RegistryKey CreateSubKey (string subkey, RegistryKeyPermissionCheck permissionCheck, RegistryOptions registryOptions)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public RegistryKey CreateSubKey (string subkey, RegistryKeyPermissionCheck permissionCheck, RegistrySecurity registrySecurity)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public RegistryKey CreateSubKey (string subkey, RegistryKeyPermissionCheck permissionCheck, RegistryOptions registryOptions, RegistrySecurity registrySecurity)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
 		public void DeleteSubKey (string subkey)
 		{
 		}
@@ -128,6 +152,16 @@ namespace Microsoft.Win32
 			throw new PlatformNotSupportedException ();
 		}
 
+		public RegistrySecurity GetAccessControl ()
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public RegistrySecurity GetAccessControl (AccessControlSections includeSections)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
 		public RegistryValueKind GetValueKind (string name)
 		{
 			throw new PlatformNotSupportedException ();
@@ -158,6 +192,31 @@ namespace Microsoft.Win32
 			throw new PlatformNotSupportedException ();
 		}
 
+		public RegistryKey OpenSubKey (string name, RegistryKeyPermissionCheck permissionCheck)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public RegistryKey OpenSubKey (string name, RegistryKeyPermissionCheck permissionCheck, RegistryRights rights)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public static RegistryKey OpenRemoteBaseKey (RegistryHive hKey, string machineName)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public static RegistryKey OpenRemoteBaseKey (RegistryHive hKey, string machineName, RegistryView view)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public void SetAccessControl (RegistrySecurity registrySecurity)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
 		public void SetValue (string name, object value)
 		{
 		}
@@ -209,9 +268,11 @@ namespace Microsoft.Win32
 
 		static RegistryKey ()
 		{
+#if !XAMMAC_4_5
 			if (Path.DirectorySeparatorChar == '\\')
 				RegistryApi = new Win32RegistryApi ();
 			else
+#endif
 				RegistryApi = new UnixRegistryApi ();
 		}
 

mcs/class/corlib/Microsoft.Win32/RegistryKeyPermissionCheck.cs

@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if WIN_PLATFORM
 namespace Microsoft.Win32
 {
 	public enum RegistryKeyPermissionCheck
@@ -37,4 +36,3 @@ namespace Microsoft.Win32
 		ReadWriteSubTree	= 2,
 	}
 }
-#endif

mcs/class/corlib/Microsoft.Win32/UnixRegistryApi.cs

@@ -37,7 +37,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if WIN_PLATFORM
+#if WIN_PLATFORM || XAMMAC_4_5
 
 using System;
 using System.Collections;

mcs/class/corlib/Microsoft.Win32/Win32ResultCode.cs

@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if WIN_PLATFORM
+#if WIN_PLATFORM || XAMMAC_4_5
 
 using System;
 using System.Runtime.InteropServices;