Imported Upstream version 5.10.0.69

Former-commit-id: fc39669a0b707dd3c063977486506b6793da2890
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-29 19:03:06 +00:00
parent d8f8abd549
commit e2950ec768
6283 changed files with 453847 additions and 91879 deletions

View File

@@ -30,10 +30,10 @@ Global
{70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU

View File

@@ -4,11 +4,11 @@
<PackageConfigurations>
netfx-Windows_NT;
netcoreapp2.0-Windows_NT;
netcoreapp2.0-Unix;
netstandard;
</PackageConfigurations>
<BuildConfigurations>
$(PackageConfigurations)
$(PackageConfigurations);
netcoreapp-Windows_NT;
uap-Windows_NT;
</BuildConfigurations>
</PropertyGroup>

View File

@@ -5,13 +5,13 @@
<AssemblyName>System.Security.AccessControl</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage>
<ProjectGuid>{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
@@ -21,7 +21,7 @@
<ItemGroup Condition="'$(TargetGroup)'=='netfx'">
<Reference Include="mscorlib" />
</ItemGroup>
<ItemGroup Condition="('$(TargetGroup)'=='netcoreapp2.0' OR '$(TargetGroup)'=='uap') AND '$(TargetsWindows)'=='true'">
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) OR '$(TargetGroup)' == 'uap'">
<Compile Include="System\Security\AccessControl\ACE.cs" />
<Compile Include="System\Security\AccessControl\ACL.cs" />
<Compile Include="System\Security\AccessControl\CommonObjectSecurity.cs" />
@@ -125,14 +125,14 @@
<Reference Include="System.Resources.ResourceManager" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetGroup)' != 'netfx'">
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) == 'true' OR '$(TargetGroup)' == 'uap'">
<Reference Include="System.Collections" />
<Reference Include="System.Diagnostics.Contracts" />
<Reference Include="System.Diagnostics.Debug" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System.Runtime.InteropServices" />
<Reference Include="System.Threading" />
<Reference Include="System.Threading.Thread" />
<Reference Include="Microsoft.Win32.Primitives" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

View File

@@ -11,7 +11,6 @@
using System;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Globalization;
using System.Security.Principal;
@@ -691,7 +690,6 @@ nameof(binaryForm));
{
throw new ArgumentNullException(nameof(securityIdentifier));
}
Contract.EndContractBlock();
//
// The values are set by invoking the properties.
@@ -742,7 +740,6 @@ nameof(binaryForm));
{
throw new ArgumentNullException(nameof(value));
}
Contract.EndContractBlock();
_sid = value;
}
@@ -791,7 +788,6 @@ nameof(binaryForm));
nameof(type),
SR.ArgumentOutOfRange_InvalidUserDefinedAceType);
}
Contract.EndContractBlock();
SetOpaque(opaque);
}

View File

@@ -1 +1 @@
8ef5bb63b88c7c40c11af099df58bad53b2b5125
1ef6fea67c532152b297d97beb1596946a7b2276

View File

@@ -13,7 +13,6 @@ using Microsoft.Win32;
using System;
using System.Collections;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Runtime.InteropServices;
using System.Security.Principal;
@@ -229,7 +228,6 @@ nameof(targetType));
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
try
@@ -360,7 +358,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
try
@@ -444,7 +441,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -465,7 +461,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -486,7 +481,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -509,7 +503,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -535,7 +528,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -563,7 +555,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -589,7 +580,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -610,7 +600,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -631,7 +620,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -652,7 +640,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -673,7 +660,6 @@ nameof(modification),
{
throw new ArgumentNullException(nameof(rule));
}
Contract.EndContractBlock();
WriteLock();

View File

@@ -13,7 +13,6 @@ using Microsoft.Win32;
using System;
using System.Collections;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Globalization;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
@@ -346,7 +345,6 @@ nameof(name));
{
throw new ArgumentNullException(nameof(name));
}
Contract.EndContractBlock();
Persist(name, null, includeSections, exceptionContext);
}
@@ -368,7 +366,6 @@ nameof(name));
{
throw new ArgumentNullException(nameof(handle));
}
Contract.EndContractBlock();
Persist(null, handle, includeSections, exceptionContext);
}

View File

@@ -13,7 +13,6 @@ using Microsoft.Win32;
using System;
using System.Collections;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -84,7 +83,6 @@ namespace System.Security.AccessControl
{
throw new ArgumentNullException( nameof(securityDescriptor));
}
Contract.EndContractBlock();
_securityDescriptor = securityDescriptor;
}
@@ -369,7 +367,6 @@ namespace System.Security.AccessControl
{
throw new ArgumentNullException( nameof(identity));
}
Contract.EndContractBlock();
WriteLock();
@@ -413,7 +410,6 @@ namespace System.Security.AccessControl
{
throw new ArgumentNullException( nameof(identity));
}
Contract.EndContractBlock();
WriteLock();
@@ -434,7 +430,6 @@ namespace System.Security.AccessControl
{
throw new ArgumentNullException( nameof(identity));
}
Contract.EndContractBlock();
WriteLock();
@@ -455,7 +450,6 @@ namespace System.Security.AccessControl
{
throw new ArgumentNullException( nameof(identity));
}
Contract.EndContractBlock();
WriteLock();
@@ -605,7 +599,6 @@ namespace System.Security.AccessControl
SR.Arg_EnumAtLeastOneFlag,
nameof(includeSections));
}
Contract.EndContractBlock();
WriteLock();
@@ -655,7 +648,6 @@ nameof(includeSections));
SR.Arg_EnumAtLeastOneFlag,
nameof(includeSections));
}
Contract.EndContractBlock();
WriteLock();
@@ -689,7 +681,6 @@ nameof(includeSections));
SR.AccessControl_InvalidAccessRuleType,
nameof(rule));
}
Contract.EndContractBlock();
WriteLock();
@@ -716,7 +707,6 @@ nameof(rule));
SR.AccessControl_InvalidAuditRuleType,
nameof(rule));
}
Contract.EndContractBlock();
WriteLock();

View File

@@ -17,7 +17,6 @@ using Microsoft.Win32.SafeHandles;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
@@ -366,7 +365,6 @@ namespace System.Security.AccessControl
public SafeTokenHandle ThreadHandle
{
[System.Security.SecurityCritical] // auto-generated
get
{ return this.threadHandle; }
}
@@ -386,7 +384,6 @@ namespace System.Security.AccessControl
{
throw new ArgumentNullException(nameof(privilegeName));
}
Contract.EndContractBlock();
this.luid = LuidFromPrivilege(privilegeName);
}
@@ -419,7 +416,6 @@ namespace System.Security.AccessControl
#endregion
// [SecurityPermission( SecurityAction.Demand, TogglePrivileges=true )]
private void ToggleState(bool enable)
{
int error = 0;
@@ -554,7 +550,6 @@ namespace System.Security.AccessControl
}
}
// [SecurityPermission( SecurityAction.Demand, TogglePrivileges=true )]
public void Revert()
{
int error = 0;
@@ -650,7 +645,6 @@ namespace System.Security.AccessControl
{
throw new ArgumentNullException( "helper" );
}
Contract.EndContractBlock();
Privilege p = new Privilege( privilege );

View File

@@ -9,6 +9,9 @@ using System.Runtime.Serialization;
namespace System.Security.AccessControl
{
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public sealed class PrivilegeNotHeldException : UnauthorizedAccessException, ISerializable
{
private readonly string _privilegeName = null;
@@ -30,9 +33,15 @@ namespace System.Security.AccessControl
_privilegeName = privilege;
}
private PrivilegeNotHeldException(SerializationInfo info, StreamingContext context) : base(info, context)
{
_privilegeName = info.GetString(nameof(PrivilegeName));
}
public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
base.GetObjectData(info, context);
info.AddValue(nameof(PrivilegeName), _privilegeName, typeof(string));
}
public string PrivilegeName

View File

@@ -6,7 +6,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Security.Principal;
using System.Diagnostics.Contracts;
namespace System.Security.AccessControl
{
@@ -64,7 +63,6 @@ nameof(inheritanceFlags),
nameof(propagationFlags),
SR.Format(SR.Argument_InvalidEnumValue, inheritanceFlags, "PropagationFlags"));
}
Contract.EndContractBlock();
if (identity.IsValidTargetType(typeof(SecurityIdentifier)) == false)
{
@@ -161,7 +159,6 @@ nameof(inheritanceFlags),
nameof(propagationFlags),
SR.Format(SR.Argument_InvalidEnumValue, inheritanceFlags, "PropagationFlags"));
}
Contract.EndContractBlock();
_type = type;
}

View File

@@ -12,11 +12,10 @@
using Microsoft.Win32;
using System;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Globalization;
using System.Runtime.InteropServices;
using System.Security.Principal;
using System.ComponentModel;
namespace System.Security.AccessControl
{
[Flags]
@@ -276,7 +275,6 @@ namespace System.Security.AccessControl
nameof(binaryForm),
SR.ArgumentOutOfRange_ArrayTooSmall);
}
Contract.EndContractBlock();
//
// the offset will grow as we go for each additional field (owner, group,
@@ -512,7 +510,6 @@ nameof(binaryForm),
throw new ArgumentOutOfRangeException(nameof(binaryForm),
SR.AccessControl_InvalidSecurityDescriptorRevision);
}
Contract.EndContractBlock();
ControlFlags flags;
@@ -632,7 +629,6 @@ nameof(binaryForm));
{
throw new ArgumentNullException(nameof(sddlForm));
}
Contract.EndContractBlock();
int error;
IntPtr byteArray = IntPtr.Zero;
@@ -671,8 +667,7 @@ nameof(sddlForm));
else if (error != Interop.Errors.ERROR_SUCCESS)
{
Debug.Assert(false, string.Format(CultureInfo.InvariantCulture, "Unexpected error out of Win32.ConvertStringSdToSd: {0}", error));
// TODO : This should be a Win32Exception once that type is available
throw new Exception();
throw new Win32Exception(error, SR.Format(SR.AccessControl_UnexpectedError, error));
}
}
@@ -952,7 +947,6 @@ nameof(discretionaryAcl));
{
throw new ArgumentNullException(nameof(rawSecurityDescriptor));
}
Contract.EndContractBlock();
CreateFromParts(
isContainer,
@@ -1213,7 +1207,6 @@ nameof(value));
{
throw new ArgumentNullException(nameof(sid));
}
Contract.EndContractBlock();
if (DiscretionaryAcl != null)
{
@@ -1227,7 +1220,6 @@ nameof(value));
{
throw new ArgumentNullException(nameof(sid));
}
Contract.EndContractBlock();
if (SystemAcl != null)
{