Skip to content

Commit 61632fd

Browse files
merblamerbla
committed
Merge from master ready for 2.0 release.
2 parents 1f702ff + 0c37e28 commit 61632fd

File tree

8 files changed

+322
-4
lines changed

8 files changed

+322
-4
lines changed

‎Build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ if($LASTEXITCODE -ne 0) { exit 1 }
1313

1414

1515
Pop-Location
16-
Pop-Location
16+
Pop-Location

‎src/Serilog.Sinks.Splunk.FullNetFx/Serilog.Sinks.Splunk.FullNetFx_BACKUP_27473.csproj‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Serilog</RootNamespace>
11+
<AssemblyName>Serilog.Sinks.Splunk.FullNetFx</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
<DocumentationFile>bin\Debug\Serilog.Sinks.Splunk.FullNetFx.XML</DocumentationFile>
24+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<DebugType>pdbonly</DebugType>
28+
<Optimize>true</Optimize>
29+
<OutputPath>bin\Release\</OutputPath>
30+
<DefineConstants>TRACE</DefineConstants>
31+
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
<DocumentationFile>bin\Release\Serilog.Sinks.Splunk.FullNetFx.XML</DocumentationFile>
34+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
35+
</PropertyGroup>
36+
<PropertyGroup>
37+
<SignAssembly>false</SignAssembly>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<AssemblyOriginatorKeyFile>..\..\assets\Serilog.snk</AssemblyOriginatorKeyFile>
41+
</PropertyGroup>
42+
<ItemGroup>
43+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
45+
<Private>True</Private>
46+
</Reference>
47+
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Serilog.1.5.11\lib\net45\Serilog.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
51+
<Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\Serilog.1.5.11\lib\net45\Serilog.FullNetFx.dll</HintPath>
53+
<Private>True</Private>
54+
</Reference>
55+
<Reference Include="Splunk.Logging.Common, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\Splunk.Logging.Common.1.5.0\lib\net45\Splunk.Logging.Common.dll</HintPath>
57+
<Private>True</Private>
58+
</Reference>
59+
<Reference Include="System" />
60+
<Reference Include="System.Core" />
61+
<Reference Include="Microsoft.CSharp" />
62+
<Reference Include="System.Net.Http" />
63+
</ItemGroup>
64+
<ItemGroup>
65+
<Compile Include="..\Serilog.Sinks.Splunk\LoggerConfigurationSplunkPCLExtensions.cs">
66+
<Link>LoggerConfigurationSplunkPCLExtensions.cs</Link>
67+
</Compile>
68+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\Epoch.cs">
69+
<Link>Sinks\Splunk\Epoch.cs</Link>
70+
</Compile>
71+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorClient.cs">
72+
<Link>Sinks\Splunk\EventCollectorClient.cs</Link>
73+
</Compile>
74+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorRequest.cs">
75+
<Link>Sinks\Splunk\EventCollectorRequest.cs</Link>
76+
</Compile>
77+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorSink.cs">
78+
<Link>Sinks\Splunk\EventCollectorSink.cs</Link>
79+
</Compile>
80+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\RepeatAction.cs">
81+
<Link>Sinks\Splunk\RepeatAction.cs</Link>
82+
</Compile>
83+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\SplunkJsonFormatter.cs">
84+
<Link>Sinks\Splunk\SplunkJsonFormatter.cs</Link>
85+
</Compile>
86+
<Compile Include="Properties\AssemblyInfo.cs" />
87+
<Compile Include="..\..\assets\CommonAssemblyInfo.cs">
88+
<Link>Properties\CommonAssemblyInfo.cs</Link>
89+
</Compile>
90+
<Compile Include="LoggerConfigurationSplunkExtensions.cs" />
91+
<Compile Include="Sinks\Splunk\SplunkTcpSinkConnectionInfo.cs" />
92+
<Compile Include="Sinks\Splunk\SplunkUdpSinkConnectionInfo.cs" />
93+
<Compile Include="Sinks\Splunk\TcpSink.cs" />
94+
<Compile Include="Sinks\Splunk\UdpSink.cs" />
95+
</ItemGroup>
96+
<ItemGroup>
97+
<None Include="packages.config" />
98+
</ItemGroup>
99+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
100+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
101+
Other similar extension points exist, see Microsoft.Common.targets.
102+
<Target Name="BeforeBuild">
103+
</Target>
104+
<Target Name="AfterBuild">
105+
</Target>
106+
-->
107+
</Project>

