Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -39,9 +39,7 @@ namespace System.Security.Principal {
[Serializable]
[ComVisible (true)]
public class WindowsIdentity :
#if NET_4_5
System.Security.Claims.ClaimsIdentity,
#endif
IIdentity, IDeserializationCallback, ISerializable, IDisposable {
private IntPtr _token;
private string _type;
@ -52,10 +50,8 @@ namespace System.Security.Principal {
static private IntPtr invalidWindows = IntPtr.Zero;
#if NET_4_5
[NonSerialized]
public new const string DefaultIssuer = "AD AUTHORITY";
#endif
[SecurityPermission (SecurityAction.Demand, ControlPrincipal=true)]
public WindowsIdentity (IntPtr userToken)
@ -177,9 +173,7 @@ namespace System.Security.Principal {
}
// properties
#if NET_4_5
sealed override
#endif
public string AuthenticationType {
get { return _type; }
}
@ -189,11 +183,7 @@ namespace System.Security.Principal {
get { return (_account == WindowsAccountType.Anonymous); }
}
#if NET_4_5
override
#else
virtual
#endif
public bool IsAuthenticated
{
get { return _authenticated; }
@ -209,11 +199,7 @@ namespace System.Security.Principal {
get { return (_account == WindowsAccountType.System); }
}
#if NET_4_5
override
#else
virtual
#endif
public string Name
{
get {