From 76a11d5b2d01200f68f9b706f4c7ad83625a6ba0 Mon Sep 17 00:00:00 2001
From: Marcos Henrich <marcos.henrich@xamarin.com>
Date: Wed, 13 Jul 2016 17:24:37 +0100
Subject: [PATCH] [corlib] Replaced SafeAccessTokenHandle.cs with ref source.

---
 .../System.Security/SafeAccessTokenHandle.cs  | 25 -------------------
 mcs/class/corlib/corlib.dll.sources           |  2 +-
 .../system/security/safesecurityhandles.cs    |  4 +++
 3 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 mcs/class/corlib/System.Security/SafeAccessTokenHandle.cs

diff --git a/mcs/class/corlib/System.Security/SafeAccessTokenHandle.cs b/mcs/class/corlib/System.Security/SafeAccessTokenHandle.cs
deleted file mode 100644
index d7682bfd2ff..00000000000
--- a/mcs/class/corlib/System.Security/SafeAccessTokenHandle.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Win32.SafeHandles
-{
-	public sealed class SafeAccessTokenHandle : SafeHandle
-	{
-		public override bool IsInvalid {
-			get {
-				return handle == IntPtr.Zero;
-			}
-		}
-
-		public SafeAccessTokenHandle ()
-			: base (IntPtr.Zero, true)
-		{
-			
-		}
-
-		protected override bool ReleaseHandle()
-		{
-			return true;
-		}
-	}
-}
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index 1419dea79ed..199eb737b89 100644
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -617,7 +617,6 @@ System.Security/NamedPermissionSet.cs
 System.Security/PermissionBuilder.cs
 System.Security/PermissionSet.cs
 System.Security/PolicyLevelType.cs
-System.Security/SafeAccessTokenHandle.cs
 System.Security/SecureString.cs
 System.Security/SecurityElement.cs
 System.Security/SecurityFrame.cs
@@ -1395,6 +1394,7 @@ ReferenceSources/SecurityContext.cs
 ../referencesource/mscorlib/system/security/attributes.cs
 ../referencesource/mscorlib/system/security/securitycontext.cs
 ../referencesource/mscorlib/system/security/securitydocument.cs
+../referencesource/mscorlib/system/security/safesecurityhandles.cs
 
 ../referencesource/mscorlib/system/security/claims/Claim.cs
 ../referencesource/mscorlib/system/security/claims/ClaimsIdentity.cs
diff --git a/mcs/class/referencesource/mscorlib/system/security/safesecurityhandles.cs b/mcs/class/referencesource/mscorlib/system/security/safesecurityhandles.cs
index 49adc58c26a..8161a3be2a0 100644
--- a/mcs/class/referencesource/mscorlib/system/security/safesecurityhandles.cs
+++ b/mcs/class/referencesource/mscorlib/system/security/safesecurityhandles.cs
@@ -38,7 +38,11 @@ namespace Microsoft.Win32.SafeHandles {
         [SecurityCritical]
         protected override bool ReleaseHandle()
         {
+#if MONO
+            return true;
+#else
             return Win32Native.CloseHandle(handle);
+#endif
         }
     }
 
-- 
2.25.1