‎src/Serilog.Sinks.Splunk.FullNetFx/Serilog.Sinks.Splunk.FullNetFx_BASE_27473.csproj‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Serilog</RootNamespace>
11+
<AssemblyName>Serilog.Sinks.Splunk.FullNetFx</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
<DocumentationFile>bin\Debug\Serilog.Sinks.Splunk.FullNetFx.XML</DocumentationFile>
24+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<DebugType>pdbonly</DebugType>
28+
<Optimize>true</Optimize>
29+
<OutputPath>bin\Release\</OutputPath>
30+
<DefineConstants>TRACE</DefineConstants>
31+
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
<DocumentationFile>bin\Release\Serilog.Sinks.Splunk.FullNetFx.XML</DocumentationFile>
34+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
35+
</PropertyGroup>
36+
<PropertyGroup>
37+
<SignAssembly>false</SignAssembly>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<AssemblyOriginatorKeyFile>..\..\assets\Serilog.snk</AssemblyOriginatorKeyFile>
41+
</PropertyGroup>
42+
<ItemGroup>
43+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
45+
<Private>True</Private>
46+
</Reference>
47+
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Serilog.1.5.11\lib\net45\Serilog.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
51+
<Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\Serilog.1.5.11\lib\net45\Serilog.FullNetFx.dll</HintPath>
53+
<Private>True</Private>
54+
</Reference>
55+
<Reference Include="Splunk.Logging.Common, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\Splunk.Logging.Common.1.5.0\lib\net45\Splunk.Logging.Common.dll</HintPath>
57+
<Private>True</Private>
58+
</Reference>
59+
<Reference Include="System" />
60+
<Reference Include="System.Core" />
61+
<Reference Include="Microsoft.CSharp" />
62+
<Reference Include="System.Net.Http" />
63+
</ItemGroup>
64+
<ItemGroup>
65+
<Compile Include="..\Serilog.Sinks.Splunk\LoggerConfigurationSplunkPCLExtensions.cs">
66+
<Link>LoggerConfigurationSplunkPCLExtensions.cs</Link>
67+
</Compile>
68+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorClient.cs">
69+
<Link>Sinks\Splunk\EventCollectorClient.cs</Link>
70+
</Compile>
71+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorRequest.cs">
72+
<Link>Sinks\Splunk\EventCollectorRequest.cs</Link>
73+
</Compile>
74+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorSink.cs">
75+
<Link>Sinks\Splunk\EventCollectorSink.cs</Link>
76+
</Compile>
77+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\RepeatAction.cs">
78+
<Link>Sinks\Splunk\RepeatAction.cs</Link>
79+
</Compile>
80+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\SplunkJsonFormatter.cs">
81+
<Link>Sinks\Splunk\SplunkJsonFormatter.cs</Link>
82+
</Compile>
83+
<Compile Include="Properties\AssemblyInfo.cs" />
84+
<Compile Include="..\..\assets\CommonAssemblyInfo.cs">
85+
<Link>Properties\CommonAssemblyInfo.cs</Link>
86+
</Compile>
87+
<Compile Include="LoggerConfigurationSplunkExtensions.cs" />
88+
<Compile Include="Sinks\Splunk\SplunkTcpSinkConnectionInfo.cs" />
89+
<Compile Include="Sinks\Splunk\SplunkUdpSinkConnectionInfo.cs" />
90+
<Compile Include="Sinks\Splunk\TcpSink.cs" />
91+
<Compile Include="Sinks\Splunk\UdpSink.cs" />
92+
</ItemGroup>
93+
<ItemGroup>
94+
<None Include="packages.config" />
95+
</ItemGroup>
96+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
97+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
98+
Other similar extension points exist, see Microsoft.Common.targets.
99+
<Target Name="BeforeBuild">
100+
</Target>
101+
<Target Name="AfterBuild">
102+
</Target>
103+
-->
104+
</Project>

‎src/Serilog.Sinks.Splunk.FullNetFx/Serilog.Sinks.Splunk.FullNetFx_LOCAL_27473.csproj‎

Whitespace-only changes.

