Skip to content

Commit 2e30b05

Browse files
authored
Merge branch 'dev' into devNet6
2 parents 8d584ca + 2141692 commit 2e30b05

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ See `test/Serilog.Formatting.Compact.Tests/FormattingBenchmarks.cs`.
140140
|:------------------------------ |----------: |---------: |------: |
141141
| `JsonFormatter` | 11.2775 µs | 0.0682 µs | 1.00 |
142142
| `CompactJsonFormatter` | 6.0315 µs | 0.0429 µs | 0.53 |
143-
| `JsonFormatter(renderMessage: true)` | 13.7585 µs | 0.1194 µs | 1.22 |
143+
| `JsonFormatter(renderMessage: true)` | 13.7585 µs | 0.1194 µs | 1.22 |
144144
| `RenderedCompactJsonFormatter` | 7.0680 µs | 0.0605 µs | 0.63 |
145145

146146
### Tools
@@ -152,4 +152,3 @@ Several tools are available for working with the CLEF format.
152152
* **[Compact Log Format Viewer](https://github.com/warrenbuckley/Compact-Log-Format-Viewer)** - a cross-platform viewer for CLEF files
153153
* **[`seqcli`](https://github.com/datalust/seqcli)** - pretty-`print` CLEF files at the command-line, or `ingest` CLEF files into [Seq](https://datalust.co/seq) for search, and analysis
154154
* **[_Serilog.Formatting.Compact.Reader_](https://github.com/serilog/serilog-formatting-compact-reader)** - convert CLEF documents back into Serilog `LogEvent`s
155-
Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>A simple, compact JSON-based event format for Serilog.</Description>
@@ -11,7 +11,6 @@
1111
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
1212
<SignAssembly>true</SignAssembly>
1313
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
14-
<!--<PackageIconUrl>http://serilog.net/images/serilog-extension-nuget.png</PackageIconUrl>-->
1514
<PackageIcon>serilog-extension-nuget.png</PackageIcon>
1615
<PackageTags>serilog;json</PackageTags>
1716
<PackageProjectUrl>https://github.com/serilog/serilog-formatting-compact</PackageProjectUrl>
@@ -22,23 +21,13 @@
2221
<AnalysisLevel>6.0-recommended</AnalysisLevel>
2322
</PropertyGroup>
2423

25-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
26-
<WarningLevel>5</WarningLevel>
27-
</PropertyGroup>
28-
29-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
24+
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
3025
<WarningLevel>5</WarningLevel>
3126
</PropertyGroup>
3227

3328
<ItemGroup>
3429
<PackageReference Include="Serilog" Version="3.0.1" />
35-
</ItemGroup>
36-
37-
<ItemGroup>
38-
<None Include="serilog-extension-nuget.png">
39-
<Pack>True</Pack>
40-
<PackagePath></PackagePath>
41-
</None>
30+
<None Include="serilog-extension-nuget.png" Pack="True" Visible="False" PackagePath="" />
4231
</ItemGroup>
4332

4433
</Project>

0 commit comments

Comments
 (0)