This commit is contained in:
Adam Sitnik 2019-02-01 08:20:11 +01:00
Родитель ccee3e8a1f
Коммит 1b9f9f579a
7 изменённых файлов: 18 добавлений и 5 удалений

Просмотреть файл

@ -16,6 +16,7 @@
<ComVisible>false</ComVisible>
<UseSharedCompilation>false</UseSharedCompilation>
<SuppressNETCoreSdkPreviewMessage>True</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>
<PropertyGroup Condition=" '$(IsVisualBasic)' != 'true' And $(TargetFramework.StartsWith('net4')) ">
@ -53,7 +54,7 @@
<AssemblyVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)</AssemblyVersion>
<AssemblyFileVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)</AssemblyFileVersion>
<InformationalVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)$(PrereleaseLabel)</InformationalVersion>
<InformationalVersion Condition=" '$(IsFsharp)' != 'true' ">$(Major).$(Minor).$(Revision).$(BuildNumber)$(PrereleaseLabel)</InformationalVersion>
<PackageVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)$(PrereleaseLabel)</PackageVersion>
</PropertyGroup>
<PropertyGroup>

Просмотреть файл

@ -1,4 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- MSBuild was complaing about InformationalVersion from common.props file, so I excluded them in conditional way -->
<IsFsharp>true</IsFsharp>
</PropertyGroup>
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>

Просмотреть файл

@ -6,6 +6,7 @@
<AssemblyName>BenchmarkDotNet.Disassembler.x64</AssemblyName>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<PlatformTarget>x64</PlatformTarget>
<SuppressNETCoreSdkPreviewMessage>True</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>
<PropertyGroup>
<OutputPath>..\BenchmarkDotNet\Disassemblers</OutputPath>

Просмотреть файл

@ -6,6 +6,7 @@
<AssemblyName>BenchmarkDotNet.Disassembler.x86</AssemblyName>
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
<PlatformTarget>x86</PlatformTarget>
<SuppressNETCoreSdkPreviewMessage>True</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>
<PropertyGroup>
<OutputPath>..\BenchmarkDotNet\Disassemblers</OutputPath>

Просмотреть файл

@ -4,7 +4,7 @@
<AssemblyTitle>BenchmarkDotNet</AssemblyTitle>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);1701;1702;1705;1591;3005</NoWarn>
<NoWarn>$(NoWarn);1701;1702;1705;1591;3005;NU1702</NoWarn>
<AssemblyName>BenchmarkDotNet</AssemblyName>
<PackageId>BenchmarkDotNet</PackageId>
<RootNamespace>BenchmarkDotNet</RootNamespace>

Просмотреть файл

@ -1,11 +1,11 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using BenchmarkDotNet.ConsoleArguments.ListBenchmarks;
using BenchmarkDotNet.Diagnosers;
using BenchmarkDotNet.Mathematics;
using BenchmarkDotNet.Mathematics.StatisticalTesting;
using BenchmarkDotNet.Portability;
using CommandLine;
using CommandLine.Text;
@ -146,8 +146,9 @@ namespace BenchmarkDotNet.ConsoleArguments
[Option("statisticalTest", Required = false, HelpText = "Threshold for Mann–Whitney U Test. Examples: 5%, 10ms, 100ns, 1s")]
public string StatisticalTestThreshold { get; set; }
internal bool UserProvidedFilters => Filters.Any() || AttributeNames.Any() || AllCategories.Any() || AnyCategories.Any();
internal bool UserProvidedFilters => Filters.Any() || AttributeNames.Any() || AllCategories.Any() || AnyCategories.Any();
[CLSCompliant(false)]
[Usage(ApplicationAlias = "")]
[PublicAPI]
public static IEnumerable<Example> Examples

Просмотреть файл

@ -1,4 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- MSBuild was complaing about InformationalVersion from common.props file, so I excluded them in conditional way -->
<IsFsharp>true</IsFsharp>
</PropertyGroup>
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>