‎src/Serilog.Sinks.Splunk.FullNetFx/Serilog.Sinks.Splunk.FullNetFx_REMOTE_27473.csproj‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Serilog</RootNamespace>
11+
<AssemblyName>Serilog.Sinks.Splunk.FullNetFx</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
<DocumentationFile>bin\Debug\Serilog.Sinks.Splunk.FullNetFx.XML</DocumentationFile>
24+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<DebugType>pdbonly</DebugType>
28+
<Optimize>true</Optimize>
29+
<OutputPath>bin\Release\</OutputPath>
30+
<DefineConstants>TRACE</DefineConstants>
31+
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
<DocumentationFile>bin\Release\Serilog.Sinks.Splunk.FullNetFx.XML</DocumentationFile>
34+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
35+
</PropertyGroup>
36+
<PropertyGroup>
37+
<SignAssembly>false</SignAssembly>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<AssemblyOriginatorKeyFile>..\..\assets\Serilog.snk</AssemblyOriginatorKeyFile>
41+
</PropertyGroup>
42+
<ItemGroup>
43+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
45+
<Private>True</Private>
46+
</Reference>
47+
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Serilog.1.5.11\lib\net45\Serilog.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
51+
<Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\Serilog.1.5.11\lib\net45\Serilog.FullNetFx.dll</HintPath>
53+
<Private>True</Private>
54+
</Reference>
55+
<Reference Include="Splunk.Logging.Common, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\Splunk.Logging.Common.1.5.0\lib\net45\Splunk.Logging.Common.dll</HintPath>
57+
<Private>True</Private>
58+
</Reference>
59+
<Reference Include="System" />
60+
<Reference Include="System.Core" />
61+
<Reference Include="Microsoft.CSharp" />
62+
<Reference Include="System.Net.Http" />
63+
</ItemGroup>
64+
<ItemGroup>
65+
<Compile Include="..\Serilog.Sinks.Splunk\LoggerConfigurationSplunkPCLExtensions.cs">
66+
<Link>LoggerConfigurationSplunkPCLExtensions.cs</Link>
67+
</Compile>
68+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\Epoch.cs">
69+
<Link>Sinks\Splunk\Epoch.cs</Link>
70+
</Compile>
71+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorClient.cs">
72+
<Link>Sinks\Splunk\EventCollectorClient.cs</Link>
73+
</Compile>
74+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorRequest.cs">
75+
<Link>Sinks\Splunk\EventCollectorRequest.cs</Link>
76+
</Compile>
77+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorSink.cs">
78+
<Link>Sinks\Splunk\EventCollectorSink.cs</Link>
79+
</Compile>
80+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\RepeatAction.cs">
81+
<Link>Sinks\Splunk\RepeatAction.cs</Link>
82+
</Compile>
83+
<Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\SplunkJsonFormatter.cs">
84+
<Link>Sinks\Splunk\SplunkJsonFormatter.cs</Link>
85+
</Compile>
86+
<Compile Include="Properties\AssemblyInfo.cs" />
87+
<Compile Include="..\..\assets\CommonAssemblyInfo.cs">
88+
<Link>Properties\CommonAssemblyInfo.cs</Link>
89+
</Compile>
90+
<Compile Include="LoggerConfigurationSplunkExtensions.cs" />
91+
<Compile Include="Sinks\Splunk\SplunkTcpSinkConnectionInfo.cs" />
92+
<Compile Include="Sinks\Splunk\SplunkUdpSinkConnectionInfo.cs" />
93+
<Compile Include="Sinks\Splunk\TcpSink.cs" />
94+
<Compile Include="Sinks\Splunk\UdpSink.cs" />
95+
</ItemGroup>
96+
<ItemGroup>
97+
<None Include="packages.config" />
98+
</ItemGroup>
99+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
100+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
101+
Other similar extension points exist, see Microsoft.Common.targets.
102+
<Target Name="BeforeBuild">
103+
</Target>
104+
<Target Name="AfterBuild">
105+
</Target>
106+
-->
107+
</Project>

‎src/Serilog.Sinks.Splunk/Sinks/Splunk/Epoch.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ public static double ToEpoch(this DateTimeOffset value)
3131
return Math.Round((value - Epoch).TotalSeconds, 3, MidpointRounding.AwayFromZero);
3232
}
3333
}
34-
}
34+
}

‎src/Serilog.Sinks.Splunk/Sinks/Splunk/EventCollectorRequest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ internal EventCollectorRequest(string splunkHost, string jsonPayLoad)
7474
Method = HttpMethod.Post;
7575
}
7676
}
77-
}
77+
}

‎src/Serilog.Sinks.Splunk/Sinks/Splunk/EventCollectorSink.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,4 @@ protected virtual void Dispose(bool disposing)
240240
_httpClient.Dispose();
241241
}
242242
}
243-
}
243+
}

0 commit comments

Comments
 (0)