Imported Upstream version 5.10.0.116

Former-commit-id: 8f2f8afd053f1b5b4b35b0827e7a9424613038ae
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-02-15 19:17:22 +00:00
parent 05e67c9e5f
commit c10090095e
48 changed files with 115 additions and 73 deletions

View File

@@ -5,10 +5,13 @@
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<Import Project="Mono.Cecil.props" />
<PropertyGroup Condition="'$(NetStandard)' == 'true'">
<PropertyGroup Condition="$(NetStandard)">
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup Condition="'$(NetStandard)' == 'true'">
<PropertyGroup Condition="!$(NetStandard)">
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup Condition="$(NetStandard)">
<PackageReference Include="NUnit">
<Version>3.7.1</Version>
</PackageReference>
@@ -17,9 +20,9 @@
</PackageReference>
<PackageReference Include="NUnit3TestAdapter">
<Version>3.8.0</Version>
</PackageReference>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(NetStandard)' != 'true'">
<ItemGroup Condition="!$(NetStandard)">
<Reference Include="nunit.core">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(MSBuildThisFileDirectory)\Test\libs\nunit-2.6.2\nunit.core.dll</HintPath>
@@ -37,7 +40,7 @@
<Target Name="ForceGenerationOfBindingRedirects"
AfterTargets="ResolveAssemblyReferences"
BeforeTargets="GenerateBindingRedirects"
Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
Condition="$(AutoGenerateBindingRedirects)">
<PropertyGroup>
<!-- Needs to be set in a target because it has to be set after the initial evaluation in the common targets -->
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>