Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -29,12 +29,21 @@
//
using System.Runtime.InteropServices;
#if NET_4_5
using System.Security.Claims;
#endif
namespace System.Security.Principal {
[Serializable]
[ComVisible (true)]
public class GenericPrincipal : IPrincipal {
public class GenericPrincipal :
#if NET_4_5
ClaimsPrincipal
#else
IPrincipal
#endif
{
// field names are serialization compatible with .net
private IIdentity m_identity;
@ -58,11 +67,21 @@ namespace System.Security.Principal {
get { return m_roles; }
}
public virtual IIdentity Identity {
#if NET_4_5
override
#else
virtual
#endif
public IIdentity Identity {
get { return m_identity; }
}
public virtual bool IsInRole (string role)
#if NET_4_5
override
#else
virtual
#endif
public bool IsInRole (string role)
{
if (m_roles == null)
return false;