Skip to content

Commit 04bcf70

Browse files
authored
backport/7.x/move to nullean logger (#5046)
1 parent c6aec5d commit 04bcf70

File tree

8 files changed

+7
-450
lines changed

8 files changed

+7
-450
lines changed

Elasticsearch.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ ProjectSection(SolutionItems) = preProject
7373
Directory.Build.targets = Directory.Build.targets
7474
EndProjectSection
7575
EndProject
76-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.TestLogger", "tests\Tests.TestLogger\Tests.TestLogger.csproj", "{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}"
77-
EndProject
7876
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nest.JsonNetSerializer", "src\Nest.JsonNetSerializer\Nest.JsonNetSerializer.csproj", "{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}"
7977
EndProject
8078
Global
@@ -108,7 +106,6 @@ Global
108106
{D6997ADC-E933-418E-831C-DE1A78897493} = {29E53C13-34F7-4F0D-8D28-41EF768793E7}
109107
{5A9C1B95-9280-433E-8D1B-1F5396126166} = {29E53C13-34F7-4F0D-8D28-41EF768793E7}
110108
{432D5575-2347-4D3C-BF8C-3E38410C46CA} = {29E53C13-34F7-4F0D-8D28-41EF768793E7}
111-
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3} = {6C4A2627-AF22-4388-9DF7-7A9AEACFD635}
112109
{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6} = {3EA11364-0513-44B7-AD6D-A675485E7448}
113110
EndGlobalSection
114111
GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -180,10 +177,6 @@ Global
180177
{CFE97627-8DD3-470B-B7CF-78B62E1D305D}.Debug|Any CPU.Build.0 = Debug|Any CPU
181178
{CFE97627-8DD3-470B-B7CF-78B62E1D305D}.Release|Any CPU.ActiveCfg = Release|Any CPU
182179
{CFE97627-8DD3-470B-B7CF-78B62E1D305D}.Release|Any CPU.Build.0 = Release|Any CPU
183-
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
184-
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
185-
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
186-
{06EDA58B-1AFC-409F-9791-EA08CFBF97D3}.Release|Any CPU.Build.0 = Release|Any CPU
187180
{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
188181
{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
189182
{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/Elasticsearch.Net/Connection/HttpConnection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#if DOTNETCORE
66
using System;
7+
using System.Collections.Concurrent;
78
using System.Collections.Generic;
89
using System.Collections.ObjectModel;
910
using System.Diagnostics;

tests/.runsettings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<RunSettings>
22
<RunConfiguration>
3-
<CollectSourceInformation>true</CollectSourceInformation>
3+
<MaxCpuCount>0</MaxCpuCount>
44
</RunConfiguration>
55
<LoggerRunSettings>
66
<Loggers>

tests/Tests.Core/Tests.Core.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
</ItemGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="$(SolutionRoot)\tests\Tests.Domain\Tests.Domain.csproj" />
16-
<ProjectReference Include="$(SolutionRoot)\tests\Tests.TestLogger\Tests.TestLogger.csproj" />
17-
16+
1817
<PackageReference Include="xunit" Version="2.3.1" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
20-
<PackageReference Include="coverlet.collector" Version="1.1.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
2119
<PackageReference Include="Elastic.Elasticsearch.Xunit" Version="0.1.0-canary.0.244" />
20+
21+
<PackageReference Include="Nullean.VsTest.Pretty.TestLogger" Version="0.3.0" />
22+
<PackageReference Include="coverlet.collector" Version="1.1.0" />
2223
<PackageReference Include="FluentAssertions" Version="5.10.3" />
2324

2425
<PackageReference Include="DiffPlex" Version="1.4.1" />

tests/Tests.TestLogger/PrettyLogger.cs

Lines changed: 0 additions & 337 deletions
This file was deleted.

0 commit comments

Comments
 (0)