diff options
| author | Simon Cropp <simon.cropp@gmail.com> | 2017-12-05 11:09:07 +0300 |
|---|---|---|
| committer | Jb Evain <jbevain@gmail.com> | 2017-12-05 11:09:07 +0300 |
| commit | 4a5117a12b7e6d3f1a7401b545b096c2e63c046a (patch) | |
| tree | f1d0f5551b4674ed3dd4ba9b792f02cc33d05662 | |
| parent | 36117614ddd66b62184e7148aa85c25a57193ce7 (diff) | |
use MSBuild bools instead of strings (#473)
* use MSBuild bools instead of strings
* default AutoGenerateBindingRedirects
| -rw-r--r-- | Mono.Cecil.Tests.props | 13 | ||||
| -rw-r--r-- | Mono.Cecil.props | 11 | ||||
| -rw-r--r-- | Test/Mono.Cecil.Tests.csproj | 4 |
3 files changed, 16 insertions, 12 deletions
diff --git a/Mono.Cecil.Tests.props b/Mono.Cecil.Tests.props index e4a4031..49c1a38 100644 --- a/Mono.Cecil.Tests.props +++ b/Mono.Cecil.Tests.props @@ -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> diff --git a/Mono.Cecil.props b/Mono.Cecil.props index 366603e..aef3a98 100644 --- a/Mono.Cecil.props +++ b/Mono.Cecil.props @@ -14,6 +14,7 @@ <MSBuildCSharpTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</MSBuildCSharpTargets> <NetStandard Condition=" $(Configuration.StartsWith('netstandard')) Or '$(NuGetRestoreTargets)' != '' ">true</NetStandard> <NetStandard Condition=" '$(NetStandard)' == '' ">false</NetStandard> + <IsTestProject Condition=" '$(IsTestProject)' == '' ">false</IsTestProject> </PropertyGroup> <PropertyGroup Condition=" $(Configuration.Contains('Debug')) "> <DebugSymbols>true</DebugSymbols> @@ -42,13 +43,13 @@ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <DefineConstants>$(DefineConstants);NET_4_0;</DefineConstants> </PropertyGroup> - <PropertyGroup Condition="'$(NetStandard)' == 'true'"> - <TargetFramework Condition="'$(IsTestProject)' == 'true'">netcoreapp2.0</TargetFramework> - <TargetFramework Condition="'$(IsTestProject)' != 'true'">netstandard1.3</TargetFramework> + <PropertyGroup Condition="$(NetStandard)"> + <TargetFramework Condition="$(IsTestProject)">netcoreapp2.0</TargetFramework> + <TargetFramework Condition="!$(IsTestProject)">netstandard1.3</TargetFramework> </PropertyGroup> - <Import Project="NetStandard.props" Condition="'$(NetStandard)' == 'true'" /> + <Import Project="NetStandard.props" Condition="$(NetStandard)" /> <!-- Shared References --> - <ItemGroup Condition="'$(NetStandard)' != 'true'"> + <ItemGroup Condition="!$(NetStandard)"> <Reference Include="System.Core" /> <Reference Include="System" /> </ItemGroup> diff --git a/Test/Mono.Cecil.Tests.csproj b/Test/Mono.Cecil.Tests.csproj index a8c4d0e..4585623 100644 --- a/Test/Mono.Cecil.Tests.csproj +++ b/Test/Mono.Cecil.Tests.csproj @@ -6,7 +6,7 @@ <RootNamespace>Mono.Cecil.Tests</RootNamespace> <AssemblyName>Mono.Cecil.Tests</AssemblyName> </PropertyGroup> - <ItemGroup Condition="'$(NetStandard)' == 'true'"> + <ItemGroup Condition="$(NetStandard)"> <PackageReference Include="System.Reflection.TypeExtensions"> <Version>4.3.0</Version> </PackageReference> @@ -50,5 +50,5 @@ <ItemGroup> <None Include="Resources\**\*" /> </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(NetStandard)' != 'true'" /> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="!$(NetStandard)" /> </Project>
\ No newline at end of file |