Skip to content
This repository was archived by the owner on Jun 1, 2024. It is now read-only.

Commit 394b2d0

Browse files
mivanomivano
committed
Merge branch 'Mpdreamz-feature/7.x-support' into dev
2 parents 729b506 + c35e764 commit 394b2d0

File tree

43 files changed

+1152
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1152
-529
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ root=true
22

33
[*]
44
indent_style = space
5-
indent_size = 4
5+
indent_size = 4
6+
7+
[*.csproj]
8+
indent_size = 2

‎Build.ps1‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ echo "In directory: $PSScriptRoot"
22

33
$solution = "serilog-sinks-elasticsearch.sln"
44
$test = "test\\Serilog.Sinks.Elasticsearch.Tests\\Serilog.Sinks.Elasticsearch.Tests.csproj"
5+
$testIntegration = "test\\Serilog.Sinks.Elasticsearch.IntegrationTests\\Serilog.Sinks.Elasticsearch.IntegrationTests.csproj"
56
[string[]]$projects = @(
67
("src\\Serilog.Sinks.Elasticsearch\\Serilog.Sinks.Elasticsearch.csproj"),
78
("src\\Serilog.Formatting.Elasticsearch\\Serilog.Formatting.Elasticsearch.csproj")
@@ -22,6 +23,16 @@ function Invoke-Build()
2223
Write-Output "The tests failed"
2324
exit 1
2425
}
26+
27+
Write-Output "Running integration tests"
28+
# Tee-Object forces console redirection on vstest which magically makes Console.WriteLine works again.
29+
# This allows you to see the console out of Elastic.Xunit while its running
30+
& dotnet test $testIntegration -c Release | Tee-Object -Variable integ
31+
if($LASTEXITCODE -ne 0)
32+
{
33+
Write-Output "The integration tests failed"
34+
exit 1
35+
}
2536

2637
Write-Output "Creating packages"
2738
foreach ($project in $projects)

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.4"
3+
"version": "2.1.500"
44
}
55
}

‎nuget.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@
1111
<clear />
1212
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
1313
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
14+
<add key="Elastic Abstractions CI" value="https://ci.appveyor.com/nuget/elasticsearch-net-abstractions" />
15+
<add key="Elastic Clients CI" value="https://ci.appveyor.com/nuget/elasticsearch-net" />
1416
</packageSources>
1517
</configuration>

