Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependencies update #887

Merged
merged 6 commits into from
Oct 2, 2018
Merged

Dependencies update #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7929076
remove dependencies which are not needed
adamsitnik Oct 1, 2018
1164273
update dependencies (dotnet-outdated -u)
adamsitnik Oct 1, 2018
7d7d91f
making the approval tests work..
adamsitnik Oct 1, 2018
d9a2f03
dont update the test frameworks, things go crazy
adamsitnik Oct 1, 2018
52bee84
we most probably don't need this files to be checked in
adamsitnik Oct 2, 2018
fc6f330
remove duplicated git ignore entry
adamsitnik Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,3 @@ src/BenchmarkDotNet/Disassemblers/*
# Cake
tools/**
.dotnet
/src/BenchmarkDotNet/Disassemblers/*
2 changes: 1 addition & 1 deletion src/BenchmarkDotNet.Diagnostics.Windows/BenchmarkDotNet.Diagnostics.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ProjectReference Include="..\BenchmarkDotNet\BenchmarkDotNet.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.19" />
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.26" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/BenchmarkDotNet.Disassembler.x64/BenchmarkDotNet.Disassembler.x64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<RootNamespace>BenchmarkDotNet.Disassembler</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="0.9.170626.1" />
<PackageReference Include="Mono.Cecil" Version="0.9.6.4" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="0.9.180305.1" />
<PackageReference Include="Mono.Cecil" Version="0.10.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/BenchmarkDotNet.Disassembler.x86/BenchmarkDotNet.Disassembler.x86.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Compile Include="..\BenchmarkDotNet.Disassembler.x64\Program.cs" Link="Program.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="0.9.170626.1" />
<PackageReference Include="Mono.Cecil" Version="0.9.6.4" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="0.9.180305.1" />
<PackageReference Include="Mono.Cecil" Version="0.10.1" />
</ItemGroup>
</Project>
19 changes: 9 additions & 10 deletions src/BenchmarkDotNet/BenchmarkDotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<AssemblyTitle>BenchmarkDotNet</AssemblyTitle>
Expand Down Expand Up @@ -27,20 +27,19 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.2.1" />
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="1.1.1" />
<PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
<PackageReference Include="System.Management" Version="4.5.0" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.8.2" />
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
</ItemGroup>
</Project>
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x64/Microsoft.Diagnostics.Runtime.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x64/Mono.Cecil.Mdb.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x64/Mono.Cecil.Pdb.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x64/Mono.Cecil.Rocks.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x64/Mono.Cecil.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x86/Microsoft.Diagnostics.Runtime.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x86/Mono.Cecil.Mdb.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x86/Mono.Cecil.Pdb.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x86/Mono.Cecil.Rocks.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/BenchmarkDotNet/Disassemblers/net46/win7-x86/Mono.Cecil.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...egrationTests.ConfigPerAssembly/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.1" />
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...rkDotNet.IntegrationTests.CustomPaths/BenchmarkDotNet.IntegrationTests.CustomPaths.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.1" />
<Reference Include="System.Runtime" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...Tests.DisabledOptimizations/BenchmarkDotNet.IntegrationTests.DisabledOptimizations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.1" />
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...onTests.EnabledOptimizations/BenchmarkDotNet.IntegrationTests.EnabledOptimizations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.1" />
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions ...tNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<AssemblyTitle>BenchmarkDotNet.IntegrationTests.ManualRunning</AssemblyTitle>
Expand Down Expand Up @@ -31,7 +31,6 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
</Project>
7 changes: 3 additions & 4 deletions tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<AssemblyTitle>BenchmarkDotNet.IntegrationTests</AssemblyTitle>
Expand Down Expand Up @@ -31,18 +31,17 @@
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj" />
<ProjectReference Include="..\BenchmarkDotNet.IntegrationTests.CustomPaths\BenchmarkDotNet.IntegrationTests.CustomPaths.csproj" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.1" />
<Reference Include="System.Configuration" />
<Reference Include="System.Runtime" />
<Reference Include="System.Threading.Tasks" />
Expand Down
4 changes: 2 additions & 2 deletions tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="System.Memory" Version="4.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
Expand All @@ -25,7 +25,7 @@
<NoWarn>NU1701;1701</NoWarn>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.1" />
<Reference Include="System.Runtime" />
<Reference Include="System.Threading.Tasks" />
<Reference Include="System" />
Expand Down
2 changes: 2 additions & 0 deletions tests/BenchmarkDotNet.Tests/Exporters/CommonExporterApprovalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Runtime.CompilerServices;
using System.Threading;
using ApprovalTests;
using ApprovalTests.Namers;
Expand Down Expand Up @@ -47,6 +48,7 @@ public static TheoryData<CultureInfo> GetCultureInfos()
}

[Theory]
[MethodImpl(MethodImplOptions.NoInlining)] // required by the Approval test framework, do NOT remove
[MemberData(nameof(GetCultureInfos))]
public void Exporters(CultureInfo cultureInfo)
{
Expand Down