Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions Elasticsearch.sln
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ ProjectSection(SolutionItems) = preProject
Directory.Build.targets = Directory.Build.targets
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.TestLogger", "tests\Tests.TestLogger\Tests.TestLogger.csproj", "{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.JsonNetSerializer", "src\Nest.JsonNetSerializer\Nest.JsonNetSerializer.csproj", "{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}"
EndProject
Global
Expand Down Expand Up @@ -108,7 +106,6 @@ Global
{D6997ADC-E933-418E-831C-DE1A78897493} = {29E53C13-34F7-4F0D-8D28-41EF768793E7}
{5A9C1B95-9280-433E-8D1B-1F5396126166} = {29E53C13-34F7-4F0D-8D28-41EF768793E7}
{432D5575-2347-4D3C-BF8C-3E38410C46CA} = {29E53C13-34F7-4F0D-8D28-41EF768793E7}
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3} = {6C4A2627-AF22-4388-9DF7-7A9AEACFD635}
{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6} = {3EA11364-0513-44B7-AD6D-A675485E7448}
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
Expand Down Expand Up @@ -180,10 +177,6 @@ Global
{CFE97627-8DD3-470B-B7CF-78B62E1D305D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CFE97627-8DD3-470B-B7CF-78B62E1D305D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CFE97627-8DD3-470B-B7CF-78B62E1D305D}.Release|Any CPU.Build.0 = Release|Any CPU
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}.Release|Any CPU.Build.0 = Release|Any CPU
{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
1 change: 1 addition & 0 deletions src/Elasticsearch.Net/Connection/HttpConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#if DOTNETCORE
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
Expand Down
2 changes: 1 addition & 1 deletion tests/.runsettings
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<RunSettings>
<RunConfiguration>
<CollectSourceInformation>true</CollectSourceInformation>
<MaxCpuCount>0</MaxCpuCount>
</RunConfiguration>
<LoggerRunSettings>
<Loggers>
Expand Down
9 changes: 5 additions & 4 deletions tests/Tests.Core/Tests.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionRoot)\tests\Tests.Domain\Tests.Domain.csproj" />
<ProjectReference Include="$(SolutionRoot)\tests\Tests.TestLogger\Tests.TestLogger.csproj" />


<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Include="coverlet.collector" Version="1.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Elastic.Elasticsearch.Xunit" Version="0.1.0-canary.0.244" />

<PackageReference Include="Nullean.VsTest.Pretty.TestLogger" Version="0.3.0" />
<PackageReference Include="coverlet.collector" Version="1.1.0" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />

<PackageReference Include="DiffPlex" Version="1.4.1" />
Expand Down
337 changes: 0 additions & 337 deletions tests/Tests.TestLogger/PrettyLogger.cs

This file was deleted.

Loading