‎serilog-sinks-elasticsearch.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Elasticsearch
2424
EndProject
2525
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Formatting.Elasticsearch", "src\Serilog.Formatting.Elasticsearch\Serilog.Formatting.Elasticsearch.csproj", "{0E6D34BF-322A-4803-94D1-355F6D5024BE}"
2626
EndProject
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Elasticsearch.IntegrationTests", "test\Serilog.Sinks.Elasticsearch.IntegrationTests\Serilog.Sinks.Elasticsearch.IntegrationTests.csproj", "{23BC3821-E028-48B4-8F2C-83BB1B8B5525}"
28+
EndProject
2729
Global
2830
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2931
Debug|Any CPU = Debug|Any CPU
@@ -46,6 +48,10 @@ Global
4648
{0E6D34BF-322A-4803-94D1-355F6D5024BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
4749
{0E6D34BF-322A-4803-94D1-355F6D5024BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
4850
{0E6D34BF-322A-4803-94D1-355F6D5024BE}.Release|Any CPU.Build.0 = Release|Any CPU
51+
{23BC3821-E028-48B4-8F2C-83BB1B8B5525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{23BC3821-E028-48B4-8F2C-83BB1B8B5525}.Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{23BC3821-E028-48B4-8F2C-83BB1B8B5525}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{23BC3821-E028-48B4-8F2C-83BB1B8B5525}.Release|Any CPU.Build.0 = Release|Any CPU
4955
EndGlobalSection
5056
GlobalSection(SolutionProperties) = preSolution
5157
HideSolutionNode = FALSE

‎serilog-sinks-elasticsearch.sln.DotSettings‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/UserDictionary/Words/=deadletter/@EntryIndexedValue">True</s:Boolean>
3+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Elasticsearch/@EntryIndexedValue">True</s:Boolean>
4+
<s:Boolean x:Key="/Default/UserDictionary/Words/=logevent/@EntryIndexedValue">True</s:Boolean>
5+
<s:Boolean x:Key="/Default/UserDictionary/Words/=logstash/@EntryIndexedValue">True</s:Boolean>
6+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mitm/@EntryIndexedValue">True</s:Boolean>
7+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
8+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Xunit/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<tags>serilog logging elasticsearch formatters</tags>
1414
<dependencies>
1515
<dependency id="Serilog" version="2.8.0" />
16+
<dependency id="System.Diagnostics.DiagnosticSource" version="[4.5.1,)" />
1617
</dependencies>
1718
</metadata>
1819
<files>

‎src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.ElasticSearch.Symbols.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<tags>serilog logging elasticsearch</tags>
1313
<dependencies>
1414
<dependency id="Serilog" version="2.6.0" />
15-
<dependency id="Elasticsearch.Net" version="6.0.0" />
15+
<dependency id="Elasticsearch.Net" version="7.0.0" />
1616
<dependency id="Serilog.Sinks.File" version="4.0.0" />
1717
<dependency id="Serilog.Sinks.PeriodicBatching" version="2.1.1" />
1818
<dependency id="Serilog.Sinks.RollingFile" version="3.3.0" />

‎src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.ElasticSearch.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<tags>serilog logging elasticsearch</tags>
1414
<dependencies>
1515
<dependency id="Serilog" version="2.6.0" />
16-
<dependency id="Elasticsearch.Net" version="6.0.0" />
16+
<dependency id="Elasticsearch.Net" version="7.0.0" />
1717
<dependency id="Serilog.Sinks.File" version="4.0.0" />
1818
<dependency id="Serilog.Sinks.PeriodicBatching" version="2.1.1" />
1919
<dependency id="Serilog.Sinks.RollingFile" version="3.3.0" />

‎src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<VersionPrefix>6.0.0</VersionPrefix>
55
<VersionSuffix>alpha</VersionSuffix>
66
<Authors>Michiel van Oudheusden, Martijn Laarman, Mogens Heller Grabe, Serilog Contributors</Authors>
7-
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>Serilog.Sinks.Elasticsearch</AssemblyName>
@@ -28,49 +28,31 @@
2828
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
2929
</PropertyGroup>
3030

31-
<ItemGroup>
32-
<Compile Remove="Sinks\ElasticSearch\Durable\ElasticSearch\ElasticSearchLogShipperOld.cs" />
33-
</ItemGroup>
34-
35-
<ItemGroup>
36-
<PackageReference Include="Elasticsearch.Net" Version="6.0.0" />
37-
<PackageReference Include="Serilog" Version="2.8.0" />
38-
<PackageReference Include="Serilog.Formatting.Compact" Version="1.0.0" />
39-
<PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
40-
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
41-
</ItemGroup>
42-
43-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
44-
<Reference Include="System" />
45-
<Reference Include="Microsoft.CSharp" />
46-
</ItemGroup>
47-
48-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
49-
<NoWarn>1591;1701;1702</NoWarn>
50-
<DefineConstants>$(DefineConstants);DURABLE;THREADING_TIMER</DefineConstants>
51-
</PropertyGroup>
52-
5331
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
5432
<NoWarn>1591;1701;1702</NoWarn>
5533
<DefineConstants>$(DefineConstants);DURABLE;THREADING_TIMER</DefineConstants>
5634
</PropertyGroup>
5735

58-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
36+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
5937
<NoWarn>1591;1701;1702</NoWarn>
6038
<DefineConstants>$(DefineConstants);DURABLE;THREADING_TIMER;HRESULTS</DefineConstants>
6139
</PropertyGroup>
6240

63-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
64-
<NoWarn>1591;1701;1702</NoWarn>
65-
<WarningsAsErrors>NU1605</WarningsAsErrors>
66-
</PropertyGroup>
67-
6841
<ItemGroup>
6942
<DotNetCliToolReference Include="dotnet-version" Version="1.1.0" />
70-
</ItemGroup>
7143

72-
<ItemGroup>
7344
<ProjectReference Include="..\Serilog.Formatting.Elasticsearch\Serilog.Formatting.Elasticsearch.csproj" />
45+
46+
<PackageReference Include="Serilog" Version="2.8.0" />
47+
<PackageReference Include="Serilog.Formatting.Compact" Version="1.0.0" />
48+
<PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
49+
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
50+
<PackageReference Include="Elasticsearch.Net" Version="7.0.0" />
51+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
7452
</ItemGroup>
7553

54+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
55+
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
56+
</ItemGroup>
57+
7658
</Project>

0 commit comments

Comments
 (0)