Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\System.DirectoryServices.Protocols.csproj">
<SupportedFramework>netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.DirectoryServices.Protocols.csproj" />

View File

@@ -8,6 +8,7 @@
<BuildConfigurations>
$(PackageConfigurations);
netcoreapp-Windows_NT;
_netfx;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -22,7 +22,7 @@ namespace System.DirectoryServices.Protocols
byte[] encodingResult = null;
// value is allowed to be null in certain scenario, so if it is null, just set it to empty array.
if (value == null)
value = new object[0];
value = Array.Empty<object>();
Debug.WriteLine("Begin encoding\n");
@@ -235,7 +235,7 @@ namespace System.DirectoryServices.Protocols
if (binaryValue == null || binaryValue.bv_len == 0)
{
encodingResult = new byte[0];
encodingResult = Array.Empty<byte>();
}
else
{

View File

@@ -634,7 +634,7 @@ namespace System.DirectoryServices.Protocols
public class SortRequestControl : DirectoryControl
{
private SortKey[] _keys = new SortKey[0];
private SortKey[] _keys = Array.Empty<SortKey>();
public SortRequestControl(params SortKey[] sortKeys) : base("1.2.840.113556.1.4.473", null, true, true)
{
if (sortKeys == null)

View File

@@ -3,6 +3,7 @@
<PropertyGroup>
<BuildConfigurations>
netcoreapp-Windows_NT;
netfx;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -6,6 +6,8 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="BerConverterTests.cs" />
<Compile Include="LdapSessionOptionsTests.cs" />
@@ -50,7 +52,6 @@
<Compile Include="BerConversionExceptionTests.cs" />
<Compile Include="AsqRequestControlTests.cs" />
<Compile Include="AddRequestTests.cs" />
<Compile Include="DirectoryServicesProtocolsTests.cs" />
<Compile Include="$(CommonTestPath)\System\DirectoryServices\LdapConfiguration.cs">
<Link>Common\DirectoryServices\LdapConfiguration.cs</